Old

.github/workflows/backend-tests.yml

@@ -2,7 +2,7 @@ name: Backend Tests
 
 on:
   pull_request:
-    branches: [main, dev]
+    branches: [foss-main]
     types: [opened, synchronize, reopened, ready_for_review]
 
 concurrency:

.github/workflows/code-quality.yml

@@ -2,7 +2,7 @@ name: Code Quality Checks
 
 on:
   pull_request:
-    branches: [main, dev]
+    branches: [foss-main]
     types: [opened, synchronize, reopened, ready_for_review]
 
 concurrency:
@@ -227,8 +227,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: latest
 
       - name: Check if frontend files changed
         id: frontend-changes

.github/workflows/docker-build.yml

@@ -5,9 +5,12 @@ on:
     branches:
       - main
       - dev
+      - foss-main
+      - feat/mpass-proxy-auth
     paths:
       - 'surfsense_backend/**'
       - 'surfsense_web/**'
+      - '.github/workflows/docker-build.yml'
   workflow_dispatch:
     inputs:
       branch:
@@ -26,7 +29,11 @@ permissions:
 jobs:
   tag_release:
     runs-on: ubuntu-latest
-    if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch) || github.event_name == 'workflow_dispatch'
+    if: >
+      github.ref == format('refs/heads/{0}', github.event.repository.default_branch) ||
+      github.ref == 'refs/heads/foss-main' ||
+      github.ref == 'refs/heads/feat/mpass-proxy-auth' ||
+      github.event_name == 'workflow_dispatch'
     outputs:
       new_tag: ${{ steps.tag_version.outputs.next_version }}
     steps:
@@ -248,7 +255,7 @@ jobs:
             type=ref,event=branch
             type=sha,prefix=git-
           flavor: |
-            latest=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) || github.event.inputs.branch == github.event.repository.default_branch }}
+            latest=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) || github.ref == 'refs/heads/feat/mpass-proxy-auth' || github.event.inputs.branch == github.event.repository.default_branch }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests

.gitignore

@@ -6,4 +6,6 @@ node_modules/
 .venv
 .pnpm-store
 .DS_Store
-deepagents/
+deepagents/.env.local
+.env.local
+.idea/

docker/.env.example

@@ -14,8 +14,11 @@ SURFSENSE_VERSION=latest
 # REQUIRED: Generate a secret key with: openssl rand -base64 32
 SECRET_KEY=replace_me_with_a_random_string
 
-# Auth type: LOCAL (email/password) or GOOGLE (OAuth)
-AUTH_TYPE=LOCAL
+# Auth — DO NOT change this value. This fork only supports SSO
+# (mPass/Cognito via oauth2-proxy ForwardAuth). Setting LOCAL or
+# GOOGLE will break authentication — the backend routes for those
+# modes are not registered in this fork.
+AUTH_TYPE=SSO
 
 # Allow new user registrations (TRUE or FALSE)
 # REGISTRATION_ENABLED=TRUE

docker/docker-compose.dev.yml

@@ -88,7 +88,7 @@ services:
       - UNSTRUCTURED_HAS_PATCHED_LOOP=1
       - LANGCHAIN_TRACING_V2=false
       - LANGSMITH_TRACING=false
-      - AUTH_TYPE=${AUTH_TYPE:-LOCAL}
+      - AUTH_TYPE=${AUTH_TYPE:-SSO}
       - NEXT_FRONTEND_URL=${NEXT_FRONTEND_URL:-http://localhost:3000}
       - SEARXNG_DEFAULT_HOST=${SEARXNG_DEFAULT_HOST:-http://searxng:8080}
       # Daytona Sandbox – uncomment and set credentials to enable cloud code execution
@@ -204,7 +204,7 @@ services:
       context: ../surfsense_web
       args:
         NEXT_PUBLIC_FASTAPI_BACKEND_URL: ${NEXT_PUBLIC_FASTAPI_BACKEND_URL:-http://localhost:8000}
-        NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE: ${NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE:-LOCAL}
+        NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE: ${NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE:-SSO}
         NEXT_PUBLIC_ETL_SERVICE: ${NEXT_PUBLIC_ETL_SERVICE:-DOCLING}
         NEXT_PUBLIC_ZERO_CACHE_URL: ${NEXT_PUBLIC_ZERO_CACHE_URL:-http://localhost:${ZERO_CACHE_PORT:-4848}}
         NEXT_PUBLIC_DEPLOYMENT_MODE: ${NEXT_PUBLIC_DEPLOYMENT_MODE:-self-hosted}

docker/docker-compose.yml

@@ -195,7 +195,7 @@ services:
     environment:
       NEXT_PUBLIC_FASTAPI_BACKEND_URL: ${NEXT_PUBLIC_FASTAPI_BACKEND_URL:-http://localhost:${BACKEND_PORT:-8929}}
       NEXT_PUBLIC_ZERO_CACHE_URL: ${NEXT_PUBLIC_ZERO_CACHE_URL:-http://localhost:${ZERO_CACHE_PORT:-5929}}
-      NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE: ${AUTH_TYPE:-LOCAL}
+      NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE: ${AUTH_TYPE:-SSO}
       NEXT_PUBLIC_ETL_SERVICE: ${ETL_SERVICE:-DOCLING}
       NEXT_PUBLIC_DEPLOYMENT_MODE: ${DEPLOYMENT_MODE:-self-hosted}
     labels:

surfsense_backend/.env.example

@@ -61,9 +61,15 @@ STRIPE_RECONCILIATION_BATCH_SIZE=100
 # Backend URL for OAuth callbacks (optional, set when behind reverse proxy with HTTPS)
 # BACKEND_URL=https://api.yourdomain.com
 
-# Auth
-AUTH_TYPE=GOOGLE or LOCAL
+# Auth — DO NOT change this value. This fork only supports SSO
+# (mPass/Cognito via oauth2-proxy ForwardAuth). Setting LOCAL or
+# GOOGLE will break authentication — the backend routes for those
+# modes are not registered in this fork.
+AUTH_TYPE=SSO
 REGISTRATION_ENABLED=TRUE or FALSE
+
+# mPass proxy auth bypass paths (oauth2-proxy ForwardAuth integration)
+# MPASS_BYPASS_PATHS=/health  # comma-separated, defaults to /health
 # For Google Auth Only
 GOOGLE_OAUTH_CLIENT_ID=924507538m
 GOOGLE_OAUTH_CLIENT_SECRET=GOCSV

surfsense_backend/app/app.py

@@ -32,11 +32,16 @@
     initialize_vision_llm_router,
 )
 from app.db import User, create_db_and_tables, get_async_session
+from app.middleware.proxy_auth import ProxyAuthMiddleware
 from app.routes import router as crud_router
 from app.routes.auth_routes import router as auth_router
-from app.schemas import UserCreate, UserRead, UserUpdate
+from app.schemas import UserRead, UserUpdate
 from app.tasks.surfsense_docs_indexer import seed_surfsense_docs
-from app.users import SECRET, auth_backend, current_active_user, fastapi_users
+from app.users import (
+    current_active_user,
+    fastapi_users,
+    get_user_manager,
+)
 from app.utils.perf import get_perf_logger, log_system_snapshot
 
 rate_limit_logger = logging.getLogger("surfsense.rate_limit")
@@ -315,14 +320,28 @@ async def dispatch(
 
 app.add_middleware(RequestPerfMiddleware)
 
-# Add SlowAPI middleware for automatic rate limiting
+# Starlette executes middleware in reverse registration order (last added = first to
+# run on the request).  Request-path execution order:
+#
+#   CORSMiddleware → ProxyHeadersMiddleware → SlowAPIMiddleware
+#   → ProxyAuthMiddleware → RequestPerfMiddleware → route handler
+#
+# SlowAPIMiddleware wraps ProxyAuthMiddleware so rate limiting fires before any DB
+# lookup — abusive traffic is shed at the limiter before we touch the database.
+# ProxyAuthMiddleware runs after ProxyHeadersMiddleware so the client IP/scheme
+# are already normalised when we resolve the user.
+
+# Innermost: reads X-Auth-Request-Email, resolves/creates user, sets request.state.proxy_user.
+app.add_middleware(ProxyAuthMiddleware)
+
+# Wraps ProxyAuthMiddleware — rate limiting fires before the DB lookup.
 # Uses Starlette BaseHTTPMiddleware (not the raw ASGI variant) to avoid
 # corrupting StreamingResponse — SlowAPIASGIMiddleware re-sends
 # http.response.start on every body chunk, breaking SSE/streaming endpoints.
 app.add_middleware(SlowAPIMiddleware)
 
-# Add ProxyHeaders middleware FIRST to trust proxy headers (e.g., from Cloudflare)
-# This ensures FastAPI uses HTTPS in redirects when behind a proxy
+# Outermost of the inner three: trusts proxy headers (X-Forwarded-For etc.)
+# so FastAPI uses HTTPS in redirects when behind Traefik.
 app.add_middleware(ProxyHeadersMiddleware, trusted_hosts="*")
 
 # Add CORS middleware
@@ -362,149 +381,42 @@ async def dispatch(
     allow_headers=["*"],  # Allows all headers
 )
 
-app.include_router(
-    fastapi_users.get_auth_router(auth_backend),
-    prefix="/auth/jwt",
-    tags=["auth"],
-    dependencies=[Depends(rate_limit_login)],
-)
-app.include_router(
-    fastapi_users.get_register_router(UserRead, UserCreate),
-    prefix="/auth",
-    tags=["auth"],
-    dependencies=[
-        Depends(rate_limit_register),
-        Depends(registration_allowed),  # blocks registration when disabled
-    ],
-)
-app.include_router(
-    fastapi_users.get_reset_password_router(),
-    prefix="/auth",
-    tags=["auth"],
-    dependencies=[Depends(rate_limit_password_reset)],
-)
-app.include_router(
-    fastapi_users.get_verify_router(UserRead),
-    prefix="/auth",
-    tags=["auth"],
-)
+
+# Register /users/me BEFORE fastapi_users.get_users_router so our routes take
+# precedence (FastAPI first-match wins). fastapi-users' internal /users/me only
+# validates JWT — it does not check request.state.proxy_user set by the proxy
+# auth middleware, so proxy-auth users would always get 401 from that route.
+@app.get("/users/me", response_model=UserRead, tags=["users"])
+async def get_current_user_me(user: User = Depends(current_active_user)):
+    return user
+
+
+@app.patch("/users/me", response_model=UserRead, tags=["users"])
+async def update_current_user_me(
+    request: Request,
+    user_update: UserUpdate,
+    user: User = Depends(current_active_user),
+    user_manager=Depends(get_user_manager),
+):
+    # Re-fetch in user_manager's session to avoid detached-instance conflict.
+    # ProxyAuthMiddleware's User object is from a closed session; the JWT
+    # dependency also loaded the same user in user_manager's session.
+    # Passing the middleware's object to session.add() conflicts with the
+    # JWT-loaded one. user_manager.get() returns the session-attached instance.
+    db_user = await user_manager.get(user.id)
+    return await user_manager.update(user_update, db_user, safe=True, request=request)
+
+
 app.include_router(
     fastapi_users.get_users_router(UserRead, UserUpdate),
     prefix="/users",
     tags=["users"],
 )
 
+
 # Include custom auth routes (refresh token, logout)
 app.include_router(auth_router)
 
-if config.AUTH_TYPE == "GOOGLE":
-    from fastapi.responses import RedirectResponse
-
-    from app.users import google_oauth_client
-
-    # Determine if we're in a secure context (HTTPS) or local development (HTTP)
-    # The CSRF cookie must have secure=False for HTTP (localhost development)
-    is_secure_context = config.BACKEND_URL and config.BACKEND_URL.startswith("https://")
-
-    # For cross-origin OAuth (frontend and backend on different domains):
-    # - SameSite=None is required to allow cross-origin cookie setting
-    # - Secure=True is required when SameSite=None
-    # For same-origin or local development, use SameSite=Lax (default)
-    csrf_cookie_samesite = "none" if is_secure_context else "lax"
-
-    # Extract the domain from BACKEND_URL for cookie domain setting
-    # This helps with cross-site cookie issues in Firefox/Safari
-    csrf_cookie_domain = None
-    if config.BACKEND_URL:
-        from urllib.parse import urlparse
-
-        parsed_url = urlparse(config.BACKEND_URL)
-        csrf_cookie_domain = parsed_url.hostname
-
-    app.include_router(
-        fastapi_users.get_oauth_router(
-            google_oauth_client,
-            auth_backend,
-            SECRET,
-            is_verified_by_default=True,
-            csrf_token_cookie_secure=is_secure_context,
-            csrf_token_cookie_samesite=csrf_cookie_samesite,
-            csrf_token_cookie_httponly=False,  # Required for cross-site OAuth in Firefox/Safari
-        )
-        if not config.BACKEND_URL
-        else fastapi_users.get_oauth_router(
-            google_oauth_client,
-            auth_backend,
-            SECRET,
-            is_verified_by_default=True,
-            redirect_url=f"{config.BACKEND_URL}/auth/google/callback",
-            csrf_token_cookie_secure=is_secure_context,
-            csrf_token_cookie_samesite=csrf_cookie_samesite,
-            csrf_token_cookie_httponly=False,  # Required for cross-site OAuth in Firefox/Safari
-            csrf_token_cookie_domain=csrf_cookie_domain,  # Explicitly set cookie domain
-        ),
-        prefix="/auth/google",
-        tags=["auth"],
-        dependencies=[
-            Depends(registration_allowed)
-        ],  # blocks OAuth registration when disabled
-    )
-
-    # Add a redirect-based authorize endpoint for Firefox/Safari compatibility
-    # This endpoint performs a server-side redirect instead of returning JSON
-    # which fixes cross-site cookie issues where browsers don't send cookies
-    # set via cross-origin fetch requests on subsequent redirects
-    @app.get("/auth/google/authorize-redirect", tags=["auth"])
-    async def google_authorize_redirect(
-        request: Request,
-    ):
-        """
-        Redirect-based OAuth authorization endpoint.
-
-        Unlike the standard /auth/google/authorize endpoint that returns JSON,
-        this endpoint directly redirects the browser to Google's OAuth page.
-        This fixes CSRF cookie issues in Firefox and Safari where cookies set
-        via cross-origin fetch requests are not sent on subsequent redirects.
-        """
-        import secrets
-
-        from fastapi_users.router.oauth import generate_state_token
-
-        # Generate CSRF token
-        csrf_token = secrets.token_urlsafe(32)
-
-        # Build state token
-        state_data = {"csrftoken": csrf_token}
-        state = generate_state_token(state_data, SECRET, lifetime_seconds=3600)
-
-        # Get the callback URL
-        if config.BACKEND_URL:
-            redirect_url = f"{config.BACKEND_URL}/auth/google/callback"
-        else:
-            redirect_url = str(request.url_for("oauth:google.jwt.callback"))
-
-        # Get authorization URL from Google
-        authorization_url = await google_oauth_client.get_authorization_url(
-            redirect_url,
-            state,
-            scope=["openid", "email", "profile"],
-        )
-
-        # Create redirect response and set CSRF cookie
-        response = RedirectResponse(url=authorization_url, status_code=302)
-        response.set_cookie(
-            key="fastapiusersoauthcsrf",
-            value=csrf_token,
-            max_age=3600,
-            path="/",
-            domain=csrf_cookie_domain,
-            secure=is_secure_context,
-            httponly=False,  # Required for cross-site OAuth in Firefox/Safari
-            samesite=csrf_cookie_samesite,
-        )
-
-        return response
-
 
 app.include_router(crud_router, prefix="/api/v1", tags=["crud"])