This is an automated email from the ASF dual-hosted git repository.

vincbeck pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 35b71f24ea4 Fix FAB PATCH users rejecting a user's own username 
(#77234)
35b71f24ea4 is described below

commit 35b71f24ea4e73d788fa7358e898440346dd59de
Author: ChickenBenny <[email protected]>
AuthorDate: Thu Nov 19 22:43:06 2026 +0800

    Fix FAB PATCH users rejecting a user's own username (#77234)
---
 .../fab/auth_manager/api_fastapi/services/users.py |  26 +++--
 .../api_fastapi/services/test_users.py             | 114 ++++++++++++++++++++-
 2 files changed, 124 insertions(+), 16 deletions(-)

diff --git 
a/providers/fab/src/airflow/providers/fab/auth_manager/api_fastapi/services/users.py
 
b/providers/fab/src/airflow/providers/fab/auth_manager/api_fastapi/services/users.py
index f8ad0e50aad..83a7cfc8c06 100644
--- 
a/providers/fab/src/airflow/providers/fab/auth_manager/api_fastapi/services/users.py
+++ 
b/providers/fab/src/airflow/providers/fab/auth_manager/api_fastapi/services/users.py
@@ -149,20 +149,6 @@ class FABAuthManagerUsers:
                 detail=f"The User with username `{username}` was not found",
             )
 
-        if body.username is not None and body.username != username:
-            if security_manager.find_user(username=body.username):
-                raise HTTPException(
-                    status_code=status.HTTP_409_CONFLICT,
-                    detail=f"The username `{body.username}` already exists",
-                )
-
-        if body.email is not None and body.email != user.email:
-            if security_manager.find_user(email=body.email):
-                raise HTTPException(
-                    status_code=status.HTTP_409_CONFLICT,
-                    detail=f"The email `{body.email}` already exists",
-                )
-
         all_fields = {"username", "email", "first_name", "last_name", "roles", 
"password"}
 
         if update_mask is not None:
@@ -176,6 +162,18 @@ class FABAuthManagerUsers:
         else:
             fields_to_update = all_fields
 
+        # The lookups can return this user itself, e.g. usernames match 
case-insensitively,
+        # so only a different user is a conflict.
+        for field in ("username", "email"):
+            value = getattr(body, field)
+            if field in fields_to_update and value is not None:
+                existing = security_manager.find_user(**{field: value})
+                if existing is not None and existing.id != user.id:
+                    raise HTTPException(
+                        status_code=status.HTTP_409_CONFLICT,
+                        detail=f"The {field} `{value}` already exists",
+                    )
+
         if "roles" in fields_to_update and body.roles is not None:
             roles_to_update, missing_role_names = 
cls._resolve_roles(security_manager, body.roles)
             if missing_role_names:
diff --git 
a/providers/fab/tests/unit/fab/auth_manager/api_fastapi/services/test_users.py 
b/providers/fab/tests/unit/fab/auth_manager/api_fastapi/services/test_users.py
index e9a5772e5e6..127dcdec97c 100644
--- 
a/providers/fab/tests/unit/fab/auth_manager/api_fastapi/services/test_users.py
+++ 
b/providers/fab/tests/unit/fab/auth_manager/api_fastapi/services/test_users.py
@@ -48,6 +48,7 @@ def security_manager():
 
 def _make_user_obj(
     *,
+    id: int = 1,
     username: str,
     email: str,
     first_name: str,
@@ -57,6 +58,7 @@ def _make_user_obj(
 ):
     role_objs = [types.SimpleNamespace(name=r) for r in (roles or [])]
     return types.SimpleNamespace(
+        id=id,
         username=username,
         email=email,
         first_name=first_name,
@@ -465,7 +467,10 @@ class TestUsersService:
             last_name="Liddell",
         )
 
-        security_manager.find_user.side_effect = [user_obj, object()]
+        other_user = _make_user_obj(
+            id=2, username="bob", email="[email protected]", first_name="Bob", 
last_name="Builder"
+        )
+        security_manager.find_user.side_effect = [user_obj, other_user]
         fab_auth_manager.security_manager = security_manager
         get_fab_auth_manager.return_value = fab_auth_manager
 
@@ -490,7 +495,10 @@ class TestUsersService:
             first_name="Alice",
             last_name="Liddell",
         )
-        security_manager.find_user.side_effect = [user_obj, object()]
+        other_user = _make_user_obj(
+            id=2, username="bob", email="[email protected]", first_name="Bob", 
last_name="Builder"
+        )
+        security_manager.find_user.side_effect = [user_obj, other_user]
         fab_auth_manager.security_manager = security_manager
         get_fab_auth_manager.return_value = fab_auth_manager
 
@@ -508,6 +516,108 @@ class TestUsersService:
         assert ex.value.status_code == 409
         assert "email" in ex.value.detail
 
+    @pytest.mark.parametrize(
+        ("field", "value"),
+        [
+            pytest.param("username", "Alice", 
id="username-differs-in-case-only"),
+            pytest.param("email", "[email protected]", 
id="email-differs-in-case-only"),
+        ],
+    )
+    def test_update_user_lookup_returning_the_same_user_is_not_a_conflict(
+        self, get_fab_auth_manager, fab_auth_manager, security_manager, field, 
value
+    ):
+        user_obj = _make_user_obj(
+            username="alice",
+            email="[email protected]",
+            first_name="Alice",
+            last_name="Liddell",
+        )
+        security_manager.find_user.return_value = user_obj
+        fab_auth_manager.security_manager = security_manager
+        get_fab_auth_manager.return_value = fab_auth_manager
+
+        patch_body = types.SimpleNamespace(
+            username=None,
+            email=None,
+            first_name=None,
+            last_name=None,
+            roles=None,
+            password=None,
+        )
+        setattr(patch_body, field, value)
+
+        out = FABAuthManagerUsers.update_user("alice", patch_body)
+
+        assert getattr(out, field) == value
+        security_manager.update_user.assert_called_once_with(user_obj)
+        security_manager.find_user.assert_any_call(**{field: value})
+
+    def test_update_user_ignores_conflicts_outside_the_update_mask(
+        self, get_fab_auth_manager, fab_auth_manager, security_manager
+    ):
+        user_obj = _make_user_obj(
+            username="alice",
+            email="[email protected]",
+            first_name="Alice",
+            last_name="Liddell",
+        )
+        other_user = _make_user_obj(
+            id=2, username="bob", email="[email protected]", first_name="Bob", 
last_name="Builder"
+        )
+        security_manager.find_user.side_effect = lambda username=None, 
email=None: (
+            user_obj if username == "alice" else other_user
+        )
+        fab_auth_manager.security_manager = security_manager
+        get_fab_auth_manager.return_value = fab_auth_manager
+
+        patch_body = types.SimpleNamespace(
+            username="bob",
+            email="[email protected]",
+            first_name="Alicia",
+            last_name=None,
+            roles=None,
+            password=None,
+        )
+
+        out = FABAuthManagerUsers.update_user("alice", patch_body, 
update_mask="first_name")
+
+        assert out.first_name == "Alicia"
+        assert out.username == "alice"
+        assert out.email == "[email protected]"
+        security_manager.find_user.assert_called_once_with(username="alice")
+
+    def test_update_user_rejects_unknown_update_mask_before_checking_conflicts(
+        self, get_fab_auth_manager, fab_auth_manager, security_manager
+    ):
+        user_obj = _make_user_obj(
+            username="alice",
+            email="[email protected]",
+            first_name="Alice",
+            last_name="Liddell",
+        )
+        other_user = _make_user_obj(
+            id=2, username="bob", email="[email protected]", first_name="Bob", 
last_name="Builder"
+        )
+        security_manager.find_user.side_effect = lambda username=None, 
email=None: (
+            user_obj if username == "alice" else other_user
+        )
+        fab_auth_manager.security_manager = security_manager
+        get_fab_auth_manager.return_value = fab_auth_manager
+
+        patch_body = types.SimpleNamespace(
+            username="bob",
+            email=None,
+            first_name=None,
+            last_name=None,
+            roles=None,
+            password=None,
+        )
+
+        with pytest.raises(HTTPException) as ex:
+            FABAuthManagerUsers.update_user("alice", patch_body, 
update_mask="nickname")
+        assert ex.value.status_code == 400
+        security_manager.find_user.assert_called_once_with(username="alice")
+
     def test_update_user_unknown_update_mask(self, get_fab_auth_manager, 
fab_auth_manager, security_manager):
         user_obj = _make_user_obj(
             username="alice",

Reply via email to