-
Notifications
You must be signed in to change notification settings - Fork 14.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated app to support configuring the caching hash method for FIPS v2 (
- Loading branch information
1 parent
6b5db07
commit 522083c
Showing
8 changed files
with
130 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
from __future__ import annotations | ||
|
||
import hashlib | ||
|
||
from airflow import PY39 | ||
|
||
|
||
def md5(data: bytes, *, usedforsecurity: bool | None = None): | ||
""" | ||
Safely allows calling the hashlib.md5 function with the "usedforsecurity" param. | ||
:param data: The data to hash. | ||
:param usedforsecurity: The value to pass to the md5 function's "usedforsecurity" param. | ||
Defaults to None. | ||
:return: The hashed value. | ||
:rtype: _Hash | ||
""" | ||
if PY39 and usedforsecurity is not None: | ||
return hashlib.md5(data, usedforsecurity=usedforsecurity) # type: ignore | ||
else: | ||
return hashlib.md5(data) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
from __future__ import annotations | ||
|
||
import hashlib | ||
from tempfile import gettempdir | ||
|
||
from flask_caching import Cache | ||
|
||
from airflow.configuration import conf | ||
from airflow.exceptions import AirflowConfigException | ||
|
||
HASH_METHOD_MAPPING = { | ||
"md5": hashlib.md5, | ||
"sha1": hashlib.sha1, | ||
"sha224": hashlib.sha224, | ||
"sha256": hashlib.sha256, | ||
"sha384": hashlib.sha384, | ||
"sha512": hashlib.sha512, | ||
} | ||
|
||
|
||
def init_cache(app): | ||
webserver_caching_hash_method = conf.get( | ||
section="webserver", key="CACHING_HASH_METHOD", fallback="md5" | ||
).casefold() | ||
cache_config = {"CACHE_TYPE": "flask_caching.backends.filesystem", "CACHE_DIR": gettempdir()} | ||
|
||
mapped_hash_method = HASH_METHOD_MAPPING.get(webserver_caching_hash_method) | ||
|
||
if mapped_hash_method is None: | ||
raise AirflowConfigException( | ||
f"Unsupported webserver caching hash method: `{webserver_caching_hash_method}`." | ||
) | ||
|
||
cache_config["CACHE_OPTIONS"] = {"hash_method": mapped_hash_method} | ||
|
||
Cache(app=app, config=cache_config) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Various updates for FIPS-compliance when running Airflow in Python 3.9+. This includes a new webserver option, ``caching_hash_method``, for changing the default flask caching method. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters