feat(api): add /v1/publications resource

PromiseFru · PromiseFru · commit cc15cbcd3041 · 2026-06-18T00:20:47.000+01:00
diff --git a/app.py b/app.py
@@ -2,12 +2,16 @@
 
 from contextlib import asynccontextmanager
 
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
+from fastapi.responses import JSONResponse
 
-from api_v1 import router
 from db import dispose_engine
 from platforms.adapter_manager import AdapterManager
+from rest_services.v1.routes import router as v1_router
 from server_identity_keys import initialize_server_identity_keys
+from utils import get_logger
+
+logger = get_logger(__name__)
 
 
 @asynccontextmanager
@@ -20,4 +24,19 @@ async def lifespan(app: FastAPI):
 
 
 app = FastAPI(lifespan=lifespan)
-app.include_router(router, prefix="/v1")
+app.include_router(v1_router, prefix="/v1")
+
+
+@app.exception_handler(ValueError)
+@app.exception_handler(NotImplementedError)
+async def error_exception_handler(request: Request, exc: ValueError):
+    return JSONResponse(status_code=400, content={"error": str(exc)})
+
+
+@app.exception_handler(Exception)
+async def general_exception_handler(request: Request, exc: Exception):
+    logger.exception(exc)
+    return JSONResponse(
+        status_code=500,
+        content={"error": "Something went wrong. Please try again later."},
+    )
diff --git a/grpc_services/v3/exchange_oauth2_code.py b/grpc_services/v3/exchange_oauth2_code.py
@@ -76,6 +76,8 @@ def ExchangeOAuth2CodeAndStore(self, request, context):
         with get_session() as s:
             token = create_token(
                 platform=request.platform.lower(),
+                cat_id=adapter["cat_id"],
+                protocol="oauth2",
                 token_data={
                     "account_id": result["userinfo"]["account_identifier"],
                     "token": result["token"],
diff --git a/grpc_services/v3/exchange_pnba_code.py b/grpc_services/v3/exchange_pnba_code.py
@@ -99,6 +99,8 @@ def ExchangePNBACodeAndStore(self, request, context):
         with get_session() as s:
             token = create_token(
                 platform=request.platform.lower(),
+                cat_id=adapter["cat_id"],
+                protocol="pnba",
                 token_data={
                     "account_id": result["userinfo"]["account_identifier"],
                     "token": result["userinfo"]["account_identifier"],
diff --git a/grpc_services/v3/revoke_oauth2_token.py b/grpc_services/v3/revoke_oauth2_token.py
@@ -33,10 +33,10 @@ def RevokeOAuth2Token(self, request, context):
 
     try:
         with get_session() as s:
-            token, token_hash_obj, ss_kid, es_kid, ec_kid_pk = get_keys_for_decryption(
-                token_id_bytes=request.token_id,
-                key_id=request.key_id,
-                session=s,
+            token, token_hash_obj, ss_kid, es_kid, _, ec_kid_pk = (
+                get_keys_for_decryption(
+                    token_id_bytes=request.token_id, key_id=request.key_id, session=s
+                )
             )
 
             try:
diff --git a/grpc_services/v3/revoke_pnba_token.py b/grpc_services/v3/revoke_pnba_token.py
@@ -33,8 +33,10 @@ def RevokePNBAToken(self, request, context):
 
     try:
         with get_session() as s:
-            token, token_hash_obj, ss_kid, es_kid, ec_kid_pk = get_keys_for_decryption(
-                token_id_bytes=request.token_id, key_id=request.key_id, session=s
+            token, token_hash_obj, ss_kid, es_kid, _, ec_kid_pk = (
+                get_keys_for_decryption(
+                    token_id_bytes=request.token_id, key_id=request.key_id, session=s
+                )
             )
 
             try:
diff --git a/grpc_services/v3/sync_keys.py b/grpc_services/v3/sync_keys.py
@@ -50,7 +50,7 @@ def SyncKeys(self, request, context):
             )
 
         with get_session() as s:
-            _, token_hash_obj, ss_kid, es_kid, ec_kid_pk = get_keys_for_decryption(
+            _, token_hash_obj, ss_kid, es_kid, _, ec_kid_pk = get_keys_for_decryption(
                 token_id_bytes=request.token_id, key_id=request.key_id, session=s
             )
 
diff --git a/grpc_services/v3/utils.py b/grpc_services/v3/utils.py
@@ -30,10 +30,10 @@
 
 def get_keys_for_decryption(
     token_id_bytes: bytes, key_id: int, session: Session
-) -> tuple[Token, TokenHash, bytes, bytes, bytes]:
+) -> tuple[Token, TokenHash, bytes, bytes, bytes, bytes]:
     """
     Fetch token and all necessary keys for decryption.
-    Returns (Token, TokenHash, ss_kid, es_kid, ec_kid_pk).
+    Returns (Token, TokenHash, ss_kid, es_kid, es_kid_pk, ec_kid_pk).
     """
     token = get_by_token_id(token_id_bytes, session)
     if not token:
@@ -53,7 +53,14 @@ def get_keys_for_decryption(
     if not ce_key:
         raise ValueError(f"Client ephemeral key not found for kid {key_id}")
 
-    return token, token_hash_obj, ss_kid, se_key.private_key, ce_key.public_key
+    return (
+        token,
+        token_hash_obj,
+        ss_kid,
+        se_key.private_key,
+        se_key.public_key,
+        ce_key.public_key,
+    )
 
 
 def get_oauth2_adapter(platform: str) -> dict:
diff --git a/migrations/versions/002_add_tokens_table.py b/migrations/versions/002_add_tokens_table.py
@@ -23,6 +23,8 @@ def upgrade() -> None:
         sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
         sa.Column("token_id", sa.LargeBinary(4), nullable=False, unique=True),
         sa.Column("platform", sa.String(length=100), nullable=False),
+        sa.Column("cat_id", sa.SmallInteger(), nullable=False),
+        sa.Column("protocol", sa.String(length=100), nullable=False),
         sa.Column("token_data", sa.Text(), nullable=False),
         sa.Column("created_at", sa.DateTime(), nullable=False),
         sa.Column("updated_at", sa.DateTime(), nullable=False),
diff --git a/models/client_ephemeral_key.py b/models/client_ephemeral_key.py
@@ -13,7 +13,7 @@
     LargeBinary,
     UniqueConstraint,
 )
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import Session, relationship
 
 from db import Base
 
@@ -46,3 +46,10 @@ class ClientEphemeralKey(Base):
         ),
         Index("ix_client_ephemeral_keys_token_hash_id_used", "token_hash_id", "used"),
     )
+
+
+def delete_by_index(token_hash_id: int, key_index: int, session: Session) -> None:
+    """Delete a client ephemeral key by token_hash_id and key_index."""
+    session.query(ClientEphemeralKey).filter_by(
+        token_hash_id=token_hash_id, key_index=key_index
+    ).delete()
diff --git a/models/server_ephemeral_key.py b/models/server_ephemeral_key.py
@@ -13,7 +13,7 @@
     LargeBinary,
     UniqueConstraint,
 )
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import Session, relationship
 
 from db import Base
 from db_types import PrivateEncryptedBinary
@@ -48,3 +48,10 @@ class ServerEphemeralKey(Base):
         ),
         Index("ix_server_ephemeral_keys_token_hash_id_used", "token_hash_id", "used"),
     )
+
+
+def delete_by_index(token_hash_id: int, key_index: int, session: Session) -> None:
+    """Delete a server ephemeral key by token_hash_id and key_index."""
+    session.query(ServerEphemeralKey).filter_by(
+        token_hash_id=token_hash_id, key_index=key_index
+    ).delete()
diff --git a/models/token.py b/models/token.py
@@ -1,15 +1,11 @@
 # SPDX-License-Identifier: GPL-3.0-only
 """Token model and related functions."""
 
-import datetime
-import secrets
-from typing import Any
-
 import datetime
 import secrets
 from typing import Any, Optional
 
-from sqlalchemy import Column, DateTime, Integer, LargeBinary, String
+from sqlalchemy import Column, DateTime, Integer, LargeBinary, SmallInteger, String
 from sqlalchemy.orm import Session, relationship
 
 from db import Base
@@ -31,7 +27,11 @@ class Token(Base):
     id = Column(Integer, primary_key=True, autoincrement=True)
     token_id = Column(LargeBinary(4), nullable=False, unique=True)
     platform = Column(String(100), nullable=False, index=True)
-    token_data = Column(EncryptedJSON(), nullable=False)
+    cat_id = Column(SmallInteger(), nullable=False)
+    protocol = Column(String(100), nullable=False)
+    token_data = Column(
+        EncryptedJSON(), nullable=False
+    )  # {"account_id": "...", "token": {...}}
     created_at = Column(DateTime, default=utc_now, nullable=False)
     updated_at = Column(DateTime, default=utc_now, onupdate=utc_now, nullable=False)
 
@@ -43,11 +43,19 @@ class Token(Base):
     )
 
 
-def create(platform: str, token_data: dict[str, Any], session: Session) -> Token:
+def create(
+    platform: str,
+    cat_id: int,
+    protocol: str,
+    token_data: dict[str, Any],
+    session: Session,
+) -> Token:
     """Create and persist a new token."""
     token = Token(
         token_id=secrets.token_bytes(4),
         platform=platform,
+        cat_id=cat_id,
+        protocol=protocol,
         token_data=token_data,
     )
     session.add(token)
diff --git a/rest_services/v1/__init__.py b/rest_services/v1/__init__.py
diff --git a/rest_services/v1/routes.py b/rest_services/v1/routes.py
@@ -1,16 +1,27 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
+import base64
 import json
+import struct
 from pathlib import Path as PathLib
 from typing import List
 
 from fastapi import APIRouter, HTTPException, Path, Request
 from fastapi.responses import HTMLResponse
 
-from api_schemas import OAuthClientMetadata, PlatformManifest, ServerStaticPublicKey
+from db import get_session
+from lib_relaysms_payload_specs.generated import relaysms_spec_payload as rrs
 from logutils import get_logger
 from models.server_identity_key import get_public_key, get_public_keys
 from platforms.adapter_manager import AdapterManager
+from rest_services.v1.schemas import (
+    OAuthClientMetadata,
+    PlatformManifest,
+    PublishContentRequest,
+    PublishContentResponse,
+    ServerStaticPublicKey,
+)
+from rest_services.v1.services import publish_content
 
 logger = get_logger(__name__)
 
@@ -185,3 +196,45 @@ async def oauth_callback(
     </html>
     """
     return HTMLResponse(content=html_content)
+
+
+@router.post("/publications")
+def create_publications(body: PublishContentRequest) -> PublishContentResponse:
+    """Handle message publication requests."""
+    try:
+        payload_raw = base64.b64decode(body.text)
+    except Exception as exc:
+        logger.error("failed to decode base64 payload: %s", exc)
+        raise HTTPException(
+            status_code=400, detail="Invalid base64-encoded text field"
+        ) from exc
+
+    try:
+        payload = rrs.V1Payloads.deserialize(payload_raw)
+    except Exception as exc:
+        logger.error("failed to deserialize payload: %s", exc)
+        raise HTTPException(
+            status_code=400, detail="Failed to deserialize payload"
+        ) from exc
+
+    k_id = payload.get_kid()
+    t_id = payload.get_t_id()
+    t_id_bytes = struct.pack("<I", t_id)
+    len_att = payload.get_len_att()
+    sess_id = payload.get_sess_id()
+
+    if sess_id is None:
+        with get_session() as db:
+            publish_content(
+                token_id=t_id_bytes,
+                key_id=k_id,
+                len_att=len_att,
+                content_ciphertext=payload.get_payload(),
+                session=db,
+            )
+    else:
+        raise HTTPException(
+            status_code=501, detail="Multi-segment payloads not yet supported"
+        )
+
+    return PublishContentResponse(message="Content published successfully")
diff --git a/rest_services/v1/schemas.py b/rest_services/v1/schemas.py
@@ -3,7 +3,7 @@
 import datetime
 from typing import Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 
 class PublicationsCreate(BaseModel):
@@ -60,3 +60,20 @@ class OAuthClientMetadata(BaseModel):
 class ServerStaticPublicKey(BaseModel):
     key_id: int
     public_key: str
+
+
+class PublishContentRequest(BaseModel):
+    address: str = Field(
+        ...,
+        description="Sender phone number in E.164 format",
+        examples=["+12025550123"],
+    )
+    text: str = Field(
+        ...,
+        description="Base64-encoded SMS payload",
+    )
+
+
+class PublishContentResponse(BaseModel):
+    message: Optional[str] = None
+    error: Optional[str] = None
diff --git a/rest_services/v1/services.py b/rest_services/v1/services.py
diff --git a/tests/client.py b/tests/client.py
diff --git a/tests/helpers.py b/tests/helpers.py

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ def SyncKeys(self, request, context):`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`with get_session() as s:`
`53`		`- _, token_hash_obj, ss_kid, es_kid, ec_kid_pk = get_keys_for_decryption(`
	`53`	`+ _, token_hash_obj, ss_kid, es_kid, _, ec_kid_pk = get_keys_for_decryption(`
`54`	`54`	`token_id_bytes=request.token_id, key_id=request.key_id, session=s`
`55`	`55`	`)`
`56`	`56`