support admin_email config and pass through into blocking errors, return AuthError in all cases

This commit is contained in:
Neil Johnson 2018-08-13 18:00:23 +01:00 committed by Neil Johnson
parent 8ba2dac6ea
commit f4b49152e2
7 changed files with 45 additions and 22 deletions

View file

@ -781,11 +781,15 @@ class Auth(object):
"""
if self.hs.config.hs_disabled:
raise AuthError(
403, self.hs.config.hs_disabled_message, errcode=Codes.HS_DISABLED
403, self.hs.config.hs_disabled_message,
errcode=Codes.HS_DISABLED,
admin_email=self.hs.config.admin_email,
)
if self.hs.config.limit_usage_by_mau is True:
current_mau = yield self.store.get_monthly_active_count()
if current_mau >= self.hs.config.max_mau_value:
raise AuthError(
403, "MAU Limit Exceeded", errcode=Codes.MAU_LIMIT_EXCEEDED
403, "MAU Limit Exceeded",
admin_email=self.hs.config.admin_email,
errcode=Codes.MAU_LIMIT_EXCEEDED
)