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.

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

Jump to bottom

Fix Parse URL for RAS #895

Merged
merged 2 commits into from
Apr 8, 2021
Merged

Fix Parse URL for RAS #895

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3157e42
Fix RAS parse url
BinamB Apr 7, 2021
f723eaa
fix variables
BinamB Apr 7, 2021
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
10 changes: 6 additions & 4 deletions fence/blueprints/login/ras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import jwt
import os
from flask_sqlalchemy_session import current_session
import urllib.request, urllib.parse, urllib.error
import urllib.request, urllib.error
from urllib.parse import urlparse, parse_qs

from fence.models import GA4GHVisaV1, IdentityProvider

Expand Down Expand Up @@ -75,9 +76,10 @@ def post_login(self, user=None, token_result=None):
expires = config["RAS_REFRESH_EXPIRATION"]

# User definied RAS refresh token expiration time
parsed_url = urllib.parse.parse_qs(flask.session.get("redirect"))
if parsed_url.get("upstream_expires_in"):
custom_refresh_expiration = parsed_url.get("upstream_expires_in")[0]
parsed_url = urlparse(flask.session.get("redirect"))
query_params = parse_qs(parsed_url.query)
if query_params.get("upstream_expires_in"):
custom_refresh_expiration = query_params.get("upstream_expires_in")[0]
expires = get_valid_expiration(
custom_refresh_expiration,
expires,
Expand Down