Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[9.0] DISET version of the TokenManager service #7793

Open
wants to merge 3 commits into
base: integration
Choose a base branch
from

Conversation

atsareg
Copy link
Contributor

@atsareg atsareg commented Sep 14, 2024

The DISET version of the TokenManager service is added. This will help to eventually get rid of all the Tornado services.

BEGINRELEASENOTES

*Framework
NEW: DISET version of the TokenManager service

ENDRELEASENOTES

@andresailer
Copy link
Contributor

Why not put this into 8.0? The TokenManager is the only tornado service I have

Comment on lines +233 to +245
result = Registry.getIDFromDN(dn)
if result["OK"]:
uid = result["Value"]
# To do this, first find the refresh token stored in the database with the maximum scope
result = self.__tokenDB.getTokenForUserProvider(uid, idpObj.name)
if result["OK"] and result["Value"]:
tokens = result["Value"]
result = self.__checkProperties(dn, userGroup)
if result["OK"]:
# refresh token with requested scope
result = idpObj.refreshToken(tokens.get("refresh_token"), group=userGroup, scope=scope)
if result["OK"]:
return result
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
result = Registry.getIDFromDN(dn)
if result["OK"]:
uid = result["Value"]
# To do this, first find the refresh token stored in the database with the maximum scope
result = self.__tokenDB.getTokenForUserProvider(uid, idpObj.name)
if result["OK"] and result["Value"]:
tokens = result["Value"]
result = self.__checkProperties(dn, userGroup)
if result["OK"]:
# refresh token with requested scope
result = idpObj.refreshToken(tokens.get("refresh_token"), group=userGroup, scope=scope)
if result["OK"]:
return result
result = Registry.getIDFromDN(dn)
if not result["OK"]:
continue
uid = result["Value"]
# To do this, first find the refresh token stored in the database with the maximum scope
result = self.__tokenDB.getTokenForUserProvider(uid, idpObj.name)
if not result["OK"] or not result["Value"]:
continue
tokens = result["Value"]
result = self.__checkProperties(dn, userGroup)
if not result["OK"]:
continue
# refresh token with requested scope
result = idpObj.refreshToken(tokens.get("refresh_token"), group=userGroup, scope=scope)
if result["OK"]:
return result

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PS: Shouldn't we first result = self.__checkProperties(dn, userGroup) instead of getting getTokenForUserProvider ? Seems we can do that checkProperties before?

@fstagni
Copy link
Contributor

fstagni commented Sep 19, 2024

For each and every service for which we have the DIPS and HTTPs version, we have 2 files:

  • a "NameOfHandler.py". This contains
class NameOfHandlerMixin:
  # logic end "export_"s here

class NameOfHandler(NotificationHandlerMixin, RequestHandler):
    pass
  • a "TornadoNameOfHandler.py". This contains
class TornadoNameOfHandler(NotificationHandlerMixin, TornadoService):
    pass

which should be respected also here. So, at a minimum you need to modify accordingly also the "TornadoTokenManagerHandler.py". Or, at the 2 VERY different one from the other?

BTW I think this should also go to v8.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants