github-advanced-security[bot] commented on code in PR #38469:
URL: https://github.com/apache/superset/pull/38469#discussion_r2895286430
##########
superset/utils/oauth2.py:
##########
@@ -276,3 +276,102 @@
if database.is_oauth2_enabled() and
database.db_engine_spec.needs_oauth2(ex):
database.db_engine_spec.start_oauth2_dance(database)
raise
+
+
+def save_user_provider_token(
+ user_id: int,
+ provider: str,
+ token_response: dict[str, Any],
+) -> None:
+ """
+ Upsert an UpstreamOAuthToken row for the given user + provider.
+ """
+ from superset.models.core import UpstreamOAuthToken
+
+ token: UpstreamOAuthToken | None = (
+ db.session.query(UpstreamOAuthToken)
+ .filter_by(user_id=user_id, provider=provider)
+ .one_or_none()
+ )
+ if token is None:
+ token = UpstreamOAuthToken(user_id=user_id, provider=provider)
+
+ token.access_token = token_response.get("access_token")
+ expires_in = token_response.get("expires_in")
+ token.access_token_expiration = (
+ datetime.now() + timedelta(seconds=expires_in) if expires_in else None
+ )
+ token.refresh_token = token_response.get("refresh_token")
+ db.session.add(token)
+ db.session.commit()
+
+
+def get_upstream_provider_token(provider: str, user_id: int) -> str | None:
+ """
+ Retrieve a valid access token for the given provider and user.
+
+ If the token is expired and a refresh token exists, attempt to refresh it.
+ Returns None if no valid token is available.
+ """
+ from superset.models.core import UpstreamOAuthToken
+
+ token: UpstreamOAuthToken | None = (
+ db.session.query(UpstreamOAuthToken)
+ .filter_by(user_id=user_id, provider=provider)
+ .one_or_none()
+ )
+ if token is None:
+ return None
+
+ now = datetime.now()
+ if token.access_token_expiration and token.access_token_expiration > now:
+ return token.access_token
+
+ # Token is expired
+ if token.refresh_token:
+ return _refresh_upstream_provider_token(token, provider)
+
+ db.session.delete(token)
+ db.session.commit()
+ return None
+
+
+def _refresh_upstream_provider_token(
+ token: UpstreamOAuthToken,
+ provider: str,
+) -> str | None:
+ """
+ Use the refresh token to obtain a new access token from the provider.
+ Updates and persists the token if successful; deletes it on failure.
+ """
+ from flask import current_app as flask_app
+
+ try:
+ remote_app =
flask_app.extensions["authlib.integrations.flask_client"][provider]
+ token_response = remote_app.fetch_access_token(
+ grant_type="refresh_token",
+ refresh_token=token.refresh_token,
+ )
+ except Exception: # pylint: disable=broad-except
+ logger.warning(
+ "Failed to refresh upstream OAuth token for provider %s",
provider, exc_info=True
Review Comment:
## Clear-text logging of sensitive information
This expression logs [sensitive data (password)](1) as clear text.
[Show more
details](https://github.com/apache/superset/security/code-scanning/2255)
##########
superset/security/manager.py:
##########
@@ -480,6 +480,59 @@
return self.get_guest_user_from_request(request)
return None
+ def set_oauth_session(self, provider: str, oauth_response: dict[str, Any])
-> None:
+ """
+ Override to persist the full OAuth token response before FAB reduces
it to
+ ``session["oauth"] = (access_token, secret)`` tuple.
+ """
+ # pylint: disable=import-outside-toplevel
+ from flask import session
+
+ super().set_oauth_session(provider, oauth_response)
+ # FAB stores only (access_token, secret) in session["oauth"].
+ # We need the full response (expires_in, refresh_token, …) for
upstream forwarding.
+ session["oauth_full_token"] = dict(oauth_response)
+
+ def auth_user_oauth(self, userinfo: dict[str, Any]) -> Any:
+ """
+ Override to save the upstream OAuth token when a user logs in via
OAuth.
+
+ If ``save_token: True`` is set in the matching OAUTH_PROVIDERS entry
and
+ ``DATABASE_OAUTH2_UPSTREAM_PROVIDERS`` maps a database to this
provider,
+ the token will be forwarded to that database instead of triggering a
+ separate OAuth2 dance.
+ """
+ # pylint: disable=import-outside-toplevel
+ from flask import current_app as flask_app, session
+
+ user = super().auth_user_oauth(userinfo)
+ if user:
+ provider = session.get("oauth_provider")
+ # Use the full token dict saved by set_oauth_session, not the
+ # (access_token, secret) tuple that FAB stores in session["oauth"].
+ token = session.get("oauth_full_token")
+ if token and provider:
+ provider_config = next(
+ (
+ p
+ for p in flask_app.config.get("OAUTH_PROVIDERS", [])
+ if p.get("name") == provider
+ ),
+ None,
+ )
+ if provider_config and provider_config.get("save_token"):
+ from superset.utils.oauth2 import save_user_provider_token
+
+ try:
+ save_user_provider_token(user.id, provider, token)
+ except Exception: # pylint: disable=broad-except
+ logger.warning(
+ "Failed to save upstream OAuth token for provider
%s",
+ provider,
Review Comment:
## Clear-text logging of sensitive information
This expression logs [sensitive data (password)](1) as clear text.
[Show more
details](https://github.com/apache/superset/security/code-scanning/2254)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
