Skip to content

[providers-fab/v1-5] Use different default algorithms for different werkzeug versions (#46384) #46392

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
potiuk merged 2 commits into from
Feb 4, 2025
Merged

[providers-fab/v1-5] Use different default algorithms for different werkzeug versions (#46384) #46392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0194154
[providers-fab/v1-5] Use different default algorithms for different w…
potiuk Feb 3, 2025
8f16d38
Add evaluation extra to google-cloud-aiplatform (#46270)
potiuk Jan 30, 2025
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
3 changes: 2 additions & 1 deletion generated/provider_dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,8 @@
"google-api-python-client>=2.0.2",
"google-auth-httplib2>=0.0.1",
"google-auth>=2.29.0",
"google-cloud-aiplatform>=1.70.0",
"google-cloud-aiplatform[evaluation]>=1.73.0",
"google-cloud-alloydb>=0.4.0",
"google-cloud-automl>=2.12.0",
"google-cloud-batch>=0.13.0",
"google-cloud-bigquery-datatransfer>=3.13.0",
Expand Down
24 changes: 18 additions & 6 deletions providers/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 @@ -846,12 +846,24 @@ def _init_config(self):
app.config.setdefault("AUTH_ROLES_MAPPING", {})
app.config.setdefault("AUTH_ROLES_SYNC_AT_LOGIN", False)
app.config.setdefault("AUTH_API_LOGIN_ALLOW_MULTIPLE_PROVIDERS", False)
app.config.setdefault(
"AUTH_DB_FAKE_PASSWORD_HASH_CHECK",
"scrypt:32768:8:1$wiDa0ruWlIPhp9LM$6e409d093e62ad54df2af895d0e125b05ff6cf6414"
"8350189ffc4bcc71286edf1b8ad94a442c00f890224bf2b32153d0750c89ee9"
"401e62f9dcee5399065e4e5",
)

from packaging.version import Version
from werkzeug import __version__ as werkzeug_version

parsed_werkzeug_version = Version(werkzeug_version)
if parsed_werkzeug_version < Version("3.0.0"):
app.config.setdefault(
"AUTH_DB_FAKE_PASSWORD_HASH_CHECK",
"pbkdf2:sha256:150000$Z3t6fmj2$22da622d94a1f8118"
"c0976a03d2f18f680bfff877c9a965db9eedc51bc0be87c",
)
else:
app.config.setdefault(
"AUTH_DB_FAKE_PASSWORD_HASH_CHECK",
"scrypt:32768:8:1$wiDa0ruWlIPhp9LM$6e409d093e62ad54df2af895d0e125b05ff6cf6414"
"8350189ffc4bcc71286edf1b8ad94a442c00f890224bf2b32153d0750c89ee9"
"401e62f9dcee5399065e4e5",
)

# LDAP Config
if self.auth_type == AUTH_LDAP:
Expand Down
3 changes: 2 additions & 1 deletion providers/src/airflow/providers/google/provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ dependencies:
- google-api-python-client>=2.0.2
- google-auth>=2.29.0
- google-auth-httplib2>=0.0.1
- google-cloud-aiplatform>=1.70.0
- google-cloud-aiplatform[evaluation]>=1.73.0
- google-cloud-alloydb>=0.4.0
- google-cloud-automl>=2.12.0
# Excluded versions contain bug https://github.com/apache/airflow/issues/39541 which is resolved in 3.24.0
- google-cloud-bigquery>=3.4.0,!=3.21.*,!=3.22.0,!=3.23.*
Expand Down
Loading