feat: add Coldwire obfsucation protocol support

Author: chadsec1

logic/background_worker.py

@@ -59,7 +59,7 @@ def parse_blobs(blobs: list[bytes]) -> dict:
     return parsed_messages
 
 def background_worker(user_data, user_data_lock, ui_queue, stop_flag):
-    # Incase we received a SMP question request last time right before the background worker was about to exit
+    # 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)
 
     while not stop_flag.is_set():

logic/message.py

@@ -66,6 +66,7 @@ def generate_and_send_pads(user_data, user_data_lock, contact_id: str, ui_queue)
 
         our_next_strand_nonce = user_data["contacts"][contact_id]["our_next_strand_nonce"]
 
+        session_headers  = user_data["tmp"]["session_headers"]
 
     kyber_ciphertext_blob   , kyber_shared_secrets    = generate_shared_secrets(contact_kyber_public_key, ML_KEM_1024_NAME)
     mceliece_ciphertext_blob, mceliece_shared_secrets = generate_shared_secrets(contact_mceliece_public_key, CLASSIC_MCELIECE_8_F_NAME)
@@ -90,6 +91,7 @@ def generate_and_send_pads(user_data, user_data_lock, contact_id: str, ui_queue)
                 "recipient": contact_id
             }, 
             blob = ciphertext_blob, 
+            headers = session_headers, 
             auth_token = auth_token
         )
     except Exception:
@@ -130,6 +132,8 @@ def send_message_processor(user_data, user_data_lock, contact_id: str, message:
         server_url = user_data["server_url"]
         auth_token = user_data["token"]
 
+        session_headers  = user_data["tmp"]["session_headers"]
+        
         contact_kyber_public_key    = user_data["contacts"][contact_id]["ephemeral_keys"]["contact_public_keys"][ML_KEM_1024_NAME]
         contact_mceliece_public_key = user_data["contacts"][contact_id]["ephemeral_keys"]["contact_public_keys"][CLASSIC_MCELIECE_8_F_NAME]
 
@@ -208,6 +212,7 @@ def send_message_processor(user_data, user_data_lock, contact_id: str, message:
                 "recipient": contact_id
             }, 
             blob = ciphertext_blob, 
+            headers = session_headers, 
             auth_token = auth_token
         )
     except:

logic/pfs.py

@@ -73,8 +73,9 @@ def send_new_ephemeral_keys(user_data: dict, user_data_lock: threading.Lock, con
 
     server_url       = user_data_copied["server_url"]
     auth_token       = user_data_copied["token"]
+    session_headers  = user_data_copied["tmp"]["session_headers"]
 
-    our_strand_key     = user_data_copied["contacts"][contact_id]["our_strand_key"]
+    our_strand_key   = user_data_copied["contacts"][contact_id]["our_strand_key"]
 
     rotation_counter = user_data_copied["contacts"][contact_id]["ephemeral_keys"]["our_keys"][CLASSIC_MCELIECE_8_F_NAME]["rotation_counter"] 
     rotate_at        = user_data_copied["contacts"][contact_id]["ephemeral_keys"]["our_keys"][CLASSIC_MCELIECE_8_F_NAME]["rotate_at"]
@@ -119,7 +120,8 @@ def send_new_ephemeral_keys(user_data: dict, user_data_lock: threading.Lock, con
         http_request(f"{server_url}/data/send", "POST", metadata = {
                 "recipient": contact_id
             }, 
-            blob = ciphertext_blob, 
+            blob = ciphertext_blob,
+            headers = session_headers, 
             auth_token = auth_token
         )
     except Exception:

logic/smp.py

@@ -66,13 +66,18 @@ def initiate_smp(user_data: dict, user_data_lock: threading.Lock, contact_id: st
     with user_data_lock:
         server_url = user_data["server_url"]
         auth_token = user_data["token"]
+        session_headers = user_data["tmp"]["session_headers"]
 
     kem_private_key, kem_public_key = generate_kem_keys(ML_KEM_1024_NAME)
 
     try:
         response = http_request(f"{server_url}/data/send", "POST", metadata = {
-            "recipient": contact_id
-        }, blob = SMP_TYPE + kem_public_key, auth_token = auth_token)
+                "recipient": contact_id
+            }, 
+            headers = session_headers, 
+            blob = SMP_TYPE + kem_public_key, 
+            auth_token = auth_token
+        )
     except Exception as e:
         raise ValueError("Could not connect to server: " + str(e))
 
@@ -106,6 +111,7 @@ def smp_step_2(user_data: dict, user_data_lock, contact_id: str, blob: bytes, ui
         server_url = user_data["server_url"]
         auth_token = user_data["token"]
         our_id     = user_data["user_id"]
+        session_headers = user_data["tmp"]["session_headers"]
 
     contact_kem_public_key = blob 
 
@@ -131,6 +137,7 @@ def smp_step_2(user_data: dict, user_data_lock, contact_id: str, blob: bytes, ui
                 "recipient": contact_id
             }, 
             blob = SMP_TYPE + key_ciphertext + ciphertext_nonce + ciphertext_blob, 
+            headers = session_headers, 
             auth_token = auth_token
         )
 
@@ -163,7 +170,8 @@ def smp_step_3(user_data: dict, user_data_lock: threading.Lock, contact_id: str,
         server_url = user_data["server_url"]
         auth_token = user_data["token"]
         our_id     = user_data["user_id"]
-        
+        session_headers = user_data["tmp"]["session_headers"]
+
         question = user_data["contacts"][contact_id]["lt_sign_key_smp"]["question"]
         answer = user_data["contacts"][contact_id]["lt_sign_key_smp"]["answer"]
 
@@ -216,7 +224,8 @@ def smp_step_3(user_data: dict, user_data_lock: threading.Lock, contact_id: str,
        http_request(f"{server_url}/data/send", "POST", metadata = {
                 "recipient": contact_id
             }, 
-            blob = ciphertext_blob, 
+            blob = ciphertext_blob,
+            headers = session_headers, 
             auth_token = auth_token
         )
     except Exception:
@@ -287,6 +296,7 @@ def smp_step_4_answer_provided(user_data, user_data_lock, contact_id, answer, ui
     with user_data_lock:
         server_url = user_data["server_url"]
         auth_token = user_data["token"]
+        session_headers = user_data["tmp"]["session_headers"]
 
         contact_signing_public_key = user_data["contacts"][contact_id]["lt_sign_keys"]["contact_public_key"]
         contact_kem_public_key     = b64decode(user_data["contacts"][contact_id]["lt_sign_key_smp"]["contact_kem_public_key"], validate = True)
@@ -347,7 +357,8 @@ def smp_step_4_answer_provided(user_data, user_data_lock, contact_id, answer, ui
         http_request(f"{server_url}/data/send", "POST", metadata = {
                 "recipient": contact_id
             }, 
-            blob = ciphertext_blob, 
+            blob = ciphertext_blob,
+            headers = session_headers, 
             auth_token = auth_token
         )
     except Exception:
@@ -493,6 +504,7 @@ def smp_failure_notify_contact(user_data, user_data_lock, contact_id, ui_queue)
     with user_data_lock:
         server_url = user_data["server_url"]
         auth_token = user_data["token"]
+        session_headers = user_data["tmp"]["session_headers"]
 
         tmp_key = b64decode(user_data["contacts"][contact_id]["lt_sign_key_smp"]["tmp_key"])
 
@@ -508,7 +520,8 @@ def smp_failure_notify_contact(user_data, user_data_lock, contact_id, ui_queue)
         http_request(f"{server_url}/data/send", "POST", metadata = {
                 "recipient": contact_id
             }, 
-            blob = ciphertext_nonce + ciphertext_blob, 
+            blob = ciphertext_nonce + ciphertext_blob,
+            headers = session_headers, 
             auth_token = auth_token
         )
     except Exception as e: