diff options
| author | David Robertson <davidr@element.io> | 2022-10-26 14:00:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-26 14:00:01 +0100 |
| commit | 04fd6221de026a74e8a3e896796d39dcf5ac6e3b (patch) | |
| tree | 2ed582731aeec1ca4cc7dfb77a8e6cb62639da4d /synapse/appservice/api.py | |
| parent | 1.70.0 (diff) | |
| download | synapse-04fd6221de026a74e8a3e896796d39dcf5ac6e3b.tar.xz | |
Fix incorrectly sending authentication tokens to application service as headers (#14301)
Diffstat (limited to 'synapse/appservice/api.py')
| -rw-r--r-- | synapse/appservice/api.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py index fbac4375b0..60774b240d 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py @@ -123,7 +123,7 @@ class ApplicationServiceApi(SimpleHttpClient): response = await self.get_json( uri, {"access_token": service.hs_token}, - headers={"Authorization": f"Bearer {service.hs_token}"}, + headers={"Authorization": [f"Bearer {service.hs_token}"]}, ) if response is not None: # just an empty json object return True @@ -147,7 +147,7 @@ class ApplicationServiceApi(SimpleHttpClient): response = await self.get_json( uri, {"access_token": service.hs_token}, - headers={"Authorization": f"Bearer {service.hs_token}"}, + headers={"Authorization": [f"Bearer {service.hs_token}"]}, ) if response is not None: # just an empty json object return True @@ -190,7 +190,9 @@ class ApplicationServiceApi(SimpleHttpClient): b"access_token": service.hs_token, } response = await self.get_json( - uri, args=args, headers={"Authorization": f"Bearer {service.hs_token}"} + uri, + args=args, + headers={"Authorization": [f"Bearer {service.hs_token}"]}, ) if not isinstance(response, list): logger.warning( @@ -230,7 +232,7 @@ class ApplicationServiceApi(SimpleHttpClient): info = await self.get_json( uri, {"access_token": service.hs_token}, - headers={"Authorization": f"Bearer {service.hs_token}"}, + headers={"Authorization": [f"Bearer {service.hs_token}"]}, ) if not _is_valid_3pe_metadata(info): @@ -327,7 +329,7 @@ class ApplicationServiceApi(SimpleHttpClient): uri=uri, json_body=body, args={"access_token": service.hs_token}, - headers={"Authorization": f"Bearer {service.hs_token}"}, + headers={"Authorization": [f"Bearer {service.hs_token}"]}, ) if logger.isEnabledFor(logging.DEBUG): logger.debug( |