refactor: add new coldwire & strandlock protocol support

Author: chadsec1

app/core/constants.py

@@ -2,6 +2,10 @@
 APP_NAME      = "Coldwire Python Server"
 APP_VERSION   = "0.1"
 
+# Coldwire protocol misc (bytes)
+COLDWIRE_DATA_SEP   = b"\0"
+COLDWIRE_LEN_OFFSET = 3
+
 # network defaults (seconds)
 LONGPOLL_MIN  = 5
 LONGPOLL_MAX  = 30  

app/db/redis.py

@@ -13,13 +13,3 @@ def get_redis():
     return redis_client
 
 
-# Returns a json list, from a key's value list
-def get_redis_list(client, key: str) -> list:
-    messages = []
-
-    raw_messages = client.lrange(key, 0, -1)
-    for raw in raw_messages:
-        messages.append(json.loads(raw))
-
-    return messages
-

app/logic/authentication.py

@@ -1,5 +1,5 @@
 from app.db.sqlite import get_db
-from app.db.redis import get_redis, get_redis_list
+from app.db.redis import get_redis
 from app.utils.helper_utils import generate_user_id
 from app.utils.jwt import create_jwt_token
 from base64 import b64encode

app/logic/data.py

@@ -1,16 +1,48 @@
-from app.db.sqlite import get_db
-from app.db.redis import get_redis, get_redis_list
-import json
-import logging
+from app.db.sqlite import get_db, check_user_exists
+from app.db.redis import get_redis
+from app.core.constants import (
+        COLDWIRE_LEN_OFFSET,
+        COLDWIRE_DATA_SEP
+)
 
 
 redis_client = get_redis()
 
-def check_new_data(user_id: str) -> list:
-    messages = get_redis_list(redis_client, user_id)
-    redis_client.delete(user_id)
-    return messages
 
+def get_redis_list(client, key: str) -> list:
+    data = b""
+    while True:
+        raw = client.lpop(key)
+        if raw is None:
+            break
+
+        data += raw
+
+    return data
+
+def check_new_data(user_id: str) -> bytes:
+    return get_redis_list(redis_client, user_id)
+
+def data_processor(user_id: str, recipient_id: str, blob: bytes) -> None:
+    if not check_user_exists(recipient_id):
+        raise ValueError("Recipient_id does not exist")
+
+    user_id = user_id.encode("utf-8")
+    
+    # \0 is seperator. User_ids cannot have a seperator.
+    
+    if COLDWIRE_DATA_SEP in user_id:
+        raise ValueError("User ID cannot have null byte!")
+
+    payload = user_id + COLDWIRE_DATA_SEP + blob
+    length_prefix = len(payload).to_bytes(COLDWIRE_LEN_OFFSET, "big")
+
+    payload = length_prefix + payload
+
+    redis_client.rpush(recipient_id, payload)
+
+
+"""
 def delete_old_data(target_id: str, data_type: str, sender_id: str) -> None:
     all_msgs = redis_client.lrange(target_id, 0, -1)
     keep = []
@@ -26,4 +58,4 @@ def delete_old_data(target_id: str, data_type: str, sender_id: str) -> None:
         pipe.rpush(target_id, *keep)
     pipe.execute()
 
-
+"""

app/logic/message.py

@@ -1,6 +1,10 @@
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
-from app.routes import authentication_router, get_user_router, smp_router, pfs_router, message_router, data_router
+from app.routes import (
+        authentication_router,
+        get_user_router,
+        data_router
+)
 from app.db.sqlite import init_db
 from app.utils.jwt import check_jwt_exists
 import logging
@@ -12,14 +16,10 @@
 )
 logger = logging.getLogger("coldwire")
 
-app = FastAPI()
-
 check_jwt_exists()
 init_db()
 
+app = FastAPI()
 app.include_router(authentication_router)
 app.include_router(get_user_router)
-app.include_router(smp_router)
-app.include_router(pfs_router)
-app.include_router(message_router)
 app.include_router(data_router)

app/logic/pfs.py

@@ -1,9 +1,6 @@
 from .authentication import router as authentication_router
 from .get_user import router as get_user_router
-from .smp import router as smp_router
-from .pfs import router as pfs_router
-from .message import router as message_router
 from .data import router as data_router
 
 
-__all__ = ["authentication_router", "get_user_router", "smp_router", "pfs_router", "message_router", "data_router"]
+__all__ = ["authentication_router",  "get_user_router", "data_router"]

app/main.py

@@ -1,7 +1,8 @@
-from fastapi import APIRouter, Request, Response, Depends
-from app.logic.data import check_new_data
+from fastapi import APIRouter, Request, Response, Depends, Form, UploadFile, File
+from app.logic.data import check_new_data, data_processor
 from app.utils.jwt import verify_jwt_token
 import asyncio
+import json
 
 router = APIRouter()
 
@@ -12,13 +13,46 @@ async def get_data_longpoll(request: Request, response: Response, user=Depends(v
         if await request.is_disconnected():
             # Don't attempt to check for new data if client disconnects before 30 seconds
             # This is crucial to perserve data as they get deleted after being read 
-            return
+            return Response(content=b'', media_type="application/octet-stream")
+            
 
-        messages = await asyncio.to_thread(check_new_data, user["id"])
-
-        if messages:
-            return {"messages": messages}
+        data = await asyncio.to_thread(check_new_data, user["id"])
 
+        if data:
+            return Response(content = data, media_type="application/octet-stream")
         await asyncio.sleep(1)
 
-    return {"messages": []}
+    return Response(content=b'', media_type="application/octet-stream")
+
+
+@router.post("/data/send")
+async def send(metadata: str = Form(...), blob: UploadFile = File(...), user=Depends(verify_jwt_token)):
+    user_id = user["id"]
+
+    metadata = json.loads(metadata)
+
+    if "metadata" not in metadata:
+        raise HTTPException(status_code=400, detail="Missing metadata")
+
+    if "recipient" not in metadata["metadata"]:
+        raise HTTPException(status_code=400, detail="Missing recipient")
+
+    recipient = metadata["metadata"]["recipient"]
+
+    if (not recipient.isdigit()) or len(recipient) != 16:
+        raise HTTPException(status_code=400, detail="Invalid recipient")
+
+
+    blob_data = await blob.read()
+    if not blob_data:
+        raise HTTPException(status_code=400, detail="Empty blob is not allowed")
+
+    try:
+        await asyncio.to_thread(data_processor, user_id, recipient, blob_data)
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=e)
+
+
+
+    return {"status": "success"}
+

app/routes/__init__.py

@@ -1,20 +1,17 @@
 from fastapi import APIRouter, Request, HTTPException, Response, Depends
 from pydantic import BaseModel, validator
-from base64 import b64encode, b64decode
-from app.core.crypto import verify_signature
-from app.utils.helper_utils import valid_b64
 from app.logic.get_user import check_user
+from app.utils.jwt import verify_jwt_token
 import asyncio
 
 router = APIRouter()
 
 
-# The reason we dont specify the id as int is because it can trailing digits
 class GetUserParams(BaseModel):
     user_id: str
 
 @router.get("/get_user")
-async def get_user(response: Response, params: GetUserParams = Depends()):
+async def get_user(response: Response, params: GetUserParams = Depends(), user=Depends(verify_jwt_token)):
     user_id = params.user_id
 
     if (not user_id.isdigit()) or len(user_id) != 16: