mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-09-19 15:34:34 -04:00
Merge branch 'cross-signing_hidden' into cross-signing_keys
This commit is contained in:
Hubert Chathi
commit
336c546d6a
298 changed files with 3414 additions and 2145 deletions
|
|
@ -117,7 +117,7 @@ class EmailPasswordRequestTokenRestServlet(RestServlet):
|
|||
# Wrap the session id in a JSON object
|
||||
ret = {"sid": sid}
|
||||
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def send_password_reset(self, email, client_secret, send_attempt, next_link=None):
|
||||
|
|
@ -149,7 +149,7 @@ class EmailPasswordRequestTokenRestServlet(RestServlet):
|
|||
# Check that the send_attempt is higher than previous attempts
|
||||
if send_attempt <= last_send_attempt:
|
||||
# If not, just return a success without sending an email
|
||||
defer.returnValue(session_id)
|
||||
return session_id
|
||||
else:
|
||||
# An non-validated session does not exist yet.
|
||||
# Generate a session id
|
||||
|
|
@ -185,7 +185,7 @@ class EmailPasswordRequestTokenRestServlet(RestServlet):
|
|||
token_expires,
|
||||
)
|
||||
|
||||
defer.returnValue(session_id)
|
||||
return session_id
|
||||
|
||||
|
||||
class MsisdnPasswordRequestTokenRestServlet(RestServlet):
|
||||
|
|
@ -221,7 +221,7 @@ class MsisdnPasswordRequestTokenRestServlet(RestServlet):
|
|||
raise SynapseError(400, "MSISDN not found", Codes.THREEPID_NOT_FOUND)
|
||||
|
||||
ret = yield self.identity_handler.requestMsisdnToken(**body)
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
|
||||
class PasswordResetSubmitTokenServlet(RestServlet):
|
||||
|
|
@ -279,7 +279,7 @@ class PasswordResetSubmitTokenServlet(RestServlet):
|
|||
request.setResponseCode(302)
|
||||
request.setHeader("Location", next_link)
|
||||
finish_request(request)
|
||||
defer.returnValue(None)
|
||||
return None
|
||||
|
||||
# Otherwise show the success template
|
||||
html = self.config.email_password_reset_success_html_content
|
||||
|
|
@ -295,7 +295,7 @@ class PasswordResetSubmitTokenServlet(RestServlet):
|
|||
|
||||
request.write(html.encode("utf-8"))
|
||||
finish_request(request)
|
||||
defer.returnValue(None)
|
||||
return None
|
||||
|
||||
def load_jinja2_template(self, template_dir, template_filename, template_vars):
|
||||
"""Loads a jinja2 template with variables to insert
|
||||
|
|
@ -330,7 +330,7 @@ class PasswordResetSubmitTokenServlet(RestServlet):
|
|||
)
|
||||
response_code = 200 if valid else 400
|
||||
|
||||
defer.returnValue((response_code, {"success": valid}))
|
||||
return (response_code, {"success": valid})
|
||||
|
||||
|
||||
class PasswordRestServlet(RestServlet):
|
||||
|
|
@ -399,7 +399,7 @@ class PasswordRestServlet(RestServlet):
|
|||
|
||||
yield self._set_password_handler.set_password(user_id, new_password, requester)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
def on_OPTIONS(self, _):
|
||||
return 200, {}
|
||||
|
|
@ -434,7 +434,7 @@ class DeactivateAccountRestServlet(RestServlet):
|
|||
yield self._deactivate_account_handler.deactivate_account(
|
||||
requester.user.to_string(), erase
|
||||
)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
yield self.auth_handler.validate_user_via_ui_auth(
|
||||
requester, body, self.hs.get_ip_from_request(request)
|
||||
|
|
@ -447,7 +447,7 @@ class DeactivateAccountRestServlet(RestServlet):
|
|||
else:
|
||||
id_server_unbind_result = "no-support"
|
||||
|
||||
defer.returnValue((200, {"id_server_unbind_result": id_server_unbind_result}))
|
||||
return (200, {"id_server_unbind_result": id_server_unbind_result})
|
||||
|
||||
|
||||
class EmailThreepidRequestTokenRestServlet(RestServlet):
|
||||
|
|
@ -481,7 +481,7 @@ class EmailThreepidRequestTokenRestServlet(RestServlet):
|
|||
raise SynapseError(400, "Email is already in use", Codes.THREEPID_IN_USE)
|
||||
|
||||
ret = yield self.identity_handler.requestEmailToken(**body)
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
|
||||
class MsisdnThreepidRequestTokenRestServlet(RestServlet):
|
||||
|
|
@ -516,7 +516,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet):
|
|||
raise SynapseError(400, "MSISDN is already in use", Codes.THREEPID_IN_USE)
|
||||
|
||||
ret = yield self.identity_handler.requestMsisdnToken(**body)
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
|
||||
class ThreepidRestServlet(RestServlet):
|
||||
|
|
@ -536,7 +536,7 @@ class ThreepidRestServlet(RestServlet):
|
|||
|
||||
threepids = yield self.datastore.user_get_threepids(requester.user.to_string())
|
||||
|
||||
defer.returnValue((200, {"threepids": threepids}))
|
||||
return (200, {"threepids": threepids})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_POST(self, request):
|
||||
|
|
@ -568,7 +568,7 @@ class ThreepidRestServlet(RestServlet):
|
|||
logger.debug("Binding threepid %s to %s", threepid, user_id)
|
||||
yield self.identity_handler.bind_threepid(threePidCreds, user_id)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class ThreepidDeleteRestServlet(RestServlet):
|
||||
|
|
@ -603,7 +603,7 @@ class ThreepidDeleteRestServlet(RestServlet):
|
|||
else:
|
||||
id_server_unbind_result = "no-support"
|
||||
|
||||
defer.returnValue((200, {"id_server_unbind_result": id_server_unbind_result}))
|
||||
return (200, {"id_server_unbind_result": id_server_unbind_result})
|
||||
|
||||
|
||||
class WhoamiRestServlet(RestServlet):
|
||||
|
|
@ -617,7 +617,7 @@ class WhoamiRestServlet(RestServlet):
|
|||
def on_GET(self, request):
|
||||
requester = yield self.auth.get_user_by_req(request)
|
||||
|
||||
defer.returnValue((200, {"user_id": requester.user.to_string()}))
|
||||
return (200, {"user_id": requester.user.to_string()})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class AccountDataServlet(RestServlet):
|
|||
|
||||
self.notifier.on_new_event("account_data_key", max_id, users=[user_id])
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_GET(self, request, user_id, account_data_type):
|
||||
|
|
@ -70,7 +70,7 @@ class AccountDataServlet(RestServlet):
|
|||
if event is None:
|
||||
raise NotFoundError("Account data not found")
|
||||
|
||||
defer.returnValue((200, event))
|
||||
return (200, event)
|
||||
|
||||
|
||||
class RoomAccountDataServlet(RestServlet):
|
||||
|
|
@ -112,7 +112,7 @@ class RoomAccountDataServlet(RestServlet):
|
|||
|
||||
self.notifier.on_new_event("account_data_key", max_id, users=[user_id])
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_GET(self, request, user_id, room_id, account_data_type):
|
||||
|
|
@ -127,7 +127,7 @@ class RoomAccountDataServlet(RestServlet):
|
|||
if event is None:
|
||||
raise NotFoundError("Room account data not found")
|
||||
|
||||
defer.returnValue((200, event))
|
||||
return (200, event)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ class AccountValidityRenewServlet(RestServlet):
|
|||
)
|
||||
request.write(AccountValidityRenewServlet.SUCCESS_HTML)
|
||||
finish_request(request)
|
||||
defer.returnValue(None)
|
||||
return None
|
||||
|
||||
|
||||
class AccountValiditySendMailServlet(RestServlet):
|
||||
|
|
@ -87,7 +87,7 @@ class AccountValiditySendMailServlet(RestServlet):
|
|||
user_id = requester.user.to_string()
|
||||
yield self.account_activity_handler.send_renewal_email_to_user(user_id)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ class AuthRestServlet(RestServlet):
|
|||
request.write(html_bytes)
|
||||
finish_request(request)
|
||||
|
||||
defer.returnValue(None)
|
||||
return None
|
||||
elif stagetype == LoginType.TERMS:
|
||||
if ("session" not in request.args or len(request.args["session"])) == 0:
|
||||
raise SynapseError(400, "No session supplied")
|
||||
|
|
@ -239,7 +239,7 @@ class AuthRestServlet(RestServlet):
|
|||
|
||||
request.write(html_bytes)
|
||||
finish_request(request)
|
||||
defer.returnValue(None)
|
||||
return None
|
||||
else:
|
||||
raise SynapseError(404, "Unknown auth stage type")
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ class CapabilitiesRestServlet(RestServlet):
|
|||
"m.change_password": {"enabled": change_password},
|
||||
}
|
||||
}
|
||||
defer.returnValue((200, response))
|
||||
return (200, response)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class DevicesRestServlet(RestServlet):
|
|||
devices = yield self.device_handler.get_devices_by_user(
|
||||
requester.user.to_string()
|
||||
)
|
||||
defer.returnValue((200, {"devices": devices}))
|
||||
return (200, {"devices": devices})
|
||||
|
||||
|
||||
class DeleteDevicesRestServlet(RestServlet):
|
||||
|
|
@ -91,7 +91,7 @@ class DeleteDevicesRestServlet(RestServlet):
|
|||
yield self.device_handler.delete_devices(
|
||||
requester.user.to_string(), body["devices"]
|
||||
)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class DeviceRestServlet(RestServlet):
|
||||
|
|
@ -114,7 +114,7 @@ class DeviceRestServlet(RestServlet):
|
|||
device = yield self.device_handler.get_device(
|
||||
requester.user.to_string(), device_id
|
||||
)
|
||||
defer.returnValue((200, device))
|
||||
return (200, device)
|
||||
|
||||
@interactive_auth_handler
|
||||
@defer.inlineCallbacks
|
||||
|
|
@ -137,7 +137,7 @@ class DeviceRestServlet(RestServlet):
|
|||
)
|
||||
|
||||
yield self.device_handler.delete_device(requester.user.to_string(), device_id)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, device_id):
|
||||
|
|
@ -147,7 +147,7 @@ class DeviceRestServlet(RestServlet):
|
|||
yield self.device_handler.update_device(
|
||||
requester.user.to_string(), device_id, body
|
||||
)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class GetFilterRestServlet(RestServlet):
|
|||
user_localpart=target_user.localpart, filter_id=filter_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, filter.get_filter_json()))
|
||||
return (200, filter.get_filter_json())
|
||||
except (KeyError, StoreError):
|
||||
raise SynapseError(400, "No such filter", errcode=Codes.NOT_FOUND)
|
||||
|
||||
|
|
@ -89,7 +89,7 @@ class CreateFilterRestServlet(RestServlet):
|
|||
user_localpart=target_user.localpart, user_filter=content
|
||||
)
|
||||
|
||||
defer.returnValue((200, {"filter_id": str(filter_id)}))
|
||||
return (200, {"filter_id": str(filter_id)})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class GroupServlet(RestServlet):
|
|||
group_id, requester_user_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, group_description))
|
||||
return (200, group_description)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_POST(self, request, group_id):
|
||||
|
|
@ -59,7 +59,7 @@ class GroupServlet(RestServlet):
|
|||
group_id, requester_user_id, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class GroupSummaryServlet(RestServlet):
|
||||
|
|
@ -83,7 +83,7 @@ class GroupSummaryServlet(RestServlet):
|
|||
group_id, requester_user_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, get_group_summary))
|
||||
return (200, get_group_summary)
|
||||
|
||||
|
||||
class GroupSummaryRoomsCatServlet(RestServlet):
|
||||
|
|
@ -120,7 +120,7 @@ class GroupSummaryRoomsCatServlet(RestServlet):
|
|||
content=content,
|
||||
)
|
||||
|
||||
defer.returnValue((200, resp))
|
||||
return (200, resp)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, group_id, category_id, room_id):
|
||||
|
|
@ -131,7 +131,7 @@ class GroupSummaryRoomsCatServlet(RestServlet):
|
|||
group_id, requester_user_id, room_id=room_id, category_id=category_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, resp))
|
||||
return (200, resp)
|
||||
|
||||
|
||||
class GroupCategoryServlet(RestServlet):
|
||||
|
|
@ -157,7 +157,7 @@ class GroupCategoryServlet(RestServlet):
|
|||
group_id, requester_user_id, category_id=category_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, category))
|
||||
return (200, category)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, group_id, category_id):
|
||||
|
|
@ -169,7 +169,7 @@ class GroupCategoryServlet(RestServlet):
|
|||
group_id, requester_user_id, category_id=category_id, content=content
|
||||
)
|
||||
|
||||
defer.returnValue((200, resp))
|
||||
return (200, resp)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, group_id, category_id):
|
||||
|
|
@ -180,7 +180,7 @@ class GroupCategoryServlet(RestServlet):
|
|||
group_id, requester_user_id, category_id=category_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, resp))
|
||||
return (200, resp)
|
||||
|
||||
|
||||
class GroupCategoriesServlet(RestServlet):
|
||||
|
|
@ -204,7 +204,7 @@ class GroupCategoriesServlet(RestServlet):
|
|||
group_id, requester_user_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, category))
|
||||
return (200, category)
|
||||
|
||||
|
||||
class GroupRoleServlet(RestServlet):
|
||||
|
|
@ -228,7 +228,7 @@ class GroupRoleServlet(RestServlet):
|
|||
group_id, requester_user_id, role_id=role_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, category))
|
||||
return (200, category)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, group_id, role_id):
|
||||
|
|
@ -240,7 +240,7 @@ class GroupRoleServlet(RestServlet):
|
|||
group_id, requester_user_id, role_id=role_id, content=content
|
||||
)
|
||||
|
||||
defer.returnValue((200, resp))
|
||||
return (200, resp)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, group_id, role_id):
|
||||
|
|
@ -251,7 +251,7 @@ class GroupRoleServlet(RestServlet):
|
|||
group_id, requester_user_id, role_id=role_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, resp))
|
||||
return (200, resp)
|
||||
|
||||
|
||||
class GroupRolesServlet(RestServlet):
|
||||
|
|
@ -275,7 +275,7 @@ class GroupRolesServlet(RestServlet):
|
|||
group_id, requester_user_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, category))
|
||||
return (200, category)
|
||||
|
||||
|
||||
class GroupSummaryUsersRoleServlet(RestServlet):
|
||||
|
|
@ -312,7 +312,7 @@ class GroupSummaryUsersRoleServlet(RestServlet):
|
|||
content=content,
|
||||
)
|
||||
|
||||
defer.returnValue((200, resp))
|
||||
return (200, resp)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, group_id, role_id, user_id):
|
||||
|
|
@ -323,7 +323,7 @@ class GroupSummaryUsersRoleServlet(RestServlet):
|
|||
group_id, requester_user_id, user_id=user_id, role_id=role_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, resp))
|
||||
return (200, resp)
|
||||
|
||||
|
||||
class GroupRoomServlet(RestServlet):
|
||||
|
|
@ -347,7 +347,7 @@ class GroupRoomServlet(RestServlet):
|
|||
group_id, requester_user_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupUsersServlet(RestServlet):
|
||||
|
|
@ -371,7 +371,7 @@ class GroupUsersServlet(RestServlet):
|
|||
group_id, requester_user_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupInvitedUsersServlet(RestServlet):
|
||||
|
|
@ -395,7 +395,7 @@ class GroupInvitedUsersServlet(RestServlet):
|
|||
group_id, requester_user_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupSettingJoinPolicyServlet(RestServlet):
|
||||
|
|
@ -420,7 +420,7 @@ class GroupSettingJoinPolicyServlet(RestServlet):
|
|||
group_id, requester_user_id, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupCreateServlet(RestServlet):
|
||||
|
|
@ -450,7 +450,7 @@ class GroupCreateServlet(RestServlet):
|
|||
group_id, requester_user_id, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupAdminRoomsServlet(RestServlet):
|
||||
|
|
@ -477,7 +477,7 @@ class GroupAdminRoomsServlet(RestServlet):
|
|||
group_id, requester_user_id, room_id, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, group_id, room_id):
|
||||
|
|
@ -488,7 +488,7 @@ class GroupAdminRoomsServlet(RestServlet):
|
|||
group_id, requester_user_id, room_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupAdminRoomsConfigServlet(RestServlet):
|
||||
|
|
@ -516,7 +516,7 @@ class GroupAdminRoomsConfigServlet(RestServlet):
|
|||
group_id, requester_user_id, room_id, config_key, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupAdminUsersInviteServlet(RestServlet):
|
||||
|
|
@ -546,7 +546,7 @@ class GroupAdminUsersInviteServlet(RestServlet):
|
|||
group_id, user_id, requester_user_id, config
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupAdminUsersKickServlet(RestServlet):
|
||||
|
|
@ -573,7 +573,7 @@ class GroupAdminUsersKickServlet(RestServlet):
|
|||
group_id, user_id, requester_user_id, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupSelfLeaveServlet(RestServlet):
|
||||
|
|
@ -598,7 +598,7 @@ class GroupSelfLeaveServlet(RestServlet):
|
|||
group_id, requester_user_id, requester_user_id, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupSelfJoinServlet(RestServlet):
|
||||
|
|
@ -623,7 +623,7 @@ class GroupSelfJoinServlet(RestServlet):
|
|||
group_id, requester_user_id, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupSelfAcceptInviteServlet(RestServlet):
|
||||
|
|
@ -648,7 +648,7 @@ class GroupSelfAcceptInviteServlet(RestServlet):
|
|||
group_id, requester_user_id, content
|
||||
)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupSelfUpdatePublicityServlet(RestServlet):
|
||||
|
|
@ -672,7 +672,7 @@ class GroupSelfUpdatePublicityServlet(RestServlet):
|
|||
publicise = content["publicise"]
|
||||
yield self.store.update_group_publicity(group_id, requester_user_id, publicise)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class PublicisedGroupsForUserServlet(RestServlet):
|
||||
|
|
@ -694,7 +694,7 @@ class PublicisedGroupsForUserServlet(RestServlet):
|
|||
|
||||
result = yield self.groups_handler.get_publicised_groups_for_user(user_id)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class PublicisedGroupsForUsersServlet(RestServlet):
|
||||
|
|
@ -719,7 +719,7 @@ class PublicisedGroupsForUsersServlet(RestServlet):
|
|||
|
||||
result = yield self.groups_handler.bulk_get_publicised_groups(user_ids)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class GroupsForUserServlet(RestServlet):
|
||||
|
|
@ -741,7 +741,7 @@ class GroupsForUserServlet(RestServlet):
|
|||
|
||||
result = yield self.groups_handler.get_joined_groups(requester_user_id)
|
||||
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ class KeyUploadServlet(RestServlet):
|
|||
result = yield self.e2e_keys_handler.upload_keys_for_user(
|
||||
user_id, device_id, body
|
||||
)
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class KeyQueryServlet(RestServlet):
|
||||
|
|
@ -151,7 +151,7 @@ class KeyQueryServlet(RestServlet):
|
|||
timeout = parse_integer(request, "timeout", 10 * 1000)
|
||||
body = parse_json_object_from_request(request)
|
||||
result = yield self.e2e_keys_handler.query_devices(body, timeout, user_id)
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class KeyChangesServlet(RestServlet):
|
||||
|
|
@ -191,7 +191,7 @@ class KeyChangesServlet(RestServlet):
|
|||
|
||||
results = yield self.device_handler.get_user_ids_changed(user_id, from_token)
|
||||
|
||||
defer.returnValue((200, results))
|
||||
return (200, results)
|
||||
|
||||
|
||||
class OneTimeKeyServlet(RestServlet):
|
||||
|
|
@ -226,7 +226,7 @@ class OneTimeKeyServlet(RestServlet):
|
|||
timeout = parse_integer(request, "timeout", 10 * 1000)
|
||||
body = parse_json_object_from_request(request)
|
||||
result = yield self.e2e_keys_handler.claim_one_time_keys(body, timeout)
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
|
||||
class SigningKeyUploadServlet(RestServlet):
|
||||
|
|
|
|||
|
|
@ -88,9 +88,7 @@ class NotificationsServlet(RestServlet):
|
|||
returned_push_actions.append(returned_pa)
|
||||
next_token = str(pa["stream_ordering"])
|
||||
|
||||
defer.returnValue(
|
||||
(200, {"notifications": returned_push_actions, "next_token": next_token})
|
||||
)
|
||||
return (200, {"notifications": returned_push_actions, "next_token": next_token})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -83,16 +83,14 @@ class IdTokenServlet(RestServlet):
|
|||
|
||||
yield self.store.insert_open_id_token(token, ts_valid_until_ms, user_id)
|
||||
|
||||
defer.returnValue(
|
||||
(
|
||||
200,
|
||||
{
|
||||
"access_token": token,
|
||||
"token_type": "Bearer",
|
||||
"matrix_server_name": self.server_name,
|
||||
"expires_in": self.EXPIRES_MS / 1000,
|
||||
},
|
||||
)
|
||||
return (
|
||||
200,
|
||||
{
|
||||
"access_token": token,
|
||||
"token_type": "Bearer",
|
||||
"matrix_server_name": self.server_name,
|
||||
"expires_in": self.EXPIRES_MS / 1000,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ class ReadMarkerRestServlet(RestServlet):
|
|||
event_id=read_marker_event_id,
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class ReceiptRestServlet(RestServlet):
|
|||
room_id, receipt_type, user_id=requester.user.to_string(), event_id=event_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ class EmailRegisterRequestTokenRestServlet(RestServlet):
|
|||
raise SynapseError(400, "Email is already in use", Codes.THREEPID_IN_USE)
|
||||
|
||||
ret = yield self.identity_handler.requestEmailToken(**body)
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
|
||||
class MsisdnRegisterRequestTokenRestServlet(RestServlet):
|
||||
|
|
@ -138,7 +138,7 @@ class MsisdnRegisterRequestTokenRestServlet(RestServlet):
|
|||
)
|
||||
|
||||
ret = yield self.identity_handler.requestMsisdnToken(**body)
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
|
||||
class UsernameAvailabilityRestServlet(RestServlet):
|
||||
|
|
@ -178,7 +178,7 @@ class UsernameAvailabilityRestServlet(RestServlet):
|
|||
|
||||
yield self.registration_handler.check_username(username)
|
||||
|
||||
defer.returnValue((200, {"available": True}))
|
||||
return (200, {"available": True})
|
||||
|
||||
|
||||
class RegisterRestServlet(RestServlet):
|
||||
|
|
@ -230,7 +230,7 @@ class RegisterRestServlet(RestServlet):
|
|||
|
||||
if kind == b"guest":
|
||||
ret = yield self._do_guest_registration(body, address=client_addr)
|
||||
defer.returnValue(ret)
|
||||
return ret
|
||||
return
|
||||
elif kind != b"user":
|
||||
raise UnrecognizedRequestError(
|
||||
|
|
@ -282,7 +282,7 @@ class RegisterRestServlet(RestServlet):
|
|||
result = yield self._do_appservice_registration(
|
||||
desired_username, access_token, body
|
||||
)
|
||||
defer.returnValue((200, result)) # we throw for non 200 responses
|
||||
return (200, result) # we throw for non 200 responses
|
||||
return
|
||||
|
||||
# for either shared secret or regular registration, downcase the
|
||||
|
|
@ -301,7 +301,7 @@ class RegisterRestServlet(RestServlet):
|
|||
result = yield self._do_shared_secret_registration(
|
||||
desired_username, desired_password, body
|
||||
)
|
||||
defer.returnValue((200, result)) # we throw for non 200 responses
|
||||
return (200, result) # we throw for non 200 responses
|
||||
return
|
||||
|
||||
# == Normal User Registration == (everyone else)
|
||||
|
|
@ -500,7 +500,7 @@ class RegisterRestServlet(RestServlet):
|
|||
bind_msisdn=params.get("bind_msisdn"),
|
||||
)
|
||||
|
||||
defer.returnValue((200, return_dict))
|
||||
return (200, return_dict)
|
||||
|
||||
def on_OPTIONS(self, _):
|
||||
return 200, {}
|
||||
|
|
@ -510,7 +510,7 @@ class RegisterRestServlet(RestServlet):
|
|||
user_id = yield self.registration_handler.appservice_register(
|
||||
username, as_token
|
||||
)
|
||||
defer.returnValue((yield self._create_registration_details(user_id, body)))
|
||||
return (yield self._create_registration_details(user_id, body))
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def _do_shared_secret_registration(self, username, password, body):
|
||||
|
|
@ -546,7 +546,7 @@ class RegisterRestServlet(RestServlet):
|
|||
)
|
||||
|
||||
result = yield self._create_registration_details(user_id, body)
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def _create_registration_details(self, user_id, params):
|
||||
|
|
@ -570,7 +570,7 @@ class RegisterRestServlet(RestServlet):
|
|||
)
|
||||
|
||||
result.update({"access_token": access_token, "device_id": device_id})
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def _do_guest_registration(self, params, address=None):
|
||||
|
|
@ -588,16 +588,14 @@ class RegisterRestServlet(RestServlet):
|
|||
user_id, device_id, initial_display_name, is_guest=True
|
||||
)
|
||||
|
||||
defer.returnValue(
|
||||
(
|
||||
200,
|
||||
{
|
||||
"user_id": user_id,
|
||||
"device_id": device_id,
|
||||
"access_token": access_token,
|
||||
"home_server": self.hs.hostname,
|
||||
},
|
||||
)
|
||||
return (
|
||||
200,
|
||||
{
|
||||
"user_id": user_id,
|
||||
"device_id": device_id,
|
||||
"access_token": access_token,
|
||||
"home_server": self.hs.hostname,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -72,11 +72,13 @@ class RelationSendServlet(RestServlet):
|
|||
"POST",
|
||||
client_patterns(self.PATTERN + "$", releases=()),
|
||||
self.on_PUT_or_POST,
|
||||
self.__class__.__name__,
|
||||
)
|
||||
http_server.register_paths(
|
||||
"PUT",
|
||||
client_patterns(self.PATTERN + "/(?P<txn_id>[^/]*)$", releases=()),
|
||||
self.on_PUT,
|
||||
self.__class__.__name__,
|
||||
)
|
||||
|
||||
def on_PUT(self, request, *args, **kwargs):
|
||||
|
|
@ -116,7 +118,7 @@ class RelationSendServlet(RestServlet):
|
|||
requester, event_dict=event_dict, txn_id=txn_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, {"event_id": event.event_id}))
|
||||
return (200, {"event_id": event.event_id})
|
||||
|
||||
|
||||
class RelationPaginationServlet(RestServlet):
|
||||
|
|
@ -196,7 +198,7 @@ class RelationPaginationServlet(RestServlet):
|
|||
return_value["chunk"] = events
|
||||
return_value["original_event"] = original_event
|
||||
|
||||
defer.returnValue((200, return_value))
|
||||
return (200, return_value)
|
||||
|
||||
|
||||
class RelationAggregationPaginationServlet(RestServlet):
|
||||
|
|
@ -268,7 +270,7 @@ class RelationAggregationPaginationServlet(RestServlet):
|
|||
to_token=to_token,
|
||||
)
|
||||
|
||||
defer.returnValue((200, pagination_chunk.to_dict()))
|
||||
return (200, pagination_chunk.to_dict())
|
||||
|
||||
|
||||
class RelationAggregationGroupPaginationServlet(RestServlet):
|
||||
|
|
@ -354,7 +356,7 @@ class RelationAggregationGroupPaginationServlet(RestServlet):
|
|||
return_value = result.to_dict()
|
||||
return_value["chunk"] = events
|
||||
|
||||
defer.returnValue((200, return_value))
|
||||
return (200, return_value)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ class ReportEventRestServlet(RestServlet):
|
|||
received_ts=self.clock.time_msec(),
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ class RoomKeysServlet(RestServlet):
|
|||
body = {"rooms": {room_id: body}}
|
||||
|
||||
yield self.e2e_room_keys_handler.upload_room_keys(user_id, version, body)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_GET(self, request, room_id, session_id):
|
||||
|
|
@ -218,7 +218,7 @@ class RoomKeysServlet(RestServlet):
|
|||
else:
|
||||
room_keys = room_keys["rooms"][room_id]
|
||||
|
||||
defer.returnValue((200, room_keys))
|
||||
return (200, room_keys)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, room_id, session_id):
|
||||
|
|
@ -242,7 +242,7 @@ class RoomKeysServlet(RestServlet):
|
|||
yield self.e2e_room_keys_handler.delete_room_keys(
|
||||
user_id, version, room_id, session_id
|
||||
)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class RoomKeysNewVersionServlet(RestServlet):
|
||||
|
|
@ -293,7 +293,7 @@ class RoomKeysNewVersionServlet(RestServlet):
|
|||
info = parse_json_object_from_request(request)
|
||||
|
||||
new_version = yield self.e2e_room_keys_handler.create_version(user_id, info)
|
||||
defer.returnValue((200, {"version": new_version}))
|
||||
return (200, {"version": new_version})
|
||||
|
||||
# we deliberately don't have a PUT /version, as these things really should
|
||||
# be immutable to avoid people footgunning
|
||||
|
|
@ -338,7 +338,7 @@ class RoomKeysVersionServlet(RestServlet):
|
|||
except SynapseError as e:
|
||||
if e.code == 404:
|
||||
raise SynapseError(404, "No backup found", Codes.NOT_FOUND)
|
||||
defer.returnValue((200, info))
|
||||
return (200, info)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, version):
|
||||
|
|
@ -358,7 +358,7 @@ class RoomKeysVersionServlet(RestServlet):
|
|||
user_id = requester.user.to_string()
|
||||
|
||||
yield self.e2e_room_keys_handler.delete_version(user_id, version)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, version):
|
||||
|
|
@ -392,7 +392,7 @@ class RoomKeysVersionServlet(RestServlet):
|
|||
)
|
||||
|
||||
yield self.e2e_room_keys_handler.update_version(user_id, version, info)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ class RoomUpgradeRestServlet(RestServlet):
|
|||
|
||||
ret = {"replacement_room": new_room_id}
|
||||
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ class SendToDeviceRestServlet(servlet.RestServlet):
|
|||
)
|
||||
|
||||
response = (200, {})
|
||||
defer.returnValue(response)
|
||||
return response
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ class SyncRestServlet(RestServlet):
|
|||
time_now, sync_result, requester.access_token_id, filter
|
||||
)
|
||||
|
||||
defer.returnValue((200, response_content))
|
||||
return (200, response_content)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def encode_response(self, time_now, sync_result, access_token_id, filter):
|
||||
|
|
@ -205,27 +205,23 @@ class SyncRestServlet(RestServlet):
|
|||
event_formatter,
|
||||
)
|
||||
|
||||
defer.returnValue(
|
||||
{
|
||||
"account_data": {"events": sync_result.account_data},
|
||||
"to_device": {"events": sync_result.to_device},
|
||||
"device_lists": {
|
||||
"changed": list(sync_result.device_lists.changed),
|
||||
"left": list(sync_result.device_lists.left),
|
||||
},
|
||||
"presence": SyncRestServlet.encode_presence(
|
||||
sync_result.presence, time_now
|
||||
),
|
||||
"rooms": {"join": joined, "invite": invited, "leave": archived},
|
||||
"groups": {
|
||||
"join": sync_result.groups.join,
|
||||
"invite": sync_result.groups.invite,
|
||||
"leave": sync_result.groups.leave,
|
||||
},
|
||||
"device_one_time_keys_count": sync_result.device_one_time_keys_count,
|
||||
"next_batch": sync_result.next_batch.to_string(),
|
||||
}
|
||||
)
|
||||
return {
|
||||
"account_data": {"events": sync_result.account_data},
|
||||
"to_device": {"events": sync_result.to_device},
|
||||
"device_lists": {
|
||||
"changed": list(sync_result.device_lists.changed),
|
||||
"left": list(sync_result.device_lists.left),
|
||||
},
|
||||
"presence": SyncRestServlet.encode_presence(sync_result.presence, time_now),
|
||||
"rooms": {"join": joined, "invite": invited, "leave": archived},
|
||||
"groups": {
|
||||
"join": sync_result.groups.join,
|
||||
"invite": sync_result.groups.invite,
|
||||
"leave": sync_result.groups.leave,
|
||||
},
|
||||
"device_one_time_keys_count": sync_result.device_one_time_keys_count,
|
||||
"next_batch": sync_result.next_batch.to_string(),
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def encode_presence(events, time_now):
|
||||
|
|
@ -273,7 +269,7 @@ class SyncRestServlet(RestServlet):
|
|||
event_formatter=event_formatter,
|
||||
)
|
||||
|
||||
defer.returnValue(joined)
|
||||
return joined
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def encode_invited(self, rooms, time_now, token_id, event_formatter):
|
||||
|
|
@ -309,7 +305,7 @@ class SyncRestServlet(RestServlet):
|
|||
invited_state.append(invite)
|
||||
invited[room.room_id] = {"invite_state": {"events": invited_state}}
|
||||
|
||||
defer.returnValue(invited)
|
||||
return invited
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def encode_archived(self, rooms, time_now, token_id, event_fields, event_formatter):
|
||||
|
|
@ -342,7 +338,7 @@ class SyncRestServlet(RestServlet):
|
|||
event_formatter=event_formatter,
|
||||
)
|
||||
|
||||
defer.returnValue(joined)
|
||||
return joined
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def encode_room(
|
||||
|
|
@ -414,7 +410,7 @@ class SyncRestServlet(RestServlet):
|
|||
result["unread_notifications"] = room.unread_notifications
|
||||
result["summary"] = room.summary
|
||||
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class TagListServlet(RestServlet):
|
|||
|
||||
tags = yield self.store.get_tags_for_room(user_id, room_id)
|
||||
|
||||
defer.returnValue((200, {"tags": tags}))
|
||||
return (200, {"tags": tags})
|
||||
|
||||
|
||||
class TagServlet(RestServlet):
|
||||
|
|
@ -76,7 +76,7 @@ class TagServlet(RestServlet):
|
|||
|
||||
self.notifier.on_new_event("account_data_key", max_id, users=[user_id])
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, user_id, room_id, tag):
|
||||
|
|
@ -88,7 +88,7 @@ class TagServlet(RestServlet):
|
|||
|
||||
self.notifier.on_new_event("account_data_key", max_id, users=[user_id])
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class ThirdPartyProtocolsServlet(RestServlet):
|
|||
yield self.auth.get_user_by_req(request, allow_guest=True)
|
||||
|
||||
protocols = yield self.appservice_handler.get_3pe_protocols()
|
||||
defer.returnValue((200, protocols))
|
||||
return (200, protocols)
|
||||
|
||||
|
||||
class ThirdPartyProtocolServlet(RestServlet):
|
||||
|
|
@ -60,9 +60,9 @@ class ThirdPartyProtocolServlet(RestServlet):
|
|||
only_protocol=protocol
|
||||
)
|
||||
if protocol in protocols:
|
||||
defer.returnValue((200, protocols[protocol]))
|
||||
return (200, protocols[protocol])
|
||||
else:
|
||||
defer.returnValue((404, {"error": "Unknown protocol"}))
|
||||
return (404, {"error": "Unknown protocol"})
|
||||
|
||||
|
||||
class ThirdPartyUserServlet(RestServlet):
|
||||
|
|
@ -85,7 +85,7 @@ class ThirdPartyUserServlet(RestServlet):
|
|||
ThirdPartyEntityKind.USER, protocol, fields
|
||||
)
|
||||
|
||||
defer.returnValue((200, results))
|
||||
return (200, results)
|
||||
|
||||
|
||||
class ThirdPartyLocationServlet(RestServlet):
|
||||
|
|
@ -108,7 +108,7 @@ class ThirdPartyLocationServlet(RestServlet):
|
|||
ThirdPartyEntityKind.LOCATION, protocol, fields
|
||||
)
|
||||
|
||||
defer.returnValue((200, results))
|
||||
return (200, results)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ class UserDirectorySearchRestServlet(RestServlet):
|
|||
user_id = requester.user.to_string()
|
||||
|
||||
if not self.hs.config.user_directory_search_enabled:
|
||||
defer.returnValue((200, {"limited": False, "results": []}))
|
||||
return (200, {"limited": False, "results": []})
|
||||
|
||||
body = parse_json_object_from_request(request)
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ class UserDirectorySearchRestServlet(RestServlet):
|
|||
user_id, search_term, limit
|
||||
)
|
||||
|
||||
defer.returnValue((200, results))
|
||||
return (200, results)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue