Fix possible AttributeError when account-api is called over unix sock…

…et (#16404) Fixes #16396
matrix-org · Oct 9, 2023 · 32fd9bc · 32fd9bc
1 parent 1f10c20
commit 32fd9bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/16404.bugfix b/changelog.d/16404.bugfix
@@ -0,0 +1 @@
+Fixes possbile `AttributeError` when `_matrix/client/v3/account/whoami` is called over a unix socket. Contributed by @Sir-Photch.
diff --git a/synapse/api/auth/internal.py b/synapse/api/auth/internal.py
@@ -115,7 +115,7 @@ async def _wrapped_get_user_by_req(
         Once get_user_by_req has set up the opentracing span, this does the actual work.
         """
         try:
-            ip_addr = request.getClientAddress().host
+            ip_addr = request.get_client_ip_if_available()
             user_agent = get_request_user_agent(request)
 
             access_token = self.get_access_token_from_request(request)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixes possbile `AttributeError` when `_matrix/client/v3/account/whoami` is called over a unix socket. Contributed by @Sir-Photch.