databricks-tellr-app 0.4.3.dev4__tar.gz → 0.4.3.dev6__tar.gz

{databricks_tellr_app-0.4.3.dev4 → databricks_tellr_app-0.4.3.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databricks-tellr-app
-Version: 0.4.3.dev4
+Version: 0.4.3.dev6
 Summary: Tellr application package for Databricks Apps
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{databricks_tellr_app-0.4.3.dev4 → databricks_tellr_app-0.4.3.dev6}/databricks_tellr_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databricks-tellr-app
-Version: 0.4.3.dev4
+Version: 0.4.3.dev6
 Summary: Tellr application package for Databricks Apps
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{databricks_tellr_app-0.4.3.dev4 → databricks_tellr_app-0.4.3.dev6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "databricks-tellr-app"
-version = "0.4.3.dev4"
+version = "0.4.3.dev6"
 description = "Tellr application package for Databricks Apps"
 readme = "README.md"
 requires-python = ">=3.10"

{databricks_tellr_app-0.4.3.dev4 → databricks_tellr_app-0.4.3.dev6}/src/api/main.py

@@ -337,14 +337,12 @@ async def user_auth_middleware(request: Request, call_next):
     user_name = None
 
     if token:
-        # Diagnostic logging: check if token is service principal ID (debug to avoid log spam on every request/poll)
-        token_prefix = token[:20] if len(token) > 20 else token
+        # Diagnostic logging: flag SP-vs-user tokens. F-CR-9 (SDR-4437): never log
+        # any part of the bearer token (no prefix, no length) — only derived booleans.
         is_sp_token = client_id and token.startswith(client_id)
         logger.debug(
             "OBO auth: extracted token from header",
             extra={
-                "token_prefix": token_prefix,
-                "token_length": len(token),
                 "is_service_principal": is_sp_token,
                 "header_present": True,
             },

{databricks_tellr_app-0.4.3.dev4 → databricks_tellr_app-0.4.3.dev6}/src/api/routes/google_slides.py

@@ -10,10 +10,9 @@ user tokens are stored per-user in the ``google_oauth_tokens`` table.
 import json
 import logging
 import os
-import secrets
 from typing import Any, Optional
 
-from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
+from fastapi import APIRouter, Depends, HTTPException, Query, Request
 from fastapi.responses import HTMLResponse
 from pydantic import BaseModel
 from sqlalchemy.orm import Session
@@ -34,12 +33,6 @@ logger = logging.getLogger(__name__)
 
 router = APIRouter(prefix="/api/export/google-slides", tags=["google-slides"])
 
-# F-CR-3 (SDR-4437): the OAuth "state" carries an unguessable nonce that is also
-# stored in this short-lived cookie; the callback requires them to match before
-# exchanging the authorization code (anti-CSRF / anti-login-CSRF double-submit).
-_OAUTH_STATE_COOKIE = "g_oauth_state"
-_OAUTH_COOKIE_PATH = "/api/export/google-slides"
-
 
 # -------------------------------------------------------------------------
 # Helpers
@@ -105,76 +98,32 @@ class AuthUrlResponse(BaseModel):
 # -------------------------------------------------------------------------
 
 
-def _build_app_origin(request: Request) -> str:
-    """Return the public origin (``scheme://host``) serving the app.
+def _build_redirect_uri(request: Request) -> str:
+    """Build the OAuth callback redirect URI from the current request.
+
+    Google requires redirect URIs to match *exactly* what's registered in GCP,
+    with no query parameters.
 
     Behind a reverse proxy (e.g. Databricks Apps), ``request.base_url``
     returns the internal address (``http://localhost:8000``).  We use the
     ``X-Forwarded-Host`` / ``X-Forwarded-Proto`` headers set by the proxy
-    to reconstruct the public URL instead. For localhost, force ``http``.
+    to reconstruct the public URL instead.
+
+    For localhost, Google only allows ``http``.
     """
     forwarded_host = request.headers.get("x-forwarded-host")
     forwarded_proto = request.headers.get("x-forwarded-proto")
 
     if forwarded_host:
         scheme = forwarded_proto or "https"
-        return f"{scheme}://{forwarded_host.split(',')[0].strip()}"
-
-    base = str(request.base_url).rstrip("/")
-    if "://localhost" in base or "://127.0.0.1" in base:
-        base = base.replace("https://", "http://")
-    return base
-
-
-def _build_redirect_uri(request: Request) -> str:
-    """Build the OAuth callback redirect URI from the current request.
-
-    Google requires redirect URIs to match *exactly* what's registered in GCP,
-    with no query parameters.
-    """
-    return f"{_build_app_origin(request)}/api/export/google-slides/auth/callback"
-
-
-# Callback page template. The JS object braces are intentionally literal; the
-# %TOKENS% are substituted below so the postMessage targets the explicit app
-# origin (F-CR-3) instead of the wildcard '*'.
-_CALLBACK_TEMPLATE = """
-<html><body>
-    <h2>%TITLE%</h2>
-    <p>%MESSAGE%</p>
-    <script>
-        if (window.opener) {
-            window.opener.postMessage({ type: 'google-slides-auth', success: %SUCCESS% }, %ORIGIN%);
-        }
-        setTimeout(() => window.close(), %DELAY%);
-    </script>
-</body></html>
-"""
-
-
-def _callback_response(app_origin: str, *, success: bool) -> HTMLResponse:
-    """Render the popup callback page and clear the anti-CSRF state cookie.
-
-    ``postMessage`` targets ``app_origin`` explicitly (F-CR-3); ``json.dumps``
-    yields a safely-quoted JS string literal for the origin.
-    """
-    if success:
-        title, message, delay = "Authorization Successful", "You can close this window.", "1500"
+        base = f"{scheme}://{forwarded_host.split(',')[0].strip()}"
     else:
-        title = "Authorization Failed"
-        message = "Authorization could not be completed. Please close this window and try again."
-        delay = "3000"
-    body = (
-        _CALLBACK_TEMPLATE
-        .replace("%TITLE%", title)
-        .replace("%MESSAGE%", message)
-        .replace("%SUCCESS%", "true" if success else "false")
-        .replace("%ORIGIN%", json.dumps(app_origin))
-        .replace("%DELAY%", delay)
-    )
-    resp = HTMLResponse(content=body, status_code=200)
-    resp.delete_cookie(_OAUTH_STATE_COOKIE, path=_OAUTH_COOKIE_PATH)
-    return resp
+        base = str(request.base_url).rstrip("/")
+        # Force http for localhost (Google rejects https://localhost)
+        if "://localhost" in base or "://127.0.0.1" in base:
+            base = base.replace("https://", "http://")
+
+    return f"{base}/api/export/google-slides/auth/callback"
 
 
 @router.get("/auth/status", response_model=AuthStatusResponse)
@@ -192,7 +141,6 @@ async def auth_status(db: Session = Depends(get_db)):
 @router.get("/auth/url", response_model=AuthUrlResponse)
 async def auth_url(
     request: Request,
-    response: Response,
     db: Session = Depends(get_db),
 ):
     """Generate the Google OAuth consent URL.
@@ -201,26 +149,13 @@ async def auth_url(
     passed via the OAuth ``state`` parameter so the callback can persist the
     token for the correct user — the redirect URI itself stays clean
     (no query params) to satisfy Google's exact-match requirement.
-
-    F-CR-3: an unguessable nonce is bound into both the ``state`` and a
-    short-lived cookie; the callback requires them to match.
     """
     try:
         auth = _get_auth(db)
         redirect_uri = _build_redirect_uri(request)
-        nonce = secrets.token_urlsafe(32)
-        state = json.dumps({"user": _get_user_identity(), "nonce": nonce})
+        state = json.dumps({"user": _get_user_identity()})
         url = auth.get_auth_url(redirect_uri=redirect_uri, state=state)
 
-        response.set_cookie(
-            key=_OAUTH_STATE_COOKIE,
-            value=nonce,
-            max_age=600,
-            httponly=True,
-            secure=True,
-            samesite="lax",  # sent on Google's top-level redirect back to us
-            path=_OAUTH_COOKIE_PATH,
-        )
         return AuthUrlResponse(url=url)
     except GoogleSlidesAuthError as exc:
         raise HTTPException(status_code=400, detail=str(exc)) from exc
@@ -249,22 +184,12 @@ async def auth_callback(
     them in the ``google_oauth_tokens`` table.  Returns a small HTML page
     that notifies the opener window and closes itself.
     """
-    app_origin = _build_app_origin(request)
-    cookie_nonce = request.cookies.get(_OAUTH_STATE_COOKIE)
     try:
         state_data = json.loads(state) if state else {}
         user = state_data.get("user")
         if not user:
             raise ValueError("Missing user in OAuth state")
 
-        # F-CR-3: verify the anti-CSRF nonce BEFORE exchanging the code. The
-        # state nonce must match the cookie set when the auth URL was issued.
-        state_nonce = state_data.get("nonce")
-        if not cookie_nonce or not state_nonce or not secrets.compare_digest(
-            str(cookie_nonce), str(state_nonce)
-        ):
-            raise ValueError("OAuth state nonce mismatch")
-
         auth = _get_auth(db)
         redirect_uri = _build_redirect_uri(request)
         code_verifier = state_data.get("code_verifier")
@@ -277,9 +202,37 @@ async def auth_callback(
         # F-CR-2 (SDR-4437): never reflect the raw exception into the HTML page —
         # it is logged server-side above. Show a static, generic failure message.
         logger.error("OAuth callback failed", exc_info=True)
-        return _callback_response(app_origin, success=False)
+        return HTMLResponse(
+            content="""
+            <html><body>
+                <h2>Authorization Failed</h2>
+                <p>Authorization could not be completed. Please close this window and try again.</p>
+                <script>
+                    if (window.opener) {
+                        window.opener.postMessage({ type: 'google-slides-auth', success: false }, '*');
+                    }
+                    setTimeout(() => window.close(), 3000);
+                </script>
+            </body></html>
+            """,
+            status_code=200,
+        )
 
-    return _callback_response(app_origin, success=True)
+    return HTMLResponse(
+        content="""
+        <html><body>
+            <h2>Authorization Successful</h2>
+            <p>You can close this window.</p>
+            <script>
+                if (window.opener) {
+                    window.opener.postMessage({ type: 'google-slides-auth', success: true }, '*');
+                }
+                setTimeout(() => window.close(), 1500);
+            </script>
+        </body></html>
+        """,
+        status_code=200,
+    )
 
 
 # -------------------------------------------------------------------------

{databricks_tellr_app-0.4.3.dev4 → databricks_tellr_app-0.4.3.dev6}/src/api/routes/sessions.py

@@ -9,10 +9,7 @@ Session access is controlled by:
 """
 
 import asyncio
-import json
 import logging
-from datetime import datetime
-from pathlib import Path
 from typing import Optional
 
 from fastapi import APIRouter, Depends, HTTPException, Query
@@ -769,86 +766,9 @@ async def cleanup_expired_sessions():
         ) from e
 
 
-@router.post("/{session_id}/export")
-async def export_session(session_id: str):
-    """Export full session data to logs/sessions/{session_id}.json for debugging.
-    
-    Exports:
-    - Session info (id, timestamps, profile)
-    - All chat messages (user + AI responses with full content)
-    - Full slide deck (HTML, scripts, slide count)
-    
-    Args:
-        session_id: Session to export
-        
-    Returns:
-        Export confirmation with file path
-    """
-    try:
-        # Permission check: require CAN_VIEW on the deck
-        await asyncio.to_thread(
-            _check_deck_permission_for_session, session_id, PermissionLevel.CAN_VIEW
-        )
-
-        session_manager = get_session_manager()
-
-        # Get all session data
-        session = await asyncio.to_thread(session_manager.get_session, session_id)
-        messages = await asyncio.to_thread(session_manager.get_messages, session_id)
-        slide_deck = await asyncio.to_thread(session_manager.get_slide_deck, session_id)
-        
-        # Build export data
-        export_data = {
-            "exported_at": datetime.utcnow().isoformat(),
-            "session": session,
-            "messages": messages,
-            "slide_deck": slide_deck,
-            "summary": {
-                "message_count": len(messages),
-                "slide_count": slide_deck.get("slide_count", 0) if slide_deck else 0,
-                "user_messages": sum(1 for m in messages if m.get("role") == "user"),
-                "ai_messages": sum(1 for m in messages if m.get("role") == "assistant"),
-            }
-        }
-        
-        # Ensure logs/sessions directory exists
-        sessions_dir = Path("logs/sessions")
-        sessions_dir.mkdir(parents=True, exist_ok=True)
-        
-        # Write to file
-        export_path = sessions_dir / f"{session_id}.json"
-        with open(export_path, "w", encoding="utf-8") as f:
-            json.dump(export_data, f, indent=2, default=str)
-        
-        logger.info(
-            "Session exported",
-            extra={
-                "session_id": session_id,
-                "export_path": str(export_path),
-                "message_count": len(messages),
-            },
-        )
-        
-        return {
-            "status": "exported",
-            "session_id": session_id,
-            "export_path": str(export_path),
-            "summary": export_data["summary"],
-        }
-        
-    except SessionNotFoundError:
-        raise HTTPException(
-            status_code=404,
-            detail=f"Session not found: {session_id}",
-        )
-    except HTTPException:
-        raise
-    except Exception as e:
-        logger.error(f"Failed to export session: {e}", exc_info=True)
-        raise HTTPException(
-            status_code=500,
-            detail="Export failed",
-        ) from e
+# F-CR-10 (SDR-4437): the debug-only POST /{session_id}/export endpoint was
+# removed — it was unused by the frontend and dumped full session data (all chat
+# messages + deck) to logs/sessions/{id}.json.
 
 
 # =========================================================================