Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e8b54d7d
Commit
e8b54d7d
authored
Feb 18, 2022
by
Alex Kalderimis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add logging to diagnose logging downgrade failure
parent
e71c7e15
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
app/controllers/oauth/authorizations_controller.rb
app/controllers/oauth/authorizations_controller.rb
+9
-0
No files found.
app/controllers/oauth/authorizations_controller.rb
View file @
e8b54d7d
...
@@ -12,7 +12,10 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
...
@@ -12,7 +12,10 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
# Overridden from Doorkeeper::AuthorizationsController to
# Overridden from Doorkeeper::AuthorizationsController to
# include the call to session.delete
# include the call to session.delete
def
new
def
new
logger
.
info
(
"
#{
self
.
class
.
name
}
#new: pre_auth_params['scope'] =
#{
pre_auth_params
[
'scope'
].
inspect
}
"
)
if
pre_auth
.
authorizable?
if
pre_auth
.
authorizable?
logger
.
info
(
"
#{
self
.
class
.
name
}
#new: pre_auth.scopes =
#{
pre_auth
.
scopes
.
to_a
.
inspect
}
"
)
if
skip_authorization?
||
matching_token?
if
skip_authorization?
||
matching_token?
auth
=
authorization
.
authorize
auth
=
authorization
.
authorize
parsed_redirect_uri
=
URI
.
parse
(
auth
.
redirect_uri
)
parsed_redirect_uri
=
URI
.
parse
(
auth
.
redirect_uri
)
...
@@ -43,9 +46,15 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
...
@@ -43,9 +46,15 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
auth_type
=
params
.
delete
(
'gl_auth_type'
)
auth_type
=
params
.
delete
(
'gl_auth_type'
)
return
unless
auth_type
==
'login'
return
unless
auth_type
==
'login'
logger
.
info
(
"
#{
self
.
class
.
name
}
: BEFORE application has read_user:
#{
application_has_read_user_scope?
}
"
)
logger
.
info
(
"
#{
self
.
class
.
name
}
: BEFORE scope =
#{
params
[
'scope'
].
inspect
}
"
)
ensure_read_user_scope!
ensure_read_user_scope!
params
[
'scope'
]
=
Gitlab
::
Auth
::
READ_USER_SCOPE
.
to_s
if
application_has_read_user_scope?
params
[
'scope'
]
=
Gitlab
::
Auth
::
READ_USER_SCOPE
.
to_s
if
application_has_read_user_scope?
logger
.
info
(
"
#{
self
.
class
.
name
}
: AFTER application has read_user:
#{
application_has_read_user_scope?
}
"
)
logger
.
info
(
"
#{
self
.
class
.
name
}
: AFTER scope =
#{
params
[
'scope'
].
inspect
}
"
)
end
end
# Configure the application to support read_user scope, if it already
# Configure the application to support read_user scope, if it already
...
...
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