OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages 

Allow error strings from spam checker
pull/2542/head
David Baker 2017-10-12 10:31:03 +01:00 committed by GitHub
parent cc794d60e7 b78bae2d51
commit b8d8ed1ba9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/message.py
View File

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2014 - 2016 OpenMarket Ltd # Copyright 2014 - 2016 OpenMarket Ltd
# Copyright 2017 New Vector Ltd
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -325,9 +326,12 @@ class MessageHandler(BaseHandler):
txn_id=txn_id txn_id=txn_id
) )
if self.spam_checker.check_event_for_spam(event): spam_error = self.spam_checker.check_event_for_spam(event)
if spam_error:
if not isinstance(spam_error, basestring):
spam_error = "Spam is not permitted here"
raise SynapseError( raise SynapseError(
403, "Spam is not permitted here", Codes.FORBIDDEN 403, spam_error, Codes.FORBIDDEN
) )
yield self.send_nonmember_event( yield self.send_nonmember_event(