Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
ab270c16
Commit
ab270c16
authored
Jun 19, 2024
by
Timothy J. Baek
Browse files
fix
parent
1e045322
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
backend/main.py
backend/main.py
+2
-0
backend/utils/utils.py
backend/utils/utils.py
+7
-6
No files found.
backend/main.py
View file @
ab270c16
...
...
@@ -325,6 +325,7 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
data
=
json
.
loads
(
body_str
)
if
body_str
else
{}
user
=
get_current_user
(
request
,
get_http_authorization_cred
(
request
.
headers
.
get
(
"Authorization"
))
)
...
...
@@ -558,6 +559,7 @@ class PipelineMiddleware(BaseHTTPMiddleware):
data
=
json
.
loads
(
body_str
)
if
body_str
else
{}
user
=
get_current_user
(
request
,
get_http_authorization_cred
(
request
.
headers
.
get
(
"Authorization"
))
)
...
...
backend/utils/utils.py
View file @
ab270c16
...
...
@@ -25,7 +25,6 @@ ALGORITHM = "HS256"
##############
bearer_security
=
HTTPBearer
(
auto_error
=
False
)
pwd_context
=
CryptContext
(
schemes
=
[
"bcrypt"
],
deprecated
=
"auto"
)
...
...
@@ -79,15 +78,17 @@ def get_current_user(
request
:
Request
,
auth_token
:
HTTPAuthorizationCredentials
=
Depends
(
bearer_security
),
):
# get token from cookie
token
=
request
.
cookies
.
get
(
"token"
)
if
auth_token
is
None
and
token
is
None
:
raise
HTTPException
(
status_code
=
403
,
detail
=
"Not authenticated"
)
token
=
None
if
auth_token
is
not
None
:
token
=
auth_token
.
credentials
if
token
is
None
and
"token"
in
request
.
cookies
:
token
=
request
.
cookies
.
get
(
"token"
)
if
token
is
None
:
raise
HTTPException
(
status_code
=
403
,
detail
=
"Not authenticated"
)
# auth by api key
if
token
.
startswith
(
"sk-"
):
return
get_current_user_by_api_key
(
token
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment