diff options
| author | Krombel <krombel@krombel.de> | 2018-07-13 21:40:14 +0200 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2018-07-13 21:40:14 +0200 |
| commit | 32fd6910d0175f14d9be756ac2241da683af83bb (patch) | |
| tree | 40ee591606c439c8309eb0aa25a01d1fef8f76d8 /synapse/rest/client/v1/pusher.py | |
| parent | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queue (diff) | |
| download | synapse-32fd6910d0175f14d9be756ac2241da683af83bb.tar.xz | |
Use parse_{int,str} and assert from http.servlet
parse_integer and parse_string can take a request and raise errors in case we have wrong or missing params. This PR tries to use them more to deduplicate some code and make it better readable
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py index 1581f88db5..95b9252b61 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py @@ -21,6 +21,7 @@ from synapse.api.errors import Codes, StoreError, SynapseError from synapse.http.server import finish_request from synapse.http.servlet import ( RestServlet, + assert_params_in_request, parse_json_object_from_request, parse_string, ) @@ -91,15 +92,11 @@ class PushersSetRestServlet(ClientV1RestServlet): ) defer.returnValue((200, {})) - reqd = ['kind', 'app_id', 'app_display_name', - 'device_display_name', 'pushkey', 'lang', 'data'] - missing = [] - for i in reqd: - if i not in content: - missing.append(i) - if len(missing): - raise SynapseError(400, "Missing parameters: " + ','.join(missing), - errcode=Codes.MISSING_PARAM) + assert_params_in_request( + content, + ['kind', 'app_id', 'app_display_name', + 'device_display_name', 'pushkey', 'lang', 'data'] + ) logger.debug("set pushkey %s to kind %s", content['pushkey'], content['kind']) logger.debug("Got pushers request with body: %r", content) @@ -148,7 +145,7 @@ class PushersRemoveRestServlet(RestServlet): SUCCESS_HTML = "<html><body>You have been unsubscribed</body><html>" def __init__(self, hs): - super(RestServlet, self).__init__() + super(PushersRemoveRestServlet, self).__init__() self.hs = hs self.notifier = hs.get_notifier() self.auth = hs.get_auth() |