mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-16 20:07:49 +01:00
fix: don't over quote forwarded headers
Fix introduced on #15035 is over quoting headers. Eg mails instead of user@example.com shown as user%40example.com Eg names instead of First Last shown as First%20Last Also we are spending some time quoting ids and roles without required. Keep quote only on user name, initially had problem based on the discussion https://github.com/open-webui/open-webui/discussions/14391 Also add space in safe characters, in order remove %20 from names.
This commit is contained in:
committed by
Athanasios Oikonomou
parent
1f641ce1fb
commit
96758176cc
@@ -67,10 +67,10 @@ async def send_get_request(url, key=None, user: UserModel = None):
|
||||
**({"Authorization": f"Bearer {key}"} if key else {}),
|
||||
**(
|
||||
{
|
||||
"X-OpenWebUI-User-Name": quote(user.name),
|
||||
"X-OpenWebUI-User-Id": quote(user.id),
|
||||
"X-OpenWebUI-User-Email": quote(user.email),
|
||||
"X-OpenWebUI-User-Role": quote(user.role),
|
||||
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
|
||||
"X-OpenWebUI-User-Id": user.id,
|
||||
"X-OpenWebUI-User-Email": user.email,
|
||||
"X-OpenWebUI-User-Role": user.role,
|
||||
}
|
||||
if ENABLE_FORWARD_USER_INFO_HEADERS and user
|
||||
else {}
|
||||
@@ -226,10 +226,10 @@ async def speech(request: Request, user=Depends(get_verified_user)):
|
||||
),
|
||||
**(
|
||||
{
|
||||
"X-OpenWebUI-User-Name": quote(user.name),
|
||||
"X-OpenWebUI-User-Id": quote(user.id),
|
||||
"X-OpenWebUI-User-Email": quote(user.email),
|
||||
"X-OpenWebUI-User-Role": quote(user.role),
|
||||
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
|
||||
"X-OpenWebUI-User-Id": user.id,
|
||||
"X-OpenWebUI-User-Email": user.email,
|
||||
"X-OpenWebUI-User-Role": user.role,
|
||||
}
|
||||
if ENABLE_FORWARD_USER_INFO_HEADERS
|
||||
else {}
|
||||
@@ -479,10 +479,10 @@ async def get_models(
|
||||
"Content-Type": "application/json",
|
||||
**(
|
||||
{
|
||||
"X-OpenWebUI-User-Name": quote(user.name),
|
||||
"X-OpenWebUI-User-Id": quote(user.id),
|
||||
"X-OpenWebUI-User-Email": quote(user.email),
|
||||
"X-OpenWebUI-User-Role": quote(user.role),
|
||||
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
|
||||
"X-OpenWebUI-User-Id": user.id,
|
||||
"X-OpenWebUI-User-Email": user.email,
|
||||
"X-OpenWebUI-User-Role": user.role,
|
||||
}
|
||||
if ENABLE_FORWARD_USER_INFO_HEADERS
|
||||
else {}
|
||||
@@ -574,10 +574,10 @@ async def verify_connection(
|
||||
"Content-Type": "application/json",
|
||||
**(
|
||||
{
|
||||
"X-OpenWebUI-User-Name": quote(user.name),
|
||||
"X-OpenWebUI-User-Id": quote(user.id),
|
||||
"X-OpenWebUI-User-Email": quote(user.email),
|
||||
"X-OpenWebUI-User-Role": quote(user.role),
|
||||
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
|
||||
"X-OpenWebUI-User-Id": user.id,
|
||||
"X-OpenWebUI-User-Email": user.email,
|
||||
"X-OpenWebUI-User-Role": user.role,
|
||||
}
|
||||
if ENABLE_FORWARD_USER_INFO_HEADERS
|
||||
else {}
|
||||
@@ -818,10 +818,10 @@ async def generate_chat_completion(
|
||||
),
|
||||
**(
|
||||
{
|
||||
"X-OpenWebUI-User-Name": quote(user.name),
|
||||
"X-OpenWebUI-User-Id": quote(user.id),
|
||||
"X-OpenWebUI-User-Email": quote(user.email),
|
||||
"X-OpenWebUI-User-Role": quote(user.role),
|
||||
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
|
||||
"X-OpenWebUI-User-Id": user.id,
|
||||
"X-OpenWebUI-User-Email": user.email,
|
||||
"X-OpenWebUI-User-Role": user.role,
|
||||
}
|
||||
if ENABLE_FORWARD_USER_INFO_HEADERS
|
||||
else {}
|
||||
@@ -936,10 +936,10 @@ async def embeddings(request: Request, form_data: dict, user):
|
||||
"Content-Type": "application/json",
|
||||
**(
|
||||
{
|
||||
"X-OpenWebUI-User-Name": quote(user.name),
|
||||
"X-OpenWebUI-User-Id": quote(user.id),
|
||||
"X-OpenWebUI-User-Email": quote(user.email),
|
||||
"X-OpenWebUI-User-Role": quote(user.role),
|
||||
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
|
||||
"X-OpenWebUI-User-Id": user.id,
|
||||
"X-OpenWebUI-User-Email": user.email,
|
||||
"X-OpenWebUI-User-Role": user.role,
|
||||
}
|
||||
if ENABLE_FORWARD_USER_INFO_HEADERS and user
|
||||
else {}
|
||||
@@ -1008,10 +1008,10 @@ async def proxy(path: str, request: Request, user=Depends(get_verified_user)):
|
||||
"Content-Type": "application/json",
|
||||
**(
|
||||
{
|
||||
"X-OpenWebUI-User-Name": quote(user.name),
|
||||
"X-OpenWebUI-User-Id": quote(user.id),
|
||||
"X-OpenWebUI-User-Email": quote(user.email),
|
||||
"X-OpenWebUI-User-Role": quote(user.role),
|
||||
"X-OpenWebUI-User-Name": quote(user.name, safe=" "),
|
||||
"X-OpenWebUI-User-Id": user.id,
|
||||
"X-OpenWebUI-User-Email": user.email,
|
||||
"X-OpenWebUI-User-Role": user.role,
|
||||
}
|
||||
if ENABLE_FORWARD_USER_INFO_HEADERS
|
||||
else {}
|
||||
|
||||
Reference in New Issue
Block a user