Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions superset/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,11 @@ def _try_json_readsha(filepath: str, length: int) -> str | None:
RATELIMIT_APPLICATION = "50 per second"
AUTH_RATE_LIMITED = True
AUTH_RATE_LIMIT = "5 per second"

# When enabled, users whose account is flagged with ``password_must_change``
# (e.g. accounts provisioned by an administrator) are redirected to the
# password-reset page until they set a new password. Off by default.
ENABLE_FORCE_PASSWORD_CHANGE = False
# A storage location conforming to the scheme in storage-scheme. See the limits
# library for allowed values: https://limits.readthedocs.io/en/stable/storage.html
# RATELIMIT_STORAGE_URI = "redis://host:port"
Expand Down
8 changes: 8 additions & 0 deletions superset/initialization/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,14 @@ def register_request_handlers(self) -> None:
"""Register app-level request handlers"""
from flask import request, Response

from superset.security.password_change import (
register_password_change_enforcement,
)

# Redirect users with a pending forced password change to the reset
# page (no-op unless ENABLE_FORCE_PASSWORD_CHANGE is enabled).
register_password_change_enforcement(self.superset_app)

@self.superset_app.after_request
def apply_http_headers(response: Response) -> Response:
"""Applies the configuration's http headers to all responses"""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""add password_must_change to user_attribute

Revision ID: b7c9d1e2f3a4
Revises: c8d2e3f4a5b6, f7a1c93e0b21
Create Date: 2026-06-01 00:00:00.000000

"""

import sqlalchemy as sa

from superset.migrations.shared.utils import add_columns, drop_columns

# revision identifiers, used by Alembic.
revision = "b7c9d1e2f3a4"
down_revision = ("c8d2e3f4a5b6", "f7a1c93e0b21")


def upgrade() -> None:
add_columns(
"user_attribute",
sa.Column(
"password_must_change",
sa.Boolean(),
nullable=False,
server_default=sa.false(),
),
)


def downgrade() -> None:
drop_columns("user_attribute", "password_must_change")
5 changes: 5 additions & 0 deletions superset/models/user_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

from flask_appbuilder import Model
from sqlalchemy import (
Boolean,
Column,
DateTime,
ForeignKey,
Expand Down Expand Up @@ -57,3 +58,7 @@ class UserAttribute(Model, AuditMixinNullable):
# Stamped when the account is disabled, so outstanding sessions terminate
# regardless of the session backend. NULL means "never invalidated".
sessions_invalidated_at = Column(DateTime, nullable=True, index=True)
# When True, the user must change their password before they can use the
# rest of the app (enforced by the before-request hook in
# superset.security.password_change when ENABLE_FORCE_PASSWORD_CHANGE is on).
password_must_change = Column(Boolean, nullable=False, default=False)
45 changes: 44 additions & 1 deletion superset/security/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from collections import defaultdict
from math import ceil
from types import SimpleNamespace
from typing import Any, Callable, cast, NamedTuple, Optional, TYPE_CHECKING
from typing import Any, Callable, cast, NamedTuple, Optional, TYPE_CHECKING, Union

from flask import current_app, Flask, g, Request
from flask_appbuilder import Model
Expand Down Expand Up @@ -640,6 +640,49 @@ def create_login_manager(self, app: Flask) -> LoginManager:
lm.request_loader(self.request_loader)
return lm

def reset_password(self, userid: Union[int, str], password: str) -> None:
"""Reset a user's password, clearing the forced-change flag only on a
self-service reset.

Both the self-service reset (``ResetMyPasswordView``) and the admin
"Reset Password" action (``ResetPasswordView``) route through this
method. The forced-password-change flag must only be cleared when the
user resets *their own* password — an admin-initiated reset sets a
temporary password and must preserve the "must change at next login"
requirement, otherwise the first-use lifecycle would be silently
bypassed. We distinguish the two by comparing the acting user
(``g.user``) against the target ``userid``: they match for a
self-service reset and differ for an admin reset.
"""
super().reset_password(userid, password)

acting_user = getattr(g, "user", None)
acting_user_id = getattr(acting_user, "id", None)
# ``userid`` arrives as a string (the ``pk`` request arg) on the admin
# path, so coerce both sides before comparing.
is_self_service = acting_user_id is not None and self._same_user(
acting_user_id, userid
)
if is_self_service:
from superset.security.password_change import (
clear_password_must_change,
)

clear_password_must_change(int(userid))

@staticmethod
def _same_user(left: Any, right: Any) -> bool:
"""Return True if two user identifiers refer to the same user.

Identifiers may be ints or numeric strings (FAB passes the admin-reset
target as a ``pk`` request arg string), so compare them as integers and
fall back to a string comparison if coercion fails.
"""
try:
return int(left) == int(right)
except (TypeError, ValueError):
return str(left) == str(right)

def on_user_login(self, user: Any) -> None:
# pylint: disable=import-outside-toplevel
from superset.security.session_invalidation import stamp_login_time
Expand Down
211 changes: 211 additions & 0 deletions superset/security/password_change.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""Force-password-change-on-first-use enforcement.

A per-user ``password_must_change`` flag (on ``UserAttribute``) marks accounts —
typically created by an administrator — that must set a new password before
they can use the rest of the application. When ``ENABLE_FORCE_PASSWORD_CHANGE``
is enabled, a ``before_request`` hook redirects such users to the password-reset
page until they change it; the flag is cleared automatically on a successful
*self-service* password reset (see ``SupersetSecurityManager.reset_password``).
An admin-initiated reset deliberately preserves the flag so the target user is
still forced to change the temporary password at next login.
"""

from __future__ import annotations

import logging
from typing import Any, Optional

from flask import current_app, flash, g, redirect, request, url_for
from flask_babel import gettext as __
from sqlalchemy.exc import IntegrityError

from superset.utils.decorators import transaction

logger = logging.getLogger(__name__)

# Flask endpoints take the form ``<ViewClass>.<method>`` (or a bare name for
# function views). The following must remain reachable while a password change
# is pending, otherwise the redirect would loop: the auth views (login/logout
# for every auth backend), the password-reset and user-info-edit views, static
# assets, and the health check. We match the *view-class* component (the part
# before the dot) exactly against the allow-list below rather than doing a
# substring search, so unrelated endpoints that merely share a substring (e.g.
# an "Author"-named view, or any name containing "health"/"static") are not
# accidentally exempted from enforcement.
_EXEMPT_VIEW_CLASSES = frozenset(
{
"AuthDBView",
"AuthLDAPView",
"AuthOAuthView",
"AuthOIDView",
"AuthRemoteUserView",
"ResetMyPasswordView",
"ResetPasswordView",
"UserInfoEditView",
}
)

# Exact endpoint names (function views / Flask built-ins) that are always exempt.
_EXEMPT_ENDPOINTS = frozenset({"static", "appbuilder.static", "health", "healthcheck"})


def _get_user_attribute(user_id: int) -> Optional[Any]:
# Imported lazily to avoid import cycles at app-init time.
from superset.extensions import db
from superset.models.user_attributes import UserAttribute

# ``user_attribute.user_id`` carries a unique constraint, but databases
# migrated from before the constraint existed could contain duplicate rows.
# ``.one_or_none()`` would raise ``MultipleResultsFound`` (a 500) in that
# case; fetch deterministically by ordering on the primary key and taking
# the first row instead.
return (
db.session.query(UserAttribute)
.filter(UserAttribute.user_id == user_id)
.order_by(UserAttribute.id)
.first()
)
Comment thread
rusackas marked this conversation as resolved.


def password_change_required(user: Any) -> bool:
"""Return True if ``user`` has a pending forced password change."""
user_id = getattr(user, "id", None)
if not user_id:
return False
attr = _get_user_attribute(user_id)
return bool(attr and attr.password_must_change)


@transaction()
def set_password_must_change(user_id: int, value: bool = True) -> None:
"""Set (or clear) the forced-password-change flag for a user.

Intended to be called by administrative flows when provisioning an account
that should require a password change on first use.
"""
from superset.extensions import db
from superset.models.user_attributes import UserAttribute

attr = _get_user_attribute(user_id)
if attr is None:
# ``user_attribute.user_id`` carries a unique constraint, so a
# concurrent call for the same user can win the insert between our
# read and flush. Insert in a nested transaction and, on conflict,
# fall through to update the row the winner created (mirroring the
# upsert in ``superset.security.session_invalidation``).
try:
with db.session.begin_nested():
db.session.add(
UserAttribute(user_id=user_id, password_must_change=value)
)
return
except IntegrityError:
attr = _get_user_attribute(user_id)
if attr is None: # pragma: no cover - the conflicting row vanished
raise
attr.password_must_change = value
Comment thread
rusackas marked this conversation as resolved.


@transaction()
def clear_password_must_change(user_id: int) -> None:
"""Clear the forced-password-change flag for a user, if set."""
attr = _get_user_attribute(user_id)
if attr and attr.password_must_change:
attr.password_must_change = False


def _is_exempt_endpoint(endpoint: Optional[str]) -> bool:
# A missing endpoint (e.g. an unmatched URL) is left to normal 404 handling.
if not endpoint:
return True
if endpoint in _EXEMPT_ENDPOINTS:
return True
# Any blueprint's static route, e.g. "<blueprint>.static".
if endpoint.endswith(".static"):
return True
# Match the view-class component exactly, so e.g. "AuthDBView.login" is
# exempt but an unrelated "AuthorView.list" is not.
view_class = endpoint.split(".", 1)[0]
return view_class in _EXEMPT_VIEW_CLASSES


def register_password_change_enforcement(app: Any) -> None:
"""Register the before-request hook that enforces pending password changes.

No-op unless ``ENABLE_FORCE_PASSWORD_CHANGE`` is enabled, so there is zero
per-request overhead in the default configuration.
"""

@app.before_request
def _enforce_password_change() -> Any: # pylint: disable=unused-variable
Comment thread
rusackas marked this conversation as resolved.
"""Redirect flagged users to the password-reset page.

Returns ``None`` (request proceeds) for anonymous users, exempt
endpoints, and users without a pending change; otherwise returns a
redirect to an exempt target (or an error response if none resolves).
"""
if not current_app.config.get("ENABLE_FORCE_PASSWORD_CHANGE"):
return None

user = getattr(g, "user", None)
if not user or getattr(user, "is_anonymous", True):
return None

if _is_exempt_endpoint(request.endpoint):
return None

if not password_change_required(user):
return None

flash(__("You must change your password before continuing."), "warning")
# Resolve the password-reset page. If that endpoint can't be resolved
# (e.g. a custom security manager without ``ResetMyPasswordView``), fall
# back to logout, which is always exempt from this enforcement. The
# logout endpoint is derived from the *registered* auth view so the
# fallback works for non-DB auth backends (LDAP, OAuth, remote-user)
# too, with ``AuthDBView.logout`` as a last resort. We must NOT fall
# back to "/" or any other non-exempt route: the index re-runs this
# same hook and would trap the user in an infinite 302 loop. If no
# exempt target can be resolved at all, return an error response rather
# than redirect, so a flagged user can never get stuck looping.
candidates = ["ResetMyPasswordView.this_form_get"]
auth_view = getattr(
getattr(getattr(current_app, "appbuilder", None), "sm", None),
"auth_view",
None,
)
# Only redirect to the registered auth view's logout if that view is
# itself exempt from this hook; otherwise the redirect would loop.
if (
auth_view is not None
and getattr(auth_view, "endpoint", None) in _EXEMPT_VIEW_CLASSES
):
candidates.append(f"{auth_view.endpoint}.logout")
candidates.append("AuthDBView.logout")
for endpoint in candidates:
try:
return redirect(url_for(endpoint))
except Exception: # noqa: BLE001, S112 # pylint: disable=broad-except
# Try the next exempt fallback; a failed url_for resolution here
# is expected/benign and not worth logging per attempt.
continue
return (
__("You must change your password before continuing."),
503,
)
Loading
Loading