mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-01-12 15:29:31 -05:00
Correctly proxy remote group HTTP errors. (#6654)
e.g. if remote returns a 404 then that shouldn't be treated as an error but should be proxied through.
This commit is contained in:
parent
2b6b7f482a
commit
be29ed7ad8
1
changelog.d/6654.bugfix
Normal file
1
changelog.d/6654.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
Correctly proxy HTTP errors due to API calls to remote group servers.
|
@ -130,6 +130,8 @@ class GroupsLocalHandler(object):
|
|||||||
res = yield self.transport_client.get_group_summary(
|
res = yield self.transport_client.get_group_summary(
|
||||||
get_domain_from_id(group_id), group_id, requester_user_id
|
get_domain_from_id(group_id), group_id, requester_user_id
|
||||||
)
|
)
|
||||||
|
except HttpResponseException as e:
|
||||||
|
raise e.to_synapse_error()
|
||||||
except RequestSendFailed:
|
except RequestSendFailed:
|
||||||
raise SynapseError(502, "Failed to contact group server")
|
raise SynapseError(502, "Failed to contact group server")
|
||||||
|
|
||||||
@ -190,6 +192,8 @@ class GroupsLocalHandler(object):
|
|||||||
res = yield self.transport_client.create_group(
|
res = yield self.transport_client.create_group(
|
||||||
get_domain_from_id(group_id), group_id, user_id, content
|
get_domain_from_id(group_id), group_id, user_id, content
|
||||||
)
|
)
|
||||||
|
except HttpResponseException as e:
|
||||||
|
raise e.to_synapse_error()
|
||||||
except RequestSendFailed:
|
except RequestSendFailed:
|
||||||
raise SynapseError(502, "Failed to contact group server")
|
raise SynapseError(502, "Failed to contact group server")
|
||||||
|
|
||||||
@ -231,6 +235,8 @@ class GroupsLocalHandler(object):
|
|||||||
res = yield self.transport_client.get_users_in_group(
|
res = yield self.transport_client.get_users_in_group(
|
||||||
get_domain_from_id(group_id), group_id, requester_user_id
|
get_domain_from_id(group_id), group_id, requester_user_id
|
||||||
)
|
)
|
||||||
|
except HttpResponseException as e:
|
||||||
|
raise e.to_synapse_error()
|
||||||
except RequestSendFailed:
|
except RequestSendFailed:
|
||||||
raise SynapseError(502, "Failed to contact group server")
|
raise SynapseError(502, "Failed to contact group server")
|
||||||
|
|
||||||
@ -271,6 +277,8 @@ class GroupsLocalHandler(object):
|
|||||||
res = yield self.transport_client.join_group(
|
res = yield self.transport_client.join_group(
|
||||||
get_domain_from_id(group_id), group_id, user_id, content
|
get_domain_from_id(group_id), group_id, user_id, content
|
||||||
)
|
)
|
||||||
|
except HttpResponseException as e:
|
||||||
|
raise e.to_synapse_error()
|
||||||
except RequestSendFailed:
|
except RequestSendFailed:
|
||||||
raise SynapseError(502, "Failed to contact group server")
|
raise SynapseError(502, "Failed to contact group server")
|
||||||
|
|
||||||
@ -315,6 +323,8 @@ class GroupsLocalHandler(object):
|
|||||||
res = yield self.transport_client.accept_group_invite(
|
res = yield self.transport_client.accept_group_invite(
|
||||||
get_domain_from_id(group_id), group_id, user_id, content
|
get_domain_from_id(group_id), group_id, user_id, content
|
||||||
)
|
)
|
||||||
|
except HttpResponseException as e:
|
||||||
|
raise e.to_synapse_error()
|
||||||
except RequestSendFailed:
|
except RequestSendFailed:
|
||||||
raise SynapseError(502, "Failed to contact group server")
|
raise SynapseError(502, "Failed to contact group server")
|
||||||
|
|
||||||
@ -361,6 +371,8 @@ class GroupsLocalHandler(object):
|
|||||||
requester_user_id,
|
requester_user_id,
|
||||||
content,
|
content,
|
||||||
)
|
)
|
||||||
|
except HttpResponseException as e:
|
||||||
|
raise e.to_synapse_error()
|
||||||
except RequestSendFailed:
|
except RequestSendFailed:
|
||||||
raise SynapseError(502, "Failed to contact group server")
|
raise SynapseError(502, "Failed to contact group server")
|
||||||
|
|
||||||
@ -424,6 +436,8 @@ class GroupsLocalHandler(object):
|
|||||||
user_id,
|
user_id,
|
||||||
content,
|
content,
|
||||||
)
|
)
|
||||||
|
except HttpResponseException as e:
|
||||||
|
raise e.to_synapse_error()
|
||||||
except RequestSendFailed:
|
except RequestSendFailed:
|
||||||
raise SynapseError(502, "Failed to contact group server")
|
raise SynapseError(502, "Failed to contact group server")
|
||||||
|
|
||||||
@ -460,6 +474,8 @@ class GroupsLocalHandler(object):
|
|||||||
bulk_result = yield self.transport_client.bulk_get_publicised_groups(
|
bulk_result = yield self.transport_client.bulk_get_publicised_groups(
|
||||||
get_domain_from_id(user_id), [user_id]
|
get_domain_from_id(user_id), [user_id]
|
||||||
)
|
)
|
||||||
|
except HttpResponseException as e:
|
||||||
|
raise e.to_synapse_error()
|
||||||
except RequestSendFailed:
|
except RequestSendFailed:
|
||||||
raise SynapseError(502, "Failed to contact group server")
|
raise SynapseError(502, "Failed to contact group server")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user