diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-05-04 14:11:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 14:11:21 -0400 |
| commit | 7fbf42499d92ec3c9a05d9f36ec5fecd1ab1f18c (patch) | |
| tree | 5f3a08745f204376a211aa3ece6f92f4108a9891 /synapse/rest/client/auth.py | |
| parent | Implement changes to MSC2285 (hidden read receipts) (#12168) (diff) | |
| download | synapse-7fbf42499d92ec3c9a05d9f36ec5fecd1ab1f18c.tar.xz | |
Use `getClientAddress` instead of `getClientIP`. (#12599)
getClientIP was deprecated in Twisted 18.4.0, which also added getClientAddress. The Synapse minimum version for Twisted is currently 18.9.0, so all supported versions have the new API.
Diffstat (limited to 'synapse/rest/client/auth.py')
| -rw-r--r-- | synapse/rest/client/auth.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/rest/client/auth.py b/synapse/rest/client/auth.py index e0b2b80e5b..eb77337044 100644 --- a/synapse/rest/client/auth.py +++ b/synapse/rest/client/auth.py @@ -112,7 +112,7 @@ class AuthRestServlet(RestServlet): try: await self.auth_handler.add_oob_auth( - LoginType.RECAPTCHA, authdict, request.getClientIP() + LoginType.RECAPTCHA, authdict, request.getClientAddress().host ) except LoginError as e: # Authentication failed, let user try again @@ -132,7 +132,7 @@ class AuthRestServlet(RestServlet): try: await self.auth_handler.add_oob_auth( - LoginType.TERMS, authdict, request.getClientIP() + LoginType.TERMS, authdict, request.getClientAddress().host ) except LoginError as e: # Authentication failed, let user try again @@ -161,7 +161,9 @@ class AuthRestServlet(RestServlet): try: await self.auth_handler.add_oob_auth( - LoginType.REGISTRATION_TOKEN, authdict, request.getClientIP() + LoginType.REGISTRATION_TOKEN, + authdict, + request.getClientAddress().host, ) except LoginError as e: html = self.registration_token_template.render( |