Skip to content

Make refresh tokens rotate #59

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make refresh tokens rotate #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion phoenixRest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@

from phoenixRest.services import ServiceManager, setup_service_manager

OAUTH_EXPIRY = 1*60 if "DEBUG" in os.environ else 10*60

@subscriber(NewRequest)
def log_request(evt):
log.info("%s %s" % (evt.request.method, evt.request.url))
Expand Down Expand Up @@ -100,7 +102,7 @@ def main(global_config, **settings):
# JWT
config.set_authorization_policy(ACLAuthorizationPolicy())
config.include('pyramid_jwt')
config.set_jwt_authentication_policy(JWT_SECRET, auth_type="Bearer" ,expiration=60*60 if "DEBUG" in os.environ else 10*60, callback=add_role_principals)
config.set_jwt_authentication_policy(JWT_SECRET, auth_type="Bearer" ,expiration=OAUTH_EXPIRY, callback=add_role_principals)

# Pillow renderer
config.add_renderer("pillow", ".features.pillow_renderer.PillowRendererFactory")
Expand Down
8 changes: 6 additions & 2 deletions phoenixRest/views/user/oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from phoenixRest.models.core.event import get_current_event
from phoenixRest.models.core.oauth.oauthCode import OauthCode
from phoenixRest.models.core.oauth.refreshToken import OauthRefreshToken
from phoenixRest import OAUTH_EXPIRY

from phoenixRest.utils import validate

Expand Down Expand Up @@ -147,12 +148,15 @@ def token(request):
"error": "Invalid token"
}

#refreshToken.refresh()
refreshToken.refresh()
request.db.add(refreshToken)
# The refresh token was valid

return {
'access_token': generate_token(refreshToken.user, request),
#'refresh_token': refreshToken.token
'token_type': "Bearer",
'refresh_token': refreshToken.token,
'expires': OAUTH_EXPIRY
}
else:
request.response.status = 400
Expand Down
Loading