refactor: Improve protocol availability

Author: chadsec1

core/requests.py

@@ -80,7 +80,7 @@ def encode_file(name: str, filename: str, data: bytes, boundary: str, CRLF: str,
 
 
 
-def http_request(url: str, method: str, auth_token: str = None, metadata: dict = None, headers: dict = None, blob: bytes = None, longpoll: int = None) -> bytes:
+def http_request(url: str, method: str, auth_token: str = None, metadata: dict = None, headers: dict = None, blob: bytes = None, longpoll: int = None, doseq: bool = False) -> bytes:
     if method.upper() not in ["POST", "GET", "PUT", "DELETE"]:
         raise ValueError(f"Invalid request method `{method}`")
 
@@ -128,7 +128,11 @@ def http_request(url: str, method: str, auth_token: str = None, metadata: dict =
             raise ValueError("Request method is POST/PUT but no metadata nor blob were given.")
 
     else:
-        req = request.Request(url, method=method.upper())
+        full_url = url
+        if metadata:
+            full_url += "?" + urllib.parse.urlencode(metadata, doseq=doseq)
+
+        req = request.Request(full_url, method=method.upper())
 
     if headers is not None:
         for key, value in headers.items():

logic/background_worker.py

@@ -16,7 +16,7 @@
 from core.trad_crypto import (
         decrypt_xchacha20poly1305
 )
-from base64 import b64decode
+from base64 import b64decode, urlsafe_b64encode
 import copy
 import logging
 
@@ -28,15 +28,18 @@ def decode_blob_stream(data: bytes) -> list:
 
     offset = 0
     while offset < len(data):
-        if offset + COLDWIRE_LEN_OFFSET > len(data):
+        if offset + COLDWIRE_LEN_OFFSET + 32 > len(data):
             raise ValueError("Incomplete length prefix, malformed or corrupted data.")
 
+        ack_id = data[offset : offset + 32]
+        offset += 32
+
         msg_len = int.from_bytes(data[offset : offset + COLDWIRE_LEN_OFFSET], "big")
         offset += COLDWIRE_LEN_OFFSET
         if offset + msg_len > len(data):
             raise ValueError("Incomplete message data")
 
-        messages.append(data[offset:offset + msg_len])
+        messages.append(ack_id + data[offset:offset + msg_len])
         offset += msg_len
     return messages
 
@@ -46,11 +49,14 @@ def parse_blobs(blobs: list[bytes]) -> dict:
 
     for raw in blobs:
         try:
+            ack_id = raw[:32]
+            raw = raw[32:]
             sender, blob = raw.split(b"\0", 1)
             sender = sender.decode("utf-8")
             parsed_messages.append({
                 "sender": sender,
-                "blob": blob
+                "blob": blob,
+                "ack_id": ack_id
                 })
         except ValueError as e:
             logger.error("Invalid message format! Error: %s", str(e))
@@ -62,6 +68,9 @@ def background_worker(user_data, user_data_lock, ui_queue, stop_flag):
     # Incase we received a SMP question request last time and user did not answer it.
     smp_unanswered_questions(user_data, user_data_lock, ui_queue)
 
+    # Acknowledgements
+    acks = {}
+
     while not stop_flag.is_set():
         with user_data_lock:
             server_url = user_data["server_url"]
@@ -73,6 +82,8 @@ def background_worker(user_data, user_data_lock, ui_queue, stop_flag):
                     f"{server_url}/data/longpoll", 
                     "GET", 
                     auth_token = auth_token, 
+                    metadata = acks if acks else None,
+                    doseq = True,
                     longpoll = random_number_range(LONGPOLL_MIN, LONGPOLL_MAX)
                 )
         except TimeoutError:
@@ -98,6 +109,13 @@ def background_worker(user_data, user_data_lock, ui_queue, stop_flag):
             sender = message["sender"]
             blob   = message["blob"]
 
+            print("wtf you mean nigga?", message["ack_id"])
+            ack_id = urlsafe_b64encode(message["ack_id"]).decode().rstrip("=")
+            if "acks" not in acks:
+                acks["acks"] = [ack_id]
+            else:
+                acks["acks"].append(ack_id)
+
             with user_data_lock:
                 user_data_copied = copy.deepcopy(user_data)