Handle HttpResponseException more safely for federated groups

changelog.d/3969.bugfix

@@ -0,0 +1 @@
+Fix HTTP error response codes for federated group requests.

synapse/handlers/groups_local.py

@@ -20,7 +20,7 @@
 
 from twisted.internet import defer
 
-from synapse.api.errors import SynapseError
+from synapse.api.errors import HttpResponseException, SynapseError
 from synapse.types import get_domain_from_id
 
 logger = logging.getLogger(__name__)
@@ -37,9 +37,23 @@ def f(self, group_id, *args, **kwargs):
  )
  else:
  destination = get_domain_from_id(group_id)
- return getattr(self.transport_client, func_name)(
+ d = getattr(self.transport_client, func_name)(
  destination, group_id, *args, **kwargs
  )
+
+ # Capture errors returned by the remote homeserver and
+ # re-throw specific errors as SynapseErrors. This is so
+ # when the remote end responds with things like 403 Not
+ # In Group, we can communicate that to the client instead
+ # of a 500.
+ def h(failure):
+ failure.trap(HttpResponseException)
+ e = failure.value
+ if e.code == 403:
+ raise e.to_synapse_error()
+ return failure
+ d.addErrback(h)
+ return d
  return f
 
 

synapse/http/matrixfederationclient.py

@@ -230,7 +230,7 @@ def _send_request(
  Returns:
  Deferred: resolves with the http response object on success.
 
- Fails with ``HTTPRequestException``: if we get an HTTP response
+ Fails with ``HttpResponseException``: if we get an HTTP response
  code >= 300.
 
  Fails with ``NotRetryingDestination`` if we are not yet ready
@@ -478,7 +478,7 @@ def put_json(self, destination, path, args={}, data={},
  Deferred: Succeeds when we get a 2xx HTTP response. The result
  will be the decoded JSON body.
 
- Fails with ``HTTPRequestException`` if we get an HTTP response
+ Fails with ``HttpResponseException`` if we get an HTTP response
  code >= 300.
 
  Fails with ``NotRetryingDestination`` if we are not yet ready
@@ -532,7 +532,7 @@ def post_json(self, destination, path, data={}, long_retries=False,
  Deferred: Succeeds when we get a 2xx HTTP response. The result
  will be the decoded JSON body.
 
- Fails with ``HTTPRequestException`` if we get an HTTP response
+ Fails with ``HttpResponseException`` if we get an HTTP response
  code >= 300.
 
  Fails with ``NotRetryingDestination`` if we are not yet ready
@@ -587,7 +587,7 @@ def get_json(self, destination, path, args=None, retry_on_dns_fail=True,
  Deferred: Succeeds when we get a 2xx HTTP response. The result
  will be the decoded JSON body.
 
- Fails with ``HTTPRequestException`` if we get an HTTP response
+ Fails with ``HttpResponseException`` if we get an HTTP response
  code >= 300.
 
  Fails with ``NotRetryingDestination`` if we are not yet ready
@@ -638,7 +638,7 @@ def delete_json(self, destination, path, long_retries=False,
  Deferred: Succeeds when we get a 2xx HTTP response. The result
  will be the decoded JSON body.
 
- Fails with ``HTTPRequestException`` if we get an HTTP response
+ Fails with ``HttpResponseException`` if we get an HTTP response
  code >= 300.
 
  Fails with ``NotRetryingDestination`` if we are not yet ready
@@ -682,7 +682,7 @@ def get_file(self, destination, path, output_stream, args={},
  Deferred: resolves with an (int,dict) tuple of the file length and
  a dict of the response headers.
 
- Fails with ``HTTPRequestException`` if we get an HTTP response code
+ Fails with ``HttpResponseException`` if we get an HTTP response code
  >= 300
 
  Fails with ``NotRetryingDestination`` if we are not yet ready