diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-13 18:06:18 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-13 18:06:18 +0100 |
commit | ce7de9ae6b74e8e5e89ff442bc29f8cd73328042 (patch) | |
tree | 31fff38e9be8ffb8d4407b02cdf9a07247a11f1b /synapse/api/errors.py | |
parent | support admin_email config and pass through into blocking errors, return Auth... (diff) | |
download | synapse-ce7de9ae6b74e8e5e89ff442bc29f8cd73328042.tar.xz |
Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"
This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6.
Diffstat (limited to 'synapse/api/errors.py')
-rw-r--r-- | synapse/api/errors.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index d74848159e..dc3bed5fcb 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -225,20 +225,11 @@ class NotFoundError(SynapseError): class AuthError(SynapseError): """An error raised when there was a problem authorising an event.""" + def __init__(self, *args, **kwargs): if "errcode" not in kwargs: kwargs["errcode"] = Codes.FORBIDDEN - self.admin_email = kwargs.get('admin_email') - self.msg = kwargs.get('msg') - self.errcode = kwargs.get('errcode') - super(AuthError, self).__init__(*args, errcode=kwargs["errcode"]) - - def error_dict(self): - return cs_error( - self.msg, - self.errcode, - admin_email=self.admin_email, - ) + super(AuthError, self).__init__(*args, **kwargs) class EventSizeError(SynapseError): |