in progress

Author: dr7ana

sogs/model/clientmanager.py

@@ -15,6 +15,7 @@
 from typing import Optional, List, Union, Any
 import time
 
+
 """
 Complications:
     - given captcha bot
@@ -78,11 +79,8 @@ class ClientManager:
 
     def __init__(
         self,
-        _rooms: List[Room],
-        row=None,
         *,
         id: Optional[int] = None,
-        session_id: Optional[int] = None,
     ) -> None:
         self.id = id
         self.filter = False

sogs/mule.py

@@ -92,6 +92,7 @@ def setup_omq(self, omq: OMQ):
         worker.add_command("message_edited", self.message_edited)
 
         # new client code
+        # TOFIX: use add_request_command to handle a response value
         handler = self._omq.add_category("handler", access_level=oxenmq.AuthLevel.admin)
         handler.add_command("register_client", omq.register_client)
         handler.add_command("deregister_client", omq.deregister_client)
@@ -104,3 +105,17 @@ def setup_omq(self, omq: OMQ):
         # it will work.  (And so be careful not to recurse!)
         app.logger.debug("Mule connecting to self")
         omq.mule_conn = omq.connect_inproc(on_success=None, on_failure=self.inproc_fail)
+
+
+
+"""
+TOFIX: oxenmq calls should pass as oxenmq.Message not as JSON
+
+def _on_subscribe(self, msg: oxenmq.Message):                                                                          
+        code, message = None, None  # If still None at the end, we send a reply
+        try:                                                                                                                                                                                                                      
+            args = json.loads(msg.data()[0])
+                                                                                                                                   
+            pubkey = extract_hex_or_b64(args, "pubkey", 33)
+
+"""

sogs/routes/clients.py

@@ -9,6 +9,12 @@
 
 # User-related routes
 
+"""
+    TOFIX:
+        remove HTTP shit from requests
+
+"""
+
 
 clients = Blueprint('clients', __name__)
 
@@ -18,7 +24,7 @@ def register(cid):
     """
     Registers a client with SOGS OMQ instance. In this context, "client" refers to any entity 
     seeking to create an authenticated OMQ connection. This may be, but is not limited to,
-    a user or a bot.
+    a user or a bot
 
     ## URL Parameters
 
@@ -80,9 +86,7 @@ def register_bot(cid, authlevel, priority):
 @clients.post("/client/registered/client/<cid>")
 def register_client(cid, authlevel):
     """
-    Registers a non-bot client with SOGS OMQ instance. In this context, "client" refers to any entity 
-    seeking to create an authenticated OMQ connection. This may be, but is not limited to,
-    a user or a bot.
+    Registers a non-bot client with SOGS OMQ instance
 
     ## URL Parameters
 
@@ -127,7 +131,6 @@ def unregister(cid):
     return client
 
 
-
 @clients.post("/client/deregistered/client/<cid>")
 @clients.delete("/client/registered/client/<cid>")
 def unregister_client(cid):

sogs/routes/messages.py

@@ -310,6 +310,11 @@ def message_single(room: Room, msg_id):
     return utils.jsonify_with_base64(msgs[0])
 
 
+"""
+    TOFIX:
+        - add some decorator to this s.t. it routes it to the correct OMQ endpoint
+"""
+
 @messages.post("/room/<Room:room>/message")
 @auth.user_required
 def post_message(room: Room):

sogs/routes/omq_auth.py

@@ -105,7 +105,7 @@ def handle_omq_registration(sid, authlevel):
     """
     Here goes ye olde OMQ registration logic. We need to decide what identification will
     be used to verify every connected client s.t. that information persists for all subsequent
-    requests.
+    requests
 
     In this registration, we need to set:
         g.client_id
@@ -124,3 +124,16 @@ def verify_omq_auth():
     if hasattr(g, 'client_id') and hasattr(g, 'client_authlevel') and not g.client_reauth:
         app.logger.debug(f"Client {g.client_id} already authenticated for {g.client_authlevel} access")
         return
+
+
+
+"""
+    TOFIX:
+        - add some type of dict in omq_global to map conn_ID (onenmq conn ID) to session_ID/other info
+            - do not persist:
+                - room specific access: check every time it makes a request because it can change
+                - values that admin level can change
+
+    
+
+"""