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 0e66a216e27 Fix: Add session rollback to FAB find_user on error to
prevent invali… (#61374)
0e66a216e27 is described below
commit 0e66a216e27c15019ec0d2641a62533a438d9427
Author: monster <[email protected]>
AuthorDate: Thu Feb 5 23:17:10 2026 +0800
Fix: Add session rollback to FAB find_user on error to prevent invali…
(#61374)
---
.../providers/fab/auth_manager/security_manager/override.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git
a/providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
b/providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
index 4a97b5d1043..4c7897093ca 100644
---
a/providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
+++
b/providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
@@ -1457,11 +1457,19 @@ class
FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
).one_or_none()
except MultipleResultsFound:
log.error("Multiple results found for user %s", username)
+ except Exception as e:
+ log.error("Error finding user %s: %s", username, e)
+ self.session.rollback()
+ return None
elif email:
try:
return
self.session.scalars(select(self.user_model).filter_by(email=email)).one_or_none()
except MultipleResultsFound:
log.error("Multiple results found for user with email %s",
email)
+ except Exception as e:
+ log.error("Error finding user with email %s: %s", email, e)
+ self.session.rollback()
+ return None
return None
def update_user(self, user: User) -> bool:
