Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
b152d3e0
Commit
b152d3e0
authored
Feb 16, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
parents
16cd57fe
33cdf20c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
web.py
cps/web.py
+6
-6
No files found.
cps/web.py
View file @
b152d3e0
...
...
@@ -123,12 +123,6 @@ def load_user(user_id):
@
lm
.
request_loader
def
load_user_from_request
(
request
):
auth_header
=
request
.
headers
.
get
(
"Authorization"
)
if
auth_header
:
user
=
load_user_from_auth_header
(
auth_header
)
if
user
:
return
user
if
config
.
config_allow_reverse_proxy_header_login
:
rp_header_name
=
config
.
config_reverse_proxy_login_header_name
if
rp_header_name
:
...
...
@@ -138,6 +132,12 @@ def load_user_from_request(request):
if
user
:
return
user
auth_header
=
request
.
headers
.
get
(
"Authorization"
)
if
auth_header
:
user
=
load_user_from_auth_header
(
auth_header
)
if
user
:
return
user
return
...
...
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