mirror of
https://github.com/open-webui/open-webui
synced 2025-02-07 21:47:29 +00:00
feat: implement OAuth logout functionality for keyclock to terminate sso session
This commit is contained in:
parent
c4ea31357f
commit
d5ce85f34a
@ -29,7 +29,11 @@ from open_webui.env import (
|
||||
SRC_LOG_LEVELS,
|
||||
)
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request, status
|
||||
from fastapi.responses import Response
|
||||
from fastapi.responses import RedirectResponse, Response
|
||||
from open_webui.config import (
|
||||
OAUTH_PROVIDER_NAME,
|
||||
OAUTH_LOGOUT_URL,
|
||||
)
|
||||
from pydantic import BaseModel
|
||||
from open_webui.utils.misc import parse_duration, validate_email_format
|
||||
from open_webui.utils.utils import (
|
||||
@ -498,8 +502,17 @@ async def signup(request: Request, response: Response, form_data: SignupForm):
|
||||
|
||||
|
||||
@router.get("/signout")
|
||||
async def signout(response: Response):
|
||||
async def signout(request: Request, response: Response):
|
||||
response.delete_cookie("token")
|
||||
|
||||
if OAUTH_PROVIDER_NAME.value == "keycloak" and OAUTH_LOGOUT_URL:
|
||||
id_token = request.cookies.get("id_token", None)
|
||||
if id_token:
|
||||
logout_url = f"{OAUTH_LOGOUT_URL}?id_token_hint={id_token}"
|
||||
response.delete_cookie("id_token")
|
||||
return RedirectResponse(url=logout_url)
|
||||
|
||||
# Fall back to the default signout
|
||||
return {"status": True}
|
||||
|
||||
|
||||
|
@ -384,6 +384,12 @@ OAUTH_PROVIDER_NAME = PersistentConfig(
|
||||
os.environ.get("OAUTH_PROVIDER_NAME", "SSO"),
|
||||
)
|
||||
|
||||
OAUTH_LOGOUT_URL = PersistentConfig(
|
||||
"OAUTH_LOGOUT_URL",
|
||||
"oauth.oidc.logout_url",
|
||||
os.environ.get("OAUTH_LOGOUT_URL", ""),
|
||||
)
|
||||
|
||||
OAUTH_USERNAME_CLAIM = PersistentConfig(
|
||||
"OAUTH_USERNAME_CLAIM",
|
||||
"oauth.oidc.username_claim",
|
||||
|
@ -20,6 +20,7 @@ from open_webui.config import (
|
||||
OAUTH_MERGE_ACCOUNTS_BY_EMAIL,
|
||||
OAUTH_PROVIDERS,
|
||||
ENABLE_OAUTH_ROLE_MANAGEMENT,
|
||||
OAUTH_PROVIDER_NAME,
|
||||
OAUTH_ROLES_CLAIM,
|
||||
OAUTH_EMAIL_CLAIM,
|
||||
OAUTH_PICTURE_CLAIM,
|
||||
@ -252,10 +253,19 @@ class OAuthManager:
|
||||
samesite=WEBUI_SESSION_COOKIE_SAME_SITE,
|
||||
secure=WEBUI_SESSION_COOKIE_SECURE,
|
||||
)
|
||||
|
||||
|
||||
if OAUTH_PROVIDER_NAME.value == "keycloak":
|
||||
id_token = token.get("id_token")
|
||||
response.set_cookie(
|
||||
key="id_token",
|
||||
value=id_token,
|
||||
httponly=True,
|
||||
samesite=WEBUI_SESSION_COOKIE_SAME_SITE,
|
||||
secure=WEBUI_SESSION_COOKIE_SECURE,
|
||||
)
|
||||
# Redirect back to the frontend with the JWT token
|
||||
redirect_url = f"{request.base_url}auth#token={jwt_token}"
|
||||
return RedirectResponse(url=redirect_url)
|
||||
return RedirectResponse(url=redirect_url, headers=response.headers)
|
||||
|
||||
|
||||
oauth_manager = OAuthManager()
|
||||
|
Loading…
Reference in New Issue
Block a user