Skip to content

Fix: Add session rollback to FAB find_user on error to prevent invali… #61374

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

Merged
vincbeck merged 4 commits into from
Feb 5, 2026
Merged

Fix: Add session rollback to FAB find_user on error to prevent invali… #61374

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf38f17
Fix: Add session rollback to FAB find_user on error to prevent invali…
Feb 3, 2026
f4a4994
Merge remote-tracking branch 'origin/main'
Feb 5, 2026
24052d6
fix
Feb 5, 2026
9061c2c
Merge branch 'main' into fix1
MonsterChenzhuo Feb 5, 2026
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
8 changes: 8 additions & 0 deletions providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,11 +1457,19 @@ def find_user(self, username=None, email=None) -> User | None:
).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:
Expand Down