scriptoriumadmin/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-09-11 22:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2026-09-09 12:51:59 -04:00
parent d70053e449
commit ee46e2664a
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend/open_webui/env.py
View file

@ -983,6 +983,7 @@ FORWARD_USER_INFO_HEADER_USER_NAME = os.getenv('FORWARD_USER_INFO_HEADER_USER_NA
FORWARD_USER_INFO_HEADER_USER_ID = os.getenv('FORWARD_USER_INFO_HEADER_USER_ID', 'X-OpenWebUI-User-Id')
FORWARD_USER_INFO_HEADER_USER_EMAIL = os.getenv('FORWARD_USER_INFO_HEADER_USER_EMAIL', 'X-OpenWebUI-User-Email')
FORWARD_USER_INFO_HEADER_USER_ROLE = os.getenv('FORWARD_USER_INFO_HEADER_USER_ROLE', 'X-OpenWebUI-User-Role')
FORWARD_USER_INFO_HEADER_AUTH_TYPE = os.getenv('FORWARD_USER_INFO_HEADER_AUTH_TYPE', 'X-OpenWebUI-Auth-Type')
FORWARD_SESSION_INFO_HEADER_MESSAGE_ID = os.getenv('FORWARD_SESSION_INFO_HEADER_MESSAGE_ID', 'X-OpenWebUI-Message-Id')
FORWARD_SESSION_INFO_HEADER_CHAT_ID = os.getenv('FORWARD_SESSION_INFO_HEADER_CHAT_ID', 'X-OpenWebUI-Chat-Id')

2
backend/open_webui/routers/ollama.py
View file

@ -119,7 +119,7 @@ async def send_request(
}
if ENABLE_FORWARD_USER_INFO_HEADERS and user:
headers = include_user_info_headers(headers, user)
headers = include_user_info_headers(headers, user, request=request)
if metadata and metadata.get('chat_id'):
headers[FORWARD_SESSION_INFO_HEADER_CHAT_ID] = metadata.get('chat_id')

4
backend/open_webui/routers/openai.py
View file

@ -103,7 +103,7 @@ async def send_get_request(
cookies = None
if ENABLE_FORWARD_USER_INFO_HEADERS and user:
headers = include_user_info_headers(headers, user)
headers = include_user_info_headers(headers, user, request=request)
async with session.get(
url,
@ -176,7 +176,7 @@ async def get_headers_and_cookies(
}
if ENABLE_FORWARD_USER_INFO_HEADERS and user:
headers = include_user_info_headers(headers, user)
headers = include_user_info_headers(headers, user, request=request)
if metadata and metadata.get('chat_id'):
headers[FORWARD_SESSION_INFO_HEADER_CHAT_ID] = metadata.get('chat_id')

2
backend/open_webui/utils/auth.py
View file

@ -386,6 +386,7 @@ async def get_current_user(
# Scope-backed, so outer middleware (audit) can reuse the resolved user
request.state.user = user
request.state.auth_type = 'api_key'
return user
# auth by jwt token
@ -437,6 +438,7 @@ async def get_current_user(
# Scope-backed, so outer middleware (audit) can reuse the resolved user
request.state.user = user
request.state.auth_type = 'jwt'
return user
else:
raise HTTPException(

9
backend/open_webui/utils/headers.py
View file

@ -5,6 +5,7 @@ from urllib.parse import quote
import jwt
from open_webui.env import (
FORWARD_USER_INFO_HEADER_AUTH_TYPE,
FORWARD_USER_INFO_HEADER_JWT,
FORWARD_USER_INFO_HEADER_JWT_EXPIRES_SECONDS,
FORWARD_USER_INFO_HEADER_JWT_SECRET,
@ -47,15 +48,20 @@ def _mint_forward_user_jwt(user: Any) -> str:
return jwt.encode(payload, FORWARD_USER_INFO_HEADER_JWT_SECRET, algorithm='HS256')
def include_user_info_headers(headers: dict, user: Optional[Any] = None) -> dict:
def include_user_info_headers(headers: dict, user: Optional[Any] = None, *, request=None) -> dict:
"""
Forward user identity to external backends: signed JWT in
FORWARD_USER_INFO_HEADER_JWT if FORWARD_USER_INFO_HEADER_JWT_SECRET is set;
otherwise the legacy X-OpenWebUI-User-* headers.
Include the verified incoming auth type when a request provides it.
"""
if user is None:
return headers
auth_type = getattr(getattr(request, 'state', None), 'auth_type', None)
if auth_type in ('api_key', 'jwt'):
headers = {**headers, FORWARD_USER_INFO_HEADER_AUTH_TYPE: auth_type}
if FORWARD_USER_INFO_HEADER_JWT_SECRET:
try:
token = _mint_forward_user_jwt(user)
@ -141,6 +147,7 @@ def parse_custom_headers(
'{{USER_GROUPS}}': ','.join(group.name.strip() for group in user_groups) if user_groups else '',
'{{USER_GROUP_IDS}}': ','.join(group.id for group in user_groups) if user_groups else '',
'{{USER_AGENT}}': user_agent,
'{{AUTH_TYPE}}': getattr(getattr(request, 'state', None), 'auth_type', None) or '',
}
parsed_headers = {}