From 6cd5fcd5366cfef4959d107e818d0e20d78aa483 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Sep 2017 19:20:23 +0100
Subject: Make the spam checker a module

---
 synapse/events/spamcheck.py | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 56fa9e556e..7b22b3413a 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -13,26 +13,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+class SpamChecker(object):
+    def __init__(self, hs):
+        self.spam_checker = None
 
-def check_event_for_spam(event):
-    """Checks if a given event is considered "spammy" by this server.
+        if hs.config.spam_checker is not None:
+            module, config = hs.config.spam_checker
+            print("cfg %r", config)
+            self.spam_checker = module(config=config)
 
-    If the server considers an event spammy, then it will be rejected if
-    sent by a local user. If it is sent by a user on another server, then
-    users receive a blank event.
+    def check_event_for_spam(self, event):
+        """Checks if a given event is considered "spammy" by this server.
 
-    Args:
-        event (synapse.events.EventBase): the event to be checked
+        If the server considers an event spammy, then it will be rejected if
+        sent by a local user. If it is sent by a user on another server, then
+        users receive a blank event.
 
-    Returns:
-        bool: True if the event is spammy.
-    """
-    if not hasattr(event, "content") or "body" not in event.content:
-        return False
+        Args:
+            event (synapse.events.EventBase): the event to be checked
 
-    # for example:
-    #
-    # if "the third flower is green" in event.content["body"]:
-    #    return True
+        Returns:
+            bool: True if the event is spammy.
+        """
+        if self.spam_checker is None:
+            return False
 
-    return False
+        return self.spam_checker.check_event_for_spam(event)
-- 
cgit 1.5.1


From 60c78666abbf82c3adfaa3bb4faf86f867eb18ea Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 27 Sep 2017 10:26:13 +0100
Subject: pep8

---
 synapse/events/spamcheck.py   | 1 +
 synapse/util/module_loader.py | 1 +
 2 files changed, 2 insertions(+)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 7b22b3413a..a876bcb816 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 class SpamChecker(object):
     def __init__(self, hs):
         self.spam_checker = None
diff --git a/synapse/util/module_loader.py b/synapse/util/module_loader.py
index 4b51d7a77b..4288312b8a 100644
--- a/synapse/util/module_loader.py
+++ b/synapse/util/module_loader.py
@@ -17,6 +17,7 @@ import importlib
 
 from synapse.config._base import ConfigError
 
+
 def load_module(provider):
     """ Loads a module with its config
     Take a dict with keys 'module' (the module name) and 'config'
-- 
cgit 1.5.1


From 8c06dd607165c109de23aa41098a8b45e02dcbd8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 27 Sep 2017 10:31:14 +0100
Subject: Remove unintentional debugging

---
 synapse/events/spamcheck.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index a876bcb816..8ddbf2ca38 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -20,7 +20,6 @@ class SpamChecker(object):
 
         if hs.config.spam_checker is not None:
             module, config = hs.config.spam_checker
-            print("cfg %r", config)
             self.spam_checker = module(config=config)
 
     def check_event_for_spam(self, event):
-- 
cgit 1.5.1


From ef3a5ae787e2fa25cc753b7c5dc9f31ba3bf4316 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 27 Sep 2017 11:24:19 +0100
Subject: Don't test is spam_checker not None

Sometimes it's a Mock object which is not none but is still not
what we're after
---
 synapse/events/spamcheck.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 8ddbf2ca38..e739f105b2 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -18,8 +18,14 @@ class SpamChecker(object):
     def __init__(self, hs):
         self.spam_checker = None
 
-        if hs.config.spam_checker is not None:
+        module = None
+        config = None
+        try:
             module, config = hs.config.spam_checker
+        except:
+            pass
+
+        if module is not None:
             self.spam_checker = module(config=config)
 
     def check_event_for_spam(self, event):
-- 
cgit 1.5.1


From 537088e7dceff8af4b283e11e46d7df7e2f38065 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Oct 2017 14:28:12 +0100
Subject: Actually write warpper function

---
 synapse/events/spamcheck.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index e739f105b2..605261f4b5 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -45,3 +45,19 @@ class SpamChecker(object):
             return False
 
         return self.spam_checker.check_event_for_spam(event)
+
+    def user_may_invite(self, userid):
+        """Checks if a given user may send an invite
+
+        If this method returns false, the invite will be rejected.
+
+        Args:
+            userid (string): The sender's user ID
+
+        Returns:
+            bool: True if the user may send an invite, otherwise False
+        """
+        if self.spam_checker is None:
+            return True
+
+        return self.spam_checker.user_may_invite(userid)
-- 
cgit 1.5.1


From 1e375468de914fdefc7c0b4b65217c4ec95784a4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Oct 2017 17:13:14 +0100
Subject: pass room id too

---
 synapse/events/spamcheck.py     | 4 ++--
 synapse/handlers/federation.py  | 2 +-
 synapse/handlers/room_member.py | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 605261f4b5..fe2d22a6f2 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -46,7 +46,7 @@ class SpamChecker(object):
 
         return self.spam_checker.check_event_for_spam(event)
 
-    def user_may_invite(self, userid):
+    def user_may_invite(self, userid, roomid):
         """Checks if a given user may send an invite
 
         If this method returns false, the invite will be rejected.
@@ -60,4 +60,4 @@ class SpamChecker(object):
         if self.spam_checker is None:
             return True
 
-        return self.spam_checker.user_may_invite(userid)
+        return self.spam_checker.user_may_invite(userid, roomid)
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 8571350cc8..737fe518ef 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1078,7 +1078,7 @@ class FederationHandler(BaseHandler):
         if self.hs.config.block_non_admin_invites:
             raise SynapseError(403, "This server does not accept room invites")
 
-        if not self.spam_checker.user_may_invite(event.sender):
+        if not self.spam_checker.user_may_invite(event.sender, event.room_id):
             raise SynapseError(
                 403, "This user is not permitted to send invites to this server"
             )
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index a33a8ad42b..37985fa1f9 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -224,7 +224,9 @@ class RoomMemberHandler(BaseHandler):
                     )
                     block_invite = True
 
-                if not self.spam_checker.user_may_invite(requester.user.to_string()):
+                if not self.spam_checker.user_may_invite(
+                    requester.user.to_string(), room_id,
+                ):
                     logger.info("Blocking invite due to spam checker")
                     block_invite = True
 
-- 
cgit 1.5.1


From 1e2ac543516baaec06d4e0ebdd2dbbe003e1f73b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Oct 2017 17:41:38 +0100
Subject: s/roomid/room_id/

---
 synapse/events/spamcheck.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index fe2d22a6f2..8b01c091e9 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -46,7 +46,7 @@ class SpamChecker(object):
 
         return self.spam_checker.check_event_for_spam(event)
 
-    def user_may_invite(self, userid, roomid):
+    def user_may_invite(self, userid, room_id):
         """Checks if a given user may send an invite
 
         If this method returns false, the invite will be rejected.
@@ -60,4 +60,4 @@ class SpamChecker(object):
         if self.spam_checker is None:
             return True
 
-        return self.spam_checker.user_may_invite(userid, roomid)
+        return self.spam_checker.user_may_invite(userid, room_id)
-- 
cgit 1.5.1


From 197c14dbcfa9bc5bb281833a91ee035cb154216d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 4 Oct 2017 10:47:54 +0100
Subject: Add room creation checks to spam checker

Lets the spam checker deny attempts to create rooms and add aliases
to them.
---
 synapse/events/spamcheck.py   | 32 ++++++++++++++++++++++++++++++++
 synapse/handlers/directory.py |  7 +++++++
 synapse/handlers/room.py      |  8 ++++++++
 3 files changed, 47 insertions(+)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 8b01c091e9..7cb3468df4 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -61,3 +61,35 @@ class SpamChecker(object):
             return True
 
         return self.spam_checker.user_may_invite(userid, room_id)
+
+    def user_may_create_room(self, userid):
+        """Checks if a given user may create a room
+
+        If this method returns false, the creation request will be rejected.
+
+        Args:
+            userid (string): The sender's user ID
+
+        Returns:
+            bool: True if the user may create a room, otherwise False
+        """
+        if self.spam_checker is None:
+            return True
+
+        return self.spam_checker.user_may_create_room(userid)
+
+    def user_may_create_room_alias(self, userid, room_alias):
+        """Checks if a given user may create a room alias
+
+        If this method returns false, the association request will be rejected.
+
+        Args:
+            userid (string): The sender's user ID
+
+        Returns:
+            bool: True if the user may create a room alias, otherwise False
+        """
+        if self.spam_checker is None:
+            return True
+
+        return self.spam_checker.user_may_create_room_alias(userid, room_alias)
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index 943554ce98..ed18bb20bb 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -40,6 +40,8 @@ class DirectoryHandler(BaseHandler):
             "directory", self.on_directory_query
         )
 
+        self.spam_checker = hs.get_spam_checker()
+
     @defer.inlineCallbacks
     def _create_association(self, room_alias, room_id, servers=None, creator=None):
         # general association creation for both human users and app services
@@ -73,6 +75,11 @@ class DirectoryHandler(BaseHandler):
         # association creation for human users
         # TODO(erikj): Do user auth.
 
+        if not self.spam_checker.user_may_create_room_alias(user_id, room_alias):
+            raise SynapseError(
+                403, "This user is not permitted to create this alias",
+            )
+
         can_create = yield self.can_modify_alias(
             room_alias,
             user_id=user_id
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 5698d28088..f909ea04f0 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -60,6 +60,11 @@ class RoomCreationHandler(BaseHandler):
         },
     }
 
+    def __init__(self, hs):
+        super(RoomCreationHandler, self).__init__(hs)
+
+        self.spam_checker = hs.get_spam_checker()
+
     @defer.inlineCallbacks
     def create_room(self, requester, config, ratelimit=True):
         """ Creates a new room.
@@ -75,6 +80,9 @@ class RoomCreationHandler(BaseHandler):
         """
         user_id = requester.user.to_string()
 
+        if not self.spam_checker.user_may_create_room(user_id):
+                raise SynapseError(403, "You are not permitted to create rooms")
+
         if ratelimit:
             yield self.ratelimit(requester)
 
-- 
cgit 1.5.1


From d8ce68b09b0966330b4da720eeb41719c7c61be6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 4 Oct 2017 14:29:33 +0100
Subject: spam check room publishing

---
 synapse/events/spamcheck.py   | 18 ++++++++++++++++++
 synapse/handlers/directory.py |  8 ++++++++
 2 files changed, 26 insertions(+)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 7cb3468df4..595b1760f8 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -85,6 +85,7 @@ class SpamChecker(object):
 
         Args:
             userid (string): The sender's user ID
+            room_alias (string): The alias to be created
 
         Returns:
             bool: True if the user may create a room alias, otherwise False
@@ -93,3 +94,20 @@ class SpamChecker(object):
             return True
 
         return self.spam_checker.user_may_create_room_alias(userid, room_alias)
+
+    def user_may_publish_room(self, userid, room_id):
+        """Checks if a given user may publish a room to the directory
+
+        If this method returns false, the publish request will be rejected.
+
+        Args:
+            userid (string): The sender's user ID
+            room_id (string): The ID of the room that would be published
+
+        Returns:
+            bool: True if the user may publish the room, otherwise False
+        """
+        if self.spam_checker is None:
+            return True
+
+        return self.spam_checker.user_may_publish_room(userid, room_id)
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index ed18bb20bb..a0464ae5c0 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -334,6 +334,14 @@ class DirectoryHandler(BaseHandler):
         room_id (str)
         visibility (str): "public" or "private"
         """
+        if not self.spam_checker.user_may_publish_room(
+            requester.user.to_string(), room_id
+        ):
+            raise AuthError(
+                403,
+                "This user is not permitted to publish rooms to the room list"
+            )
+
         if requester.is_guest:
             raise AuthError(403, "Guests cannot edit the published room list")
 
-- 
cgit 1.5.1


From f878e6f8af9e80cfa4be717c03cc4f9853a93794 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Oct 2017 14:02:28 +0100
Subject: Spam checking: add the invitee to user_may_invite

---
 synapse/events/spamcheck.py     |  4 ++--
 synapse/handlers/federation.py  | 12 +++++++-----
 synapse/handlers/room_member.py |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'synapse/events')

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 595b1760f8..dccc579eac 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -46,7 +46,7 @@ class SpamChecker(object):
 
         return self.spam_checker.check_event_for_spam(event)
 
-    def user_may_invite(self, userid, room_id):
+    def user_may_invite(self, inviter_userid, invitee_userid, room_id):
         """Checks if a given user may send an invite
 
         If this method returns false, the invite will be rejected.
@@ -60,7 +60,7 @@ class SpamChecker(object):
         if self.spam_checker is None:
             return True
 
-        return self.spam_checker.user_may_invite(userid, room_id)
+        return self.spam_checker.user_may_invite(inviter_userid, invitee_userid, room_id)
 
     def user_may_create_room(self, userid):
         """Checks if a given user may create a room
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 737fe518ef..8fccf8bab3 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1071,6 +1071,9 @@ class FederationHandler(BaseHandler):
         """
         event = pdu
 
+        if event.state_key is None:
+            raise SynapseError(400, "The invite event did not have a state key")
+
         is_blocked = yield self.store.is_room_blocked(event.room_id)
         if is_blocked:
             raise SynapseError(403, "This room has been blocked on this server")
@@ -1078,9 +1081,11 @@ class FederationHandler(BaseHandler):
         if self.hs.config.block_non_admin_invites:
             raise SynapseError(403, "This server does not accept room invites")
 
-        if not self.spam_checker.user_may_invite(event.sender, event.room_id):
+        if not self.spam_checker.user_may_invite(
+            event.sender, event.state_key, event.room_id,
+        ):
             raise SynapseError(
-                403, "This user is not permitted to send invites to this server"
+                403, "This user is not permitted to send invites to this server/user"
             )
 
         membership = event.content.get("membership")
@@ -1091,9 +1096,6 @@ class FederationHandler(BaseHandler):
         if sender_domain != origin:
             raise SynapseError(400, "The invite event was not from the server sending it")
 
-        if event.state_key is None:
-            raise SynapseError(400, "The invite event did not have a state key")
-
         if not self.is_mine_id(event.state_key):
             raise SynapseError(400, "The invite event must be for this server")
 
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 37985fa1f9..36a8ef8ce0 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -225,7 +225,7 @@ class RoomMemberHandler(BaseHandler):
                     block_invite = True
 
                 if not self.spam_checker.user_may_invite(
-                    requester.user.to_string(), room_id,
+                    requester.user.to_string(), target.to_string(), room_id,
                 ):
                     logger.info("Blocking invite due to spam checker")
                     block_invite = True
-- 
cgit 1.5.1