Skip to content

[v3-1-test] Fix race condition in auth manager initialization (#62431)#62995

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 1 commit into from
Mar 9, 2026
Merged

[v3-1-test] Fix race condition in auth manager initialization (#62431) #62995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions airflow-core/src/airflow/api_fastapi/app.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
from __future__ import annotations

import logging
import threading
from contextlib import AsyncExitStack, asynccontextmanager
from functools import cache
from typing import TYPE_CHECKING, cast
Expand DownExpand Up@@ -68,6 +69,7 @@ def get_cookie_path() -> str:

class _AuthManagerState:
instance: BaseAuthManager | None = None
_lock = threading.Lock()


@asynccontextmanager
Expand DownExpand Up@@ -148,9 +150,13 @@ def get_auth_manager_cls() -> type[BaseAuthManager]:


def create_auth_manager() -> BaseAuthManager:
"""Create the auth manager."""
"""Create the auth manager, cached as a thread-safe singleton."""
auth_manager_cls = get_auth_manager_cls()
_AuthManagerState.instance = auth_manager_cls()
if _AuthManagerState.instance is not None and isinstance(_AuthManagerState.instance, auth_manager_cls):
return _AuthManagerState.instance
with _AuthManagerState._lock:
if _AuthManagerState.instance is None or not isinstance(_AuthManagerState.instance, auth_manager_cls):
_AuthManagerState.instance = auth_manager_cls()
return _AuthManagerState.instance


Expand Down
35 changes: 35 additions & 0 deletions airflow-core/tests/unit/api_fastapi/test_app.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import threading
from unittest import mock

import pytest
Expand DownExpand Up@@ -140,3 +141,37 @@ def test_nested_subpath(self):
"""When base_url contains a nested subpath, get_cookie_path() should return it."""
with mock.patch.object(app_module, "API_ROOT_PATH", "/org/team-a/airflow/"):
assert app_module.get_cookie_path() == "/org/team-a/airflow/"


def test_create_auth_manager_thread_safety():
"""Concurrent calls to create_auth_manager must return the same singleton instance."""
call_count = 0
singleton = None

class FakeAuthManager:
def __init__(self):
nonlocal call_count, singleton
call_count += 1
singleton = self

app_module.purge_cached_app()

results = []
barrier = threading.Barrier(10)

def call_create_auth_manager():
barrier.wait()
results.append(app_module.create_auth_manager())

with mock.patch.object(app_module, "get_auth_manager_cls", return_value=FakeAuthManager):
threads = [threading.Thread(target=call_create_auth_manager) for _ in range(10)]
for t in threads:
t.start()
for t in threads:
t.join()

assert len(results) == 10
assert all(r is singleton for r in results)
assert call_count == 1

app_module.purge_cached_app()
33 changes: 20 additions & 13 deletions providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
from __future__ import annotations

import logging
import threading
from functools import reduce
from typing import TYPE_CHECKING

Expand DownExpand Up@@ -57,6 +58,8 @@
# This module contains code imported from FlaskAppbuilder, so lets use _its_ logger name
log = logging.getLogger("flask_appbuilder.base")

_init_app_lock = threading.Lock()


def dynamic_class_import(class_path):
"""
Expand DownExpand Up@@ -197,19 +200,23 @@ def init_app(self, app, session):
self._addon_managers = app.config["ADDON_MANAGERS"]
self.session = session
auth_manager = create_auth_manager()
auth_manager.appbuilder = self
if hasattr(auth_manager, "init_flask_resources"):
auth_manager.init_flask_resources()
if hasattr(auth_manager, "security_manager"):
self.sm = auth_manager.security_manager
else:
self.sm = AirflowSecurityManagerV2(self)
self.bm = BabelManager(self)
self._add_global_static()
self._add_global_filters()
app.before_request(self.sm.before_request)
self._add_admin_views()
self._add_addon_views()
with _init_app_lock:
auth_manager.appbuilder = self
# Invalidate cached security_manager so it binds to the current Flask app.
if "security_manager" in auth_manager.__dict__:
del auth_manager.__dict__["security_manager"]
if hasattr(auth_manager, "init_flask_resources"):
auth_manager.init_flask_resources()
if hasattr(auth_manager, "security_manager"):
self.sm = auth_manager.security_manager
else:
self.sm = AirflowSecurityManagerV2(self)
self.bm = BabelManager(self)
self._add_global_static()
self._add_global_filters()
app.before_request(self.sm.before_request)
self._add_admin_views()
self._add_addon_views()
self._init_extension(app)
self._swap_url_filter()

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[v3-1-test] Fix race condition in auth manager initialization (#62431) by vincbeck · Pull Request #62995 · apache/airflow · GitHub
Skip to content
[v3-1-test] Fix race condition in auth manager initialization (#62431)#62995

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 1 commit into

from

Mar 9, 2026
 Merged


[v3-1-test] Fix race condition in auth manager initialization (#62431)
#62995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
airflow-core/src/airflow/api_fastapi/app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
from __future__ import annotations

import logging
import threading
from contextlib import AsyncExitStack, asynccontextmanager
from functools import cache
from typing import TYPE_CHECKING, cast
Expand DownExpand Up@@ -68,6 +69,7 @@ def get_cookie_path() -> str:

class _AuthManagerState:
 instance: BaseAuthManager | None = None
 _lock = threading.Lock()


@asynccontextmanager
Expand DownExpand Up@@ -148,9 +150,13 @@ def get_auth_manager_cls() -> type[BaseAuthManager]:


def create_auth_manager() -> BaseAuthManager:
 """Create the auth manager."""
 """Create the auth manager, cached as a thread-safe singleton."""
 auth_manager_cls = get_auth_manager_cls()
 _AuthManagerState.instance = auth_manager_cls()
 if _AuthManagerState.instance is not None and isinstance(_AuthManagerState.instance, auth_manager_cls):
 return _AuthManagerState.instance
 with _AuthManagerState._lock:
 if _AuthManagerState.instance is None or not isinstance(_AuthManagerState.instance, auth_manager_cls):
 _AuthManagerState.instance = auth_manager_cls()
 return _AuthManagerState.instance


Expand Down

35 changes: 35 additions & 0 deletions
airflow-core/tests/unit/api_fastapi/test_app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import threading
from unittest import mock

import pytest
Expand DownExpand Up@@ -140,3 +141,37 @@ def test_nested_subpath(self):
 """When base_url contains a nested subpath, get_cookie_path() should return it."""
 with mock.patch.object(app_module, "API_ROOT_PATH", "/org/team-a/airflow/"):
 assert app_module.get_cookie_path() == "/org/team-a/airflow/"


def test_create_auth_manager_thread_safety():
 """Concurrent calls to create_auth_manager must return the same singleton instance."""
 call_count = 0
 singleton = None

 class FakeAuthManager:
 def __init__(self):
 nonlocal call_count, singleton
 call_count += 1
 singleton = self

 app_module.purge_cached_app()

 results = []
 barrier = threading.Barrier(10)

 def call_create_auth_manager():
 barrier.wait()
 results.append(app_module.create_auth_manager())

 with mock.patch.object(app_module, "get_auth_manager_cls", return_value=FakeAuthManager):
 threads = [threading.Thread(target=call_create_auth_manager) for _ in range(10)]
 for t in threads:
 t.start()
 for t in threads:
 t.join()

 assert len(results) == 10
 assert all(r is singleton for r in results)
 assert call_count == 1

 app_module.purge_cached_app()

33 changes: 20 additions & 13 deletions
providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
from __future__ import annotations

import logging
import threading
from functools import reduce
from typing import TYPE_CHECKING

Expand DownExpand Up@@ -57,6 +58,8 @@
# This module contains code imported from FlaskAppbuilder, so lets use _its_ logger name
log = logging.getLogger("flask_appbuilder.base")

_init_app_lock = threading.Lock()


def dynamic_class_import(class_path):
 """
Expand DownExpand Up@@ -197,19 +200,23 @@ def init_app(self, app, session):
 self._addon_managers = app.config["ADDON_MANAGERS"]
 self.session = session
 auth_manager = create_auth_manager()
 auth_manager.appbuilder = self
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 with _init_app_lock:
 auth_manager.appbuilder = self
 # Invalidate cached security_manager so it binds to the current Flask app.
 if "security_manager" in auth_manager.__dict__:
 del auth_manager.__dict__["security_manager"]
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 self._init_extension(app)
 self._swap_url_filter()

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[v3-1-test] Fix race condition in auth manager initialization (#62431) by vincbeck · Pull Request #62995 · apache/airflow · GitHub
Skip to content
[v3-1-test] Fix race condition in auth manager initialization (#62431)#62995

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 1 commit into

from

Mar 9, 2026
 Merged


[v3-1-test] Fix race condition in auth manager initialization (#62431)
#62995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
airflow-core/src/airflow/api_fastapi/app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
from __future__ import annotations

import logging
import threading
from contextlib import AsyncExitStack, asynccontextmanager
from functools import cache
from typing import TYPE_CHECKING, cast
Expand DownExpand Up@@ -68,6 +69,7 @@ def get_cookie_path() -> str:

class _AuthManagerState:
 instance: BaseAuthManager | None = None
 _lock = threading.Lock()


@asynccontextmanager
Expand DownExpand Up@@ -148,9 +150,13 @@ def get_auth_manager_cls() -> type[BaseAuthManager]:


def create_auth_manager() -> BaseAuthManager:
 """Create the auth manager."""
 """Create the auth manager, cached as a thread-safe singleton."""
 auth_manager_cls = get_auth_manager_cls()
 _AuthManagerState.instance = auth_manager_cls()
 if _AuthManagerState.instance is not None and isinstance(_AuthManagerState.instance, auth_manager_cls):
 return _AuthManagerState.instance
 with _AuthManagerState._lock:
 if _AuthManagerState.instance is None or not isinstance(_AuthManagerState.instance, auth_manager_cls):
 _AuthManagerState.instance = auth_manager_cls()
 return _AuthManagerState.instance


Expand Down

35 changes: 35 additions & 0 deletions
airflow-core/tests/unit/api_fastapi/test_app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import threading
from unittest import mock

import pytest
Expand DownExpand Up@@ -140,3 +141,37 @@ def test_nested_subpath(self):
 """When base_url contains a nested subpath, get_cookie_path() should return it."""
 with mock.patch.object(app_module, "API_ROOT_PATH", "/org/team-a/airflow/"):
 assert app_module.get_cookie_path() == "/org/team-a/airflow/"


def test_create_auth_manager_thread_safety():
 """Concurrent calls to create_auth_manager must return the same singleton instance."""
 call_count = 0
 singleton = None

 class FakeAuthManager:
 def __init__(self):
 nonlocal call_count, singleton
 call_count += 1
 singleton = self

 app_module.purge_cached_app()

 results = []
 barrier = threading.Barrier(10)

 def call_create_auth_manager():
 barrier.wait()
 results.append(app_module.create_auth_manager())

 with mock.patch.object(app_module, "get_auth_manager_cls", return_value=FakeAuthManager):
 threads = [threading.Thread(target=call_create_auth_manager) for _ in range(10)]
 for t in threads:
 t.start()
 for t in threads:
 t.join()

 assert len(results) == 10
 assert all(r is singleton for r in results)
 assert call_count == 1

 app_module.purge_cached_app()

33 changes: 20 additions & 13 deletions
providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
from __future__ import annotations

import logging
import threading
from functools import reduce
from typing import TYPE_CHECKING

Expand DownExpand Up@@ -57,6 +58,8 @@
# This module contains code imported from FlaskAppbuilder, so lets use _its_ logger name
log = logging.getLogger("flask_appbuilder.base")

_init_app_lock = threading.Lock()


def dynamic_class_import(class_path):
 """
Expand DownExpand Up@@ -197,19 +200,23 @@ def init_app(self, app, session):
 self._addon_managers = app.config["ADDON_MANAGERS"]
 self.session = session
 auth_manager = create_auth_manager()
 auth_manager.appbuilder = self
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 with _init_app_lock:
 auth_manager.appbuilder = self
 # Invalidate cached security_manager so it binds to the current Flask app.
 if "security_manager" in auth_manager.__dict__:
 del auth_manager.__dict__["security_manager"]
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 self._init_extension(app)
 self._swap_url_filter()

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[v3-1-test] Fix race condition in auth manager initialization (#62431) by vincbeck · Pull Request #62995 · apache/airflow · GitHub
Skip to content
[v3-1-test] Fix race condition in auth manager initialization (#62431)#62995

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 1 commit into

from

Mar 9, 2026
 Merged


[v3-1-test] Fix race condition in auth manager initialization (#62431)
#62995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
airflow-core/src/airflow/api_fastapi/app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
from __future__ import annotations

import logging
import threading
from contextlib import AsyncExitStack, asynccontextmanager
from functools import cache
from typing import TYPE_CHECKING, cast
Expand DownExpand Up@@ -68,6 +69,7 @@ def get_cookie_path() -> str:

class _AuthManagerState:
 instance: BaseAuthManager | None = None
 _lock = threading.Lock()


@asynccontextmanager
Expand DownExpand Up@@ -148,9 +150,13 @@ def get_auth_manager_cls() -> type[BaseAuthManager]:


def create_auth_manager() -> BaseAuthManager:
 """Create the auth manager."""
 """Create the auth manager, cached as a thread-safe singleton."""
 auth_manager_cls = get_auth_manager_cls()
 _AuthManagerState.instance = auth_manager_cls()
 if _AuthManagerState.instance is not None and isinstance(_AuthManagerState.instance, auth_manager_cls):
 return _AuthManagerState.instance
 with _AuthManagerState._lock:
 if _AuthManagerState.instance is None or not isinstance(_AuthManagerState.instance, auth_manager_cls):
 _AuthManagerState.instance = auth_manager_cls()
 return _AuthManagerState.instance


Expand Down

35 changes: 35 additions & 0 deletions
airflow-core/tests/unit/api_fastapi/test_app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import threading
from unittest import mock

import pytest
Expand DownExpand Up@@ -140,3 +141,37 @@ def test_nested_subpath(self):
 """When base_url contains a nested subpath, get_cookie_path() should return it."""
 with mock.patch.object(app_module, "API_ROOT_PATH", "/org/team-a/airflow/"):
 assert app_module.get_cookie_path() == "/org/team-a/airflow/"


def test_create_auth_manager_thread_safety():
 """Concurrent calls to create_auth_manager must return the same singleton instance."""
 call_count = 0
 singleton = None

 class FakeAuthManager:
 def __init__(self):
 nonlocal call_count, singleton
 call_count += 1
 singleton = self

 app_module.purge_cached_app()

 results = []
 barrier = threading.Barrier(10)

 def call_create_auth_manager():
 barrier.wait()
 results.append(app_module.create_auth_manager())

 with mock.patch.object(app_module, "get_auth_manager_cls", return_value=FakeAuthManager):
 threads = [threading.Thread(target=call_create_auth_manager) for _ in range(10)]
 for t in threads:
 t.start()
 for t in threads:
 t.join()

 assert len(results) == 10
 assert all(r is singleton for r in results)
 assert call_count == 1

 app_module.purge_cached_app()

33 changes: 20 additions & 13 deletions
providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
from __future__ import annotations

import logging
import threading
from functools import reduce
from typing import TYPE_CHECKING

Expand DownExpand Up@@ -57,6 +58,8 @@
# This module contains code imported from FlaskAppbuilder, so lets use _its_ logger name
log = logging.getLogger("flask_appbuilder.base")

_init_app_lock = threading.Lock()


def dynamic_class_import(class_path):
 """
Expand DownExpand Up@@ -197,19 +200,23 @@ def init_app(self, app, session):
 self._addon_managers = app.config["ADDON_MANAGERS"]
 self.session = session
 auth_manager = create_auth_manager()
 auth_manager.appbuilder = self
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 with _init_app_lock:
 auth_manager.appbuilder = self
 # Invalidate cached security_manager so it binds to the current Flask app.
 if "security_manager" in auth_manager.__dict__:
 del auth_manager.__dict__["security_manager"]
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 self._init_extension(app)
 self._swap_url_filter()

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[v3-1-test] Fix race condition in auth manager initialization (#62431) by vincbeck · Pull Request #62995 · apache/airflow · GitHub
Skip to content
[v3-1-test] Fix race condition in auth manager initialization (#62431)#62995

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 1 commit into

from

Mar 9, 2026
 Merged


[v3-1-test] Fix race condition in auth manager initialization (#62431)
#62995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
airflow-core/src/airflow/api_fastapi/app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
from __future__ import annotations

import logging
import threading
from contextlib import AsyncExitStack, asynccontextmanager
from functools import cache
from typing import TYPE_CHECKING, cast
Expand DownExpand Up@@ -68,6 +69,7 @@ def get_cookie_path() -> str:

class _AuthManagerState:
 instance: BaseAuthManager | None = None
 _lock = threading.Lock()


@asynccontextmanager
Expand DownExpand Up@@ -148,9 +150,13 @@ def get_auth_manager_cls() -> type[BaseAuthManager]:


def create_auth_manager() -> BaseAuthManager:
 """Create the auth manager."""
 """Create the auth manager, cached as a thread-safe singleton."""
 auth_manager_cls = get_auth_manager_cls()
 _AuthManagerState.instance = auth_manager_cls()
 if _AuthManagerState.instance is not None and isinstance(_AuthManagerState.instance, auth_manager_cls):
 return _AuthManagerState.instance
 with _AuthManagerState._lock:
 if _AuthManagerState.instance is None or not isinstance(_AuthManagerState.instance, auth_manager_cls):
 _AuthManagerState.instance = auth_manager_cls()
 return _AuthManagerState.instance


Expand Down

35 changes: 35 additions & 0 deletions
airflow-core/tests/unit/api_fastapi/test_app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import threading
from unittest import mock

import pytest
Expand DownExpand Up@@ -140,3 +141,37 @@ def test_nested_subpath(self):
 """When base_url contains a nested subpath, get_cookie_path() should return it."""
 with mock.patch.object(app_module, "API_ROOT_PATH", "/org/team-a/airflow/"):
 assert app_module.get_cookie_path() == "/org/team-a/airflow/"


def test_create_auth_manager_thread_safety():
 """Concurrent calls to create_auth_manager must return the same singleton instance."""
 call_count = 0
 singleton = None

 class FakeAuthManager:
 def __init__(self):
 nonlocal call_count, singleton
 call_count += 1
 singleton = self

 app_module.purge_cached_app()

 results = []
 barrier = threading.Barrier(10)

 def call_create_auth_manager():
 barrier.wait()
 results.append(app_module.create_auth_manager())

 with mock.patch.object(app_module, "get_auth_manager_cls", return_value=FakeAuthManager):
 threads = [threading.Thread(target=call_create_auth_manager) for _ in range(10)]
 for t in threads:
 t.start()
 for t in threads:
 t.join()

 assert len(results) == 10
 assert all(r is singleton for r in results)
 assert call_count == 1

 app_module.purge_cached_app()

33 changes: 20 additions & 13 deletions
providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
from __future__ import annotations

import logging
import threading
from functools import reduce
from typing import TYPE_CHECKING

Expand DownExpand Up@@ -57,6 +58,8 @@
# This module contains code imported from FlaskAppbuilder, so lets use _its_ logger name
log = logging.getLogger("flask_appbuilder.base")

_init_app_lock = threading.Lock()


def dynamic_class_import(class_path):
 """
Expand DownExpand Up@@ -197,19 +200,23 @@ def init_app(self, app, session):
 self._addon_managers = app.config["ADDON_MANAGERS"]
 self.session = session
 auth_manager = create_auth_manager()
 auth_manager.appbuilder = self
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 with _init_app_lock:
 auth_manager.appbuilder = self
 # Invalidate cached security_manager so it binds to the current Flask app.
 if "security_manager" in auth_manager.__dict__:
 del auth_manager.__dict__["security_manager"]
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 self._init_extension(app)
 self._swap_url_filter()

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[v3-1-test] Fix race condition in auth manager initialization (#62431) by vincbeck · Pull Request #62995 · apache/airflow · GitHub
Skip to content
[v3-1-test] Fix race condition in auth manager initialization (#62431)#62995

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 1 commit into

from

Mar 9, 2026
 Merged


[v3-1-test] Fix race condition in auth manager initialization (#62431)
#62995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
airflow-core/src/airflow/api_fastapi/app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
from __future__ import annotations

import logging
import threading
from contextlib import AsyncExitStack, asynccontextmanager
from functools import cache
from typing import TYPE_CHECKING, cast
Expand DownExpand Up@@ -68,6 +69,7 @@ def get_cookie_path() -> str:

class _AuthManagerState:
 instance: BaseAuthManager | None = None
 _lock = threading.Lock()


@asynccontextmanager
Expand DownExpand Up@@ -148,9 +150,13 @@ def get_auth_manager_cls() -> type[BaseAuthManager]:


def create_auth_manager() -> BaseAuthManager:
 """Create the auth manager."""
 """Create the auth manager, cached as a thread-safe singleton."""
 auth_manager_cls = get_auth_manager_cls()
 _AuthManagerState.instance = auth_manager_cls()
 if _AuthManagerState.instance is not None and isinstance(_AuthManagerState.instance, auth_manager_cls):
 return _AuthManagerState.instance
 with _AuthManagerState._lock:
 if _AuthManagerState.instance is None or not isinstance(_AuthManagerState.instance, auth_manager_cls):
 _AuthManagerState.instance = auth_manager_cls()
 return _AuthManagerState.instance


Expand Down

35 changes: 35 additions & 0 deletions
airflow-core/tests/unit/api_fastapi/test_app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import threading
from unittest import mock

import pytest
Expand DownExpand Up@@ -140,3 +141,37 @@ def test_nested_subpath(self):
 """When base_url contains a nested subpath, get_cookie_path() should return it."""
 with mock.patch.object(app_module, "API_ROOT_PATH", "/org/team-a/airflow/"):
 assert app_module.get_cookie_path() == "/org/team-a/airflow/"


def test_create_auth_manager_thread_safety():
 """Concurrent calls to create_auth_manager must return the same singleton instance."""
 call_count = 0
 singleton = None

 class FakeAuthManager:
 def __init__(self):
 nonlocal call_count, singleton
 call_count += 1
 singleton = self

 app_module.purge_cached_app()

 results = []
 barrier = threading.Barrier(10)

 def call_create_auth_manager():
 barrier.wait()
 results.append(app_module.create_auth_manager())

 with mock.patch.object(app_module, "get_auth_manager_cls", return_value=FakeAuthManager):
 threads = [threading.Thread(target=call_create_auth_manager) for _ in range(10)]
 for t in threads:
 t.start()
 for t in threads:
 t.join()

 assert len(results) == 10
 assert all(r is singleton for r in results)
 assert call_count == 1

 app_module.purge_cached_app()

33 changes: 20 additions & 13 deletions
providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
from __future__ import annotations

import logging
import threading
from functools import reduce
from typing import TYPE_CHECKING

Expand DownExpand Up@@ -57,6 +58,8 @@
# This module contains code imported from FlaskAppbuilder, so lets use _its_ logger name
log = logging.getLogger("flask_appbuilder.base")

_init_app_lock = threading.Lock()


def dynamic_class_import(class_path):
 """
Expand DownExpand Up@@ -197,19 +200,23 @@ def init_app(self, app, session):
 self._addon_managers = app.config["ADDON_MANAGERS"]
 self.session = session
 auth_manager = create_auth_manager()
 auth_manager.appbuilder = self
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 with _init_app_lock:
 auth_manager.appbuilder = self
 # Invalidate cached security_manager so it binds to the current Flask app.
 if "security_manager" in auth_manager.__dict__:
 del auth_manager.__dict__["security_manager"]
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 self._init_extension(app)
 self._swap_url_filter()

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[v3-1-test] Fix race condition in auth manager initialization (#62431) by vincbeck · Pull Request #62995 · apache/airflow · GitHub
Skip to content
[v3-1-test] Fix race condition in auth manager initialization (#62431)#62995

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 1 commit into

from

Mar 9, 2026
 Merged


[v3-1-test] Fix race condition in auth manager initialization (#62431)
#62995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
airflow-core/src/airflow/api_fastapi/app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
from __future__ import annotations

import logging
import threading
from contextlib import AsyncExitStack, asynccontextmanager
from functools import cache
from typing import TYPE_CHECKING, cast
Expand DownExpand Up@@ -68,6 +69,7 @@ def get_cookie_path() -> str:

class _AuthManagerState:
 instance: BaseAuthManager | None = None
 _lock = threading.Lock()


@asynccontextmanager
Expand DownExpand Up@@ -148,9 +150,13 @@ def get_auth_manager_cls() -> type[BaseAuthManager]:


def create_auth_manager() -> BaseAuthManager:
 """Create the auth manager."""
 """Create the auth manager, cached as a thread-safe singleton."""
 auth_manager_cls = get_auth_manager_cls()
 _AuthManagerState.instance = auth_manager_cls()
 if _AuthManagerState.instance is not None and isinstance(_AuthManagerState.instance, auth_manager_cls):
 return _AuthManagerState.instance
 with _AuthManagerState._lock:
 if _AuthManagerState.instance is None or not isinstance(_AuthManagerState.instance, auth_manager_cls):
 _AuthManagerState.instance = auth_manager_cls()
 return _AuthManagerState.instance


Expand Down

35 changes: 35 additions & 0 deletions
airflow-core/tests/unit/api_fastapi/test_app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import threading
from unittest import mock

import pytest
Expand DownExpand Up@@ -140,3 +141,37 @@ def test_nested_subpath(self):
 """When base_url contains a nested subpath, get_cookie_path() should return it."""
 with mock.patch.object(app_module, "API_ROOT_PATH", "/org/team-a/airflow/"):
 assert app_module.get_cookie_path() == "/org/team-a/airflow/"


def test_create_auth_manager_thread_safety():
 """Concurrent calls to create_auth_manager must return the same singleton instance."""
 call_count = 0
 singleton = None

 class FakeAuthManager:
 def __init__(self):
 nonlocal call_count, singleton
 call_count += 1
 singleton = self

 app_module.purge_cached_app()

 results = []
 barrier = threading.Barrier(10)

 def call_create_auth_manager():
 barrier.wait()
 results.append(app_module.create_auth_manager())

 with mock.patch.object(app_module, "get_auth_manager_cls", return_value=FakeAuthManager):
 threads = [threading.Thread(target=call_create_auth_manager) for _ in range(10)]
 for t in threads:
 t.start()
 for t in threads:
 t.join()

 assert len(results) == 10
 assert all(r is singleton for r in results)
 assert call_count == 1

 app_module.purge_cached_app()

33 changes: 20 additions & 13 deletions
providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
from __future__ import annotations

import logging
import threading
from functools import reduce
from typing import TYPE_CHECKING

Expand DownExpand Up@@ -57,6 +58,8 @@
# This module contains code imported from FlaskAppbuilder, so lets use _its_ logger name
log = logging.getLogger("flask_appbuilder.base")

_init_app_lock = threading.Lock()


def dynamic_class_import(class_path):
 """
Expand DownExpand Up@@ -197,19 +200,23 @@ def init_app(self, app, session):
 self._addon_managers = app.config["ADDON_MANAGERS"]
 self.session = session
 auth_manager = create_auth_manager()
 auth_manager.appbuilder = self
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 with _init_app_lock:
 auth_manager.appbuilder = self
 # Invalidate cached security_manager so it binds to the current Flask app.
 if "security_manager" in auth_manager.__dict__:
 del auth_manager.__dict__["security_manager"]
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 self._init_extension(app)
 self._swap_url_filter()

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[v3-1-test] Fix race condition in auth manager initialization (#62431) by vincbeck · Pull Request #62995 · apache/airflow · GitHub
Skip to content
[v3-1-test] Fix race condition in auth manager initialization (#62431)#62995

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 1 commit into

from

Mar 9, 2026
 Merged


[v3-1-test] Fix race condition in auth manager initialization (#62431)
#62995
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
airflow-core/src/airflow/api_fastapi/app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
from __future__ import annotations

import logging
import threading
from contextlib import AsyncExitStack, asynccontextmanager
from functools import cache
from typing import TYPE_CHECKING, cast
Expand DownExpand Up@@ -68,6 +69,7 @@ def get_cookie_path() -> str:

class _AuthManagerState:
 instance: BaseAuthManager | None = None
 _lock = threading.Lock()


@asynccontextmanager
Expand DownExpand Up@@ -148,9 +150,13 @@ def get_auth_manager_cls() -> type[BaseAuthManager]:


def create_auth_manager() -> BaseAuthManager:
 """Create the auth manager."""
 """Create the auth manager, cached as a thread-safe singleton."""
 auth_manager_cls = get_auth_manager_cls()
 _AuthManagerState.instance = auth_manager_cls()
 if _AuthManagerState.instance is not None and isinstance(_AuthManagerState.instance, auth_manager_cls):
 return _AuthManagerState.instance
 with _AuthManagerState._lock:
 if _AuthManagerState.instance is None or not isinstance(_AuthManagerState.instance, auth_manager_cls):
 _AuthManagerState.instance = auth_manager_cls()
 return _AuthManagerState.instance


Expand Down

35 changes: 35 additions & 0 deletions
airflow-core/tests/unit/api_fastapi/test_app.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import threading
from unittest import mock

import pytest
Expand DownExpand Up@@ -140,3 +141,37 @@ def test_nested_subpath(self):
 """When base_url contains a nested subpath, get_cookie_path() should return it."""
 with mock.patch.object(app_module, "API_ROOT_PATH", "/org/team-a/airflow/"):
 assert app_module.get_cookie_path() == "/org/team-a/airflow/"


def test_create_auth_manager_thread_safety():
 """Concurrent calls to create_auth_manager must return the same singleton instance."""
 call_count = 0
 singleton = None

 class FakeAuthManager:
 def __init__(self):
 nonlocal call_count, singleton
 call_count += 1
 singleton = self

 app_module.purge_cached_app()

 results = []
 barrier = threading.Barrier(10)

 def call_create_auth_manager():
 barrier.wait()
 results.append(app_module.create_auth_manager())

 with mock.patch.object(app_module, "get_auth_manager_cls", return_value=FakeAuthManager):
 threads = [threading.Thread(target=call_create_auth_manager) for _ in range(10)]
 for t in threads:
 t.start()
 for t in threads:
 t.join()

 assert len(results) == 10
 assert all(r is singleton for r in results)
 assert call_count == 1

 app_module.purge_cached_app()

33 changes: 20 additions & 13 deletions
providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
from __future__ import annotations

import logging
import threading
from functools import reduce
from typing import TYPE_CHECKING

Expand DownExpand Up@@ -57,6 +58,8 @@
# This module contains code imported from FlaskAppbuilder, so lets use _its_ logger name
log = logging.getLogger("flask_appbuilder.base")

_init_app_lock = threading.Lock()


def dynamic_class_import(class_path):
 """
Expand DownExpand Up@@ -197,19 +200,23 @@ def init_app(self, app, session):
 self._addon_managers = app.config["ADDON_MANAGERS"]
 self.session = session
 auth_manager = create_auth_manager()
 auth_manager.appbuilder = self
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 with _init_app_lock:
 auth_manager.appbuilder = self
 # Invalidate cached security_manager so it binds to the current Flask app.
 if "security_manager" in auth_manager.__dict__:
 del auth_manager.__dict__["security_manager"]
 if hasattr(auth_manager, "init_flask_resources"):
 auth_manager.init_flask_resources()
 if hasattr(auth_manager, "security_manager"):
 self.sm = auth_manager.security_manager
 else:
 self.sm = AirflowSecurityManagerV2(self)
 self.bm = BabelManager(self)
 self._add_global_static()
 self._add_global_filters()
 app.before_request(self.sm.before_request)
 self._add_admin_views()
 self._add_addon_views()
 self._init_extension(app)
 self._swap_url_filter()

Expand Down
Loading