diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-02-03 13:18:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 13:18:42 +0000 |
| commit | 370080531ef7ae3f075ff8f577f42c2b6e25295c (patch) | |
| tree | 0b520fa2e425986607b784edd850341d63060b1a | |
| parent | Fix `room_version` in `on_invite_request` flow (#6827) (diff) | |
| download | synapse-370080531ef7ae3f075ff8f577f42c2b6e25295c.tar.xz | |
Allow URL-encoded user IDs on user admin api paths (#6825)
| -rw-r--r-- | changelog.d/6825.bugfix | 1 | ||||
| -rw-r--r-- | synapse/rest/admin/users.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/6825.bugfix b/changelog.d/6825.bugfix new file mode 100644 index 0000000000..d3cacd6d9a --- /dev/null +++ b/changelog.d/6825.bugfix @@ -0,0 +1 @@ +Allow URL-encoded User IDs on `/_synapse/admin/v2/users/<user_id>[/admin]` endpoints. Thanks to @NHAS for reporting. \ No newline at end of file diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 3455741195..f1c4434f5c 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -105,7 +105,7 @@ class UsersRestServletV2(RestServlet): class UserRestServletV2(RestServlet): - PATTERNS = (re.compile("^/_synapse/admin/v2/users/(?P<user_id>@[^/]+)$"),) + PATTERNS = (re.compile("^/_synapse/admin/v2/users/(?P<user_id>[^/]+)$"),) """Get request to list user details. This needs user to have administrator access in Synapse. @@ -568,7 +568,7 @@ class UserAdminServlet(RestServlet): {} """ - PATTERNS = (re.compile("^/_synapse/admin/v1/users/(?P<user_id>@[^/]*)/admin$"),) + PATTERNS = (re.compile("^/_synapse/admin/v1/users/(?P<user_id>[^/]*)/admin$"),) def __init__(self, hs): self.hs = hs |