diff options
| author | Eric Eastwood <erice@element.io> | 2022-09-09 16:28:05 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-09-09 16:28:05 -0500 |
| commit | 50f0342594977a57793225d8f6b95e1225dfe308 (patch) | |
| tree | bb8c94e3316a8623780d37a98e1f55aa2bc19c4a /synapse/http/site.py | |
| parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
| parent | Concurrently collect room unread counts for push badges (#13765) (diff) | |
| download | synapse-50f0342594977a57793225d8f6b95e1225dfe308.tar.xz | |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: poetry.lock synapse/api/auth.py synapse/federation/federation_client.py synapse/logging/opentracing.py synapse/rest/client/keys.py synapse/rest/client/sendtodevice.py synapse/storage/schema/__init__.py
Diffstat (limited to 'synapse/http/site.py')
| -rw-r--r-- | synapse/http/site.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py index d82c046dd7..4a6cadc597 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -226,7 +226,7 @@ class SynapseRequest(Request): # If this is a request where the target user doesn't match the user who # authenticated (e.g. and admin is puppetting a user) then we return both. - if self._requester.user.to_string() != authenticated_entity: + if requester != authenticated_entity: return requester, authenticated_entity return requester, None |