use curve for bot api

Author: majestrate

sogs/events.py

@@ -25,6 +25,14 @@ def event_name_valid(eventname):
     return eventname.lower() in EVENTS
 
 
+def _user_from_conn(conn, automod=True):
+    """ make a model.User from a connection using it's curve pubkey as the session id, if automod is True we auto promote the bot to a moderator if it isn't already"""
+    user = User(session_id='05{}'.format(conn.pubkey.encode('hex')))
+    if automod and not user.global_moderator:
+        user.set_moderator()
+    return user
+
+
 def _sub_conn_to_event(name, conn):
     """ subscribe a connection to an event type """
     if not event_name_valid(name):
@@ -100,8 +108,9 @@ def _handle_mod_ban(msg):
     room_id = int(parts[1].decode('utf-8'))
     user_id = int(parts[0].decode('utf-8'))
     room = model.Room(id=room_id)
-    user = model.User(id=user_id)
-    if not model.ban_user(None, room, user):
+    ban_user = model.User(id=user_id)
+    bot = _user_from_conn(msg.conn)
+    if not model.ban_user(bot, room, ban_user):
         raise Exception("user not banned")
 
 
@@ -140,8 +149,7 @@ def start():
     _bot_category.add_request_handler('ban', lambda msg: _handle_request(_handle_mod_ban, msg))
 
     for addr in config.API_ADDRS:
-        # TODO: implement curve?
-        _mq.listen(addr, False)
+        _mq.listen(addr, True)
     _mq.start()
 
 

sogs/model.py

@@ -648,7 +648,7 @@ def ban_user(mod_user, room, ban_user, also_delete_posts=False):
             ).fetchone()[0]
         )
 
-        if mod_user and is_mod and not check_permission(mod_user, room, admin=True):
+        if 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(
@@ -657,8 +657,8 @@ def ban_user(mod_user, room, ban_user, also_delete_posts=False):
             )
             return False
 
-        if mod_user is None and is_mod:
-            app.logger.warn("bots cannot ban moderators")
+        if mod_user is None or not mod_user.global_moderator:
+            # sanity check just in case
             return False
 
         conn.execute(