Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
File Transfer Service
fts-rest
Commits
738d4040
Commit
738d4040
authored
Nov 06, 2020
by
Mihai Patrascoiu
Browse files
Change VOMS attributes generation for OIDC tokens
parent
c9222934
Pipeline
#2071937
passed with stage
in 2 minutes and 11 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/fts3rest/fts3rest/lib/oauth2provider.py
View file @
738d4040
...
...
@@ -252,18 +252,14 @@ class FTS3OAuth2ResourceProvider(ResourceProvider):
return
Session
.
query
(
Credential
).
filter
(
Credential
.
dlg_id
==
dlg_id
).
first
()
def
_generate_voms_attrs
(
self
,
credential
):
if
'email'
in
credential
:
if
'username'
in
credential
:
# 'username' is never there whether offline or online
return
credential
[
'email'
]
+
" "
+
credential
[
'username'
]
else
:
# 'user_id' is there only online
return
credential
[
'email'
]
+
" "
+
credential
[
'user_id'
]
else
:
if
'username'
in
credential
:
return
credential
[
'username'
]
+
" "
else
:
return
credential
[
'user_id'
]
+
" "
attrs
=
[
credential
.
get
(
"email"
),
credential
.
get
(
"username"
)
or
credential
.
get
(
"user_id"
)
or
credential
.
get
(
"client_id"
)
]
voms_attrs
=
' '
.
join
(
filter
(
None
,
attrs
))
log
.
debug
(
'voms_attrs::: {}'
.
format
(
voms_attrs
))
return
voms_attrs
def
_validate_token_offline
(
self
,
access_token
):
"""
...
...
src/fts3rest/fts3rest/lib/openidconnect.py
View file @
738d4040
...
...
@@ -116,16 +116,14 @@ class OIDCmanager:
method
=
'POST'
,
authn_method
=
"client_secret_basic"
)
log
.
debug
(
"after do any"
)
response
=
response
.
json
()
log
.
debug
(
"response: {}"
.
format
(
response
))
refresh_token
=
response
[
'refresh_token'
]
log
.
debug
(
"REFRESH TOKEN IS
{}
"
.
format
(
refresh_token
))
log
.
debug
(
'refresh_token_response:::
{}
'
.
format
(
refresh_token
))
except
Exception
as
ex
:
log
.
warning
(
"Exception raised when requesting refresh token"
)
log
.
warning
(
ex
)
raise
ex
log
.
debug
(
'refresh_token_response::: {}'
.
format
(
refresh_token
))
return
refresh_token
def
request_token_exchange
(
self
,
issuer
,
access_token
,
scope
=
None
,
audience
=
None
):
...
...
Joao Pedro Lopes
@batistal
mentioned in commit
fts-rest-flask@439f2613
·
Oct 06, 2021
mentioned in commit
fts-rest-flask@439f2613
mentioned in commit fts-rest-flask@439f26130f2c56182988594f720d05668bd5b7c7
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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