Skip to content

Commit cc1a000

Browse files
authored
Werkzeug Version Check (apache#56398)
* Added feature detection in werkzeug fab providers to allow detecting hashing algorithms available to different versions of werkzeug * Using Version check as done by the upstream FAB provider * Removing used var * Adding missing importlib import
1 parent 5730c43 commit cc1a000

File tree

1 file changed

+3
-4
lines changed
  • providers/fab/src/airflow/providers/fab/auth_manager/security_manager

1 file changed

+3
-4
lines changed

providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import copy
2121
import datetime
22+
import importlib
2223
import itertools
2324
import logging
2425
import uuid
@@ -59,6 +60,7 @@
5960
from flask_login import LoginManager
6061
from itsdangerous import want_bytes
6162
from markupsafe import Markup, escape
63+
from packaging.version import Version
6264
from sqlalchemy import delete, func, inspect, or_, select
6365
from sqlalchemy.exc import MultipleResultsFound
6466
from sqlalchemy.orm import joinedload
@@ -790,10 +792,7 @@ def _init_config(self):
790792
current_app.config.setdefault("AUTH_ROLES_SYNC_AT_LOGIN", False)
791793
current_app.config.setdefault("AUTH_API_LOGIN_ALLOW_MULTIPLE_PROVIDERS", False)
792794

793-
from packaging.version import Version
794-
from werkzeug import __version__ as werkzeug_version
795-
796-
parsed_werkzeug_version = Version(werkzeug_version)
795+
parsed_werkzeug_version = Version(importlib.metadata.version("werkzeug"))
797796
if parsed_werkzeug_version < Version("3.0.0"):
798797
current_app.config.setdefault("FAB_PASSWORD_HASH_METHOD", "pbkdf2:sha256")
799798
current_app.config.setdefault(

0 commit comments

Comments
 (0)