wire up bans to bot api

* move ban logic to model.py
* implement sogs.ban endpoint

Author: majestrate

sogs/events.py

@@ -71,17 +71,20 @@ def _handle_find_user(metric, query, encode=json.dumps):
     return encode(reply)
 
 
+def _decode_str(data):
+    """ decode bytes to lowercase string """
+    return data.decode('utf-8').lower()
+
+
 def _handle_find_request(msg):
     """ finds a user / room by id / token / pubkey """
     parts = msg.dataviews()
     if len(parts) != 3:
         raise Exception('3 arguments required: entity-kind, query-metric, query-value')
 
-    decode = lambda x: x.decode('utf-8').lower()
-
-    kind = decode(parts[0])
-    metric = decode(parts[1])
-    query = decode(parts[2])
+    kind = _decode_str(parts[0])
+    metric = _decode_str(parts[1])
+    query = _decode_str(parts[2])
 
     _kinds = {'room': _handle_find_room, 'user': _handle_find_user}
 
@@ -90,6 +93,19 @@ def _handle_find_request(msg):
     raise Exception("cannot find a '{}' we dont have those".format(kind))
 
 
+def _handle_mod_ban(msg):
+    """ handle a ban user from room rqeuest """
+    parts = msg.dataviews()
+    if len(parts) < 2:
+        raise Exception("Not enough arguments, need 2 arguments: user_id, room_id")
+    room_id = int(_decode_str(parts[1]))
+    user_id = int(_decode_str(parts[0]))
+    room = model.Room(id=room_id)
+    user = model.User(id=user_id)
+    if not model.ban_user(None, room, user):
+        raise Exception("user not banned")
+
+
 def _propagate_event(eventname, *args):
     """ propagate an event to everyone who cares about it """
     assert event_name_valid(eventname)
@@ -122,6 +138,7 @@ def start():
     _bot_category.add_request_handler(
         'find', lambda msg: _handle_request(_handle_find_request, msg)
     )
+    _bot_category.add_request_handler('ban', lambda msg: _handle_request(_handle_mod_ban, msg))
 
     for addr in config.API_ADDRS:
         # TODO: implement curve?

sogs/legacy_routes.py

@@ -430,50 +430,23 @@ def ban_checks():
     return user, room, to_ban
 
 
-def apply_ban(conn, user, room, to_ban):
-    is_mod = bool(
-        conn.execute(
-            "SELECT moderator FROM user_permissions WHERE room = ? AND user = ?",
-            (room.id, to_ban.id),
-        ).fetchone()[0]
-    )
-
-    if is_mod and not model.check_permission(user, room, admin=True):
-        app.logger.warn(
-            "Cannot ban {} from {}: the ban target is a room moderator, "
-            "but the ban initiator ({}) is not an admin".format(
-                to_ban.session_id, room.token, user.session_id
-            )
-        )
-        abort(http.FORBIDDEN)
-
-    conn.execute(
-        """
-        INSERT INTO user_permission_overrides (room, user, banned, moderator, admin)
-        VALUES (?, ?, TRUE, FALSE, FALSE)
-        ON CONFLICT (room, user) DO UPDATE SET banned = TRUE, moderator = FALSE, admin = FALSE
-        """,
-        (room.id, to_ban.id),
-    )
-
-
 @app.post("/legacy/block_list")
 def handle_legacy_ban():
     user, room, to_ban = ban_checks()
 
-    with db.conn as conn:
-        apply_ban(conn, user, room, to_ban)
+    if not model.ban_user(user, room, to_ban):
+        abort(http.FORBIDDEN)
 
     return jsonify({"status_code": 200})
 
 
 @app.post("/legacy/ban_and_delete_all")
 def handle_legacy_banhammer():
     user, room, to_ban = ban_checks()
+    if not model.ban_user(user, room, to_ban):
+        abort(http.FORBIDDEN)
 
     with db.conn as conn:
-        apply_ban(conn, user, room, to_ban)
-
         cur = conn.cursor()
         cur.execute(
             """

sogs/model.py

@@ -184,7 +184,6 @@ def get_mods(self, user=None):
             if session_id is not None and session_id == curr_session_id:
                 we_are_hidden = not visible
                 we_are_admin = admin
-
             (mods if visible else hidden_mods).append(session_id)
 
         if we_are_admin:
@@ -636,3 +635,35 @@ def get_message_deprecated(room_id, since, limit=256):
             }
         )
     return msgs
+
+
+def ban_user(mod_user, room, ban_user):
+    """as a moderator mod_user ban a user from a room
+    return True if the user was banned, otherwise return False
+    """
+    with db.conn as conn:
+        is_mod = bool(
+            conn.execute(
+                "SELECT moderator FROM user_permissions WHERE room = ? AND user = ?",
+                (room.id, ban_user.id),
+            ).fetchone()[0]
+        )
+
+        if mod_user and is_mod and not check_permission(mod_user, room, admin=True):
+            app.logger.warn(
+                "Cannot ban {} from {}: the ban target is a room moderator, "
+                "but the ban initiator ({}) is not an admin".format(
+                    ban_user.session_id, room.token, mod_user.session_id
+                )
+            )
+            return False
+
+        conn.execute(
+            """
+            INSERT INTO user_permission_overrides (room, user, banned, moderator, admin)
+            VALUES (?, ?, TRUE, FALSE, FALSE)
+            ON CONFLICT (room, user) DO UPDATE SET banned = TRUE, moderator = FALSE, admin = FALSE
+            """,
+            (room.id, ban_user.id),
+        )
+    return True