Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add slightly pedantic trailing slash error.

Browse Source
This commit is contained in:
David Baker 2015-01-23 11:19:02 +00:00
parent f87586e661
commit 49fe31792b
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/api/errors.py
View File

@ -88,9 +88,14 @@ class UnrecognizedRequestError(SynapseError):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if "errcode" not in kwargs: if "errcode" not in kwargs:
kwargs["errcode"] = Codes.UNRECOGNIZED kwargs["errcode"] = Codes.UNRECOGNIZED
message = None
if len(args) == 0:
message = "Unrecognized request"
else:
message = args[0]
super(UnrecognizedRequestError, self).__init__( super(UnrecognizedRequestError, self).__init__(
400, 400,
"Unrecognized request", message,
**kwargs **kwargs
) )

17
synapse/rest/client/v1/push_rule.py
View File

@ -32,6 +32,8 @@ class PushRuleRestServlet(RestServlet):
'override': 4 'override': 4
} }
PRIORITY_CLASS_INVERSE_MAP = {v: k for k,v in PRIORITY_CLASS_MAP.items()} PRIORITY_CLASS_INVERSE_MAP = {v: k for k,v in PRIORITY_CLASS_MAP.items()}
SLIGHTLY_PEDANTIC_TRAILING_SLASH_ERROR =\
"Unrecognised request: You probably wanted a trailing slash"
def rule_spec_from_path(self, path): def rule_spec_from_path(self, path):
if len(path) < 2: if len(path) < 2:
@ -211,10 +213,14 @@ class PushRuleRestServlet(RestServlet):
rulearray.append(template_rule) rulearray.append(template_rule)
path = request.postpath[1:] path = request.postpath[1:]
if path == []:
defer.returnValue((200, rules))
if path[0] == 'global': if path == []:
# we're a reference impl: pedantry is our job.
raise UnrecognizedRequestError(PushRuleRestServlet.SLIGHTLY_PEDANTIC_TRAILING_SLASH_ERROR)
if path[0] == '':
defer.returnValue((200, rules))
elif path[0] == 'global':
path = path[1:] path = path[1:]
result = _filter_ruleset_with_path(rules['global'], path) result = _filter_ruleset_with_path(rules['global'], path)
defer.returnValue((200, result)) defer.returnValue((200, result))
@ -255,12 +261,17 @@ def _instance_handle_from_conditions(conditions):
def _filter_ruleset_with_path(ruleset, path): def _filter_ruleset_with_path(ruleset, path):
if path == []: if path == []:
raise UnrecognizedRequestError(PushRuleRestServlet.SLIGHTLY_PEDANTIC_TRAILING_SLASH_ERROR)
if path[0] == '':
return ruleset return ruleset
template_kind = path[0] template_kind = path[0]
if template_kind not in ruleset: if template_kind not in ruleset:
raise UnrecognizedRequestError() raise UnrecognizedRequestError()
path = path[1:] path = path[1:]
if path == []: if path == []:
raise UnrecognizedRequestError(PushRuleRestServlet.SLIGHTLY_PEDANTIC_TRAILING_SLASH_ERROR)
if path[0] == '':
return ruleset[template_kind] return ruleset[template_kind]
rule_id = path[0] rule_id = path[0]
for r in ruleset[template_kind]: for r in ruleset[template_kind]: