From da1a088a4f430cfc0c323a609ed8c6e648cc2b54 Mon Sep 17 00:00:00 2001
From: Yassin Kortam <yassin@berri.ai>
Date: Wed, 10 Jun 2026 17:40:05 -0700
Subject: [PATCH] feat(auth_v2): redirect after SAML ACS with validated
 RelayState

Replace the test-convenience JSON body from /acs with the standard SP flow: set
the session cookie, then 303 redirect to the RelayState the IdP echoes back, or
to SamlConfig.default_redirect_path (default "/") when it is absent. RelayState
is validated to block open redirects - only relative paths are honored (must
start with a single "/", reject "//", any scheme, and backslashes), and
anything else falls back to the default. GET /login threads a ?next= query
param through as RelayState with the same validation so the post-login landing
page survives the round trip.
---
 litellm/auth_v2/config.py |  1 +
 litellm/auth_v2/saml.py   | 30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/litellm/auth_v2/config.py b/litellm/auth_v2/config.py
index 33ea5dacafe..16169e758ad 100644
--- a/litellm/auth_v2/config.py
+++ b/litellm/auth_v2/config.py
@@ -68,6 +68,7 @@ class SamlConfig(BaseModel):
     sp_cert_file: Optional[str] = None
     allow_unsolicited: bool = True
     session_cookie: str = "saml_session"
+    default_redirect_path: str = "/"
     xmlsec_binary: Optional[str] = None
     attribute_map: Dict[str, str] = Field(
         default_factory=lambda: dict(DEFAULT_SAML_ATTRIBUTE_MAP)
diff --git a/litellm/auth_v2/saml.py b/litellm/auth_v2/saml.py
index d41840c9924..9f3d1773fed 100644
--- a/litellm/auth_v2/saml.py
+++ b/litellm/auth_v2/saml.py
@@ -4,7 +4,7 @@ import secrets
 from typing import Any, Dict, List, Optional
 
 from fastapi import APIRouter, HTTPException, Request
-from fastapi.responses import JSONResponse, RedirectResponse, Response
+from fastapi.responses import RedirectResponse, Response
 from saml2 import BINDING_HTTP_POST
 from saml2.client import Saml2Client
 from saml2.config import SPConfig
@@ -84,6 +84,18 @@ def _claims_from_mapped(mapped: Dict[str, Any]) -> Dict[str, Any]:
     return claims
 
 
+def _safe_relay_state(target: Optional[str], default: str) -> str:
+    if (
+        target
+        and target.startswith("/")
+        and not target.startswith("//")
+        and "://" not in target
+        and "\\" not in target
+    ):
+        return target
+    return default
+
+
 def _metadata_source(idp_metadata: str) -> Dict[str, Any]:
     stripped = idp_metadata.strip()
     if stripped.startswith("<"):
@@ -181,9 +193,12 @@ def build_saml_router(config: SamlConfig, session_store: SamlSessionStore) -> AP
         )
 
     @router.get("/login")
-    async def login() -> RedirectResponse:
-        request_id, info = client.prepare_for_authenticate()
-        session_store.remember_request(request_id)
+    async def login(request: Request) -> RedirectResponse:
+        relay_state = _safe_relay_state(
+            request.query_params.get("next"), config.default_redirect_path
+        )
+        request_id, info = client.prepare_for_authenticate(relay_state=relay_state)
+        session_store.remember_request(request_id, relay_state)
         location = dict(info["headers"]).get("Location")
         if not location:
             raise HTTPException(status_code=500, detail="no SAML redirect produced")
@@ -226,7 +241,12 @@ def build_saml_router(config: SamlConfig, session_store: SamlSessionStore) -> AP
                 "claims": _claims_from_mapped(mapped),
             }
         )
-        response = JSONResponse(content=user.model_dump())
+        relay_state = form.get("RelayState")
+        target = _safe_relay_state(
+            relay_state if isinstance(relay_state, str) else None,
+            config.default_redirect_path,
+        )
+        response = RedirectResponse(target, status_code=303)
         response.set_cookie(
             config.session_cookie, session_id, httponly=True, samesite="lax"
         )