From 840abcf9150eab8ea1e1f50e23ac2c4b1c94a978 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 15 Feb 2023 07:32:44 +0100
Subject: [PATCH] [bitnami/airflow] Release 2.5.1-debian-11-r9 (#24092)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/airflow/2/debian-11/Dockerfile               |  2 +-
 .../rootfs/opt/bitnami/scripts/airflow-env.sh        |  2 ++
 .../rootfs/opt/bitnami/scripts/libairflow.sh         | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bitnami/airflow/2/debian-11/Dockerfile b/bitnami/airflow/2/debian-11/Dockerfile
index 3fb14414d91e..412531c463e3 100644
--- a/bitnami/airflow/2/debian-11/Dockerfile
+++ b/bitnami/airflow/2/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.5.1-debian-11-r8" \
+      org.opencontainers.image.ref.name="2.5.1-debian-11-r9" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/airflow" \
       org.opencontainers.image.title="airflow" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/airflow-env.sh b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/airflow-env.sh
index 60d34a74ae11..3a05043202c4 100644
--- a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/airflow-env.sh
+++ b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/airflow-env.sh
@@ -28,6 +28,7 @@ airflow_env_vars=(
     AIRFLOW_LASTNAME
     AIRFLOW_EMAIL
     AIRFLOW_EXECUTOR
+    AIRFLOW_RAW_FERNET_KEY
     AIRFLOW_FERNET_KEY
     AIRFLOW_SECRET_KEY
     AIRFLOW_WEBSERVER_HOST
@@ -103,6 +104,7 @@ export AIRFLOW_EMAIL="${AIRFLOW_EMAIL:-user@example.com}"
 
 # Airflow configuration
 export AIRFLOW_EXECUTOR="${AIRFLOW_EXECUTOR:-SequentialExecutor}"
+export AIRFLOW_RAW_FERNET_KEY="${AIRFLOW_RAW_FERNET_KEY:-}"
 export AIRFLOW_FERNET_KEY="${AIRFLOW_FERNET_KEY:-}"
 export AIRFLOW_SECRET_KEY="${AIRFLOW_SECRET_KEY:-}"
 export AIRFLOW_WEBSERVER_HOST="${AIRFLOW_WEBSERVER_HOST:-127.0.0.1}"
diff --git a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
index 254f7727a738..d84835879fd9 100644
--- a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
+++ b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
@@ -79,6 +79,18 @@ airflow_validate() {
         [[ -z "$AIRFLOW_POOL_SIZE" ]] && print_validation_error "Provided AIRFLOW_POOL_NAME but missing AIRFLOW_POOL_SIZE"
     fi
 
+    # Check cryptography parameters
+    if [[ -n "$AIRFLOW_RAW_FERNET_KEY" && -z "$AIRFLOW_FERNET_KEY" ]]; then
+        local fernet_char_count
+        fernet_char_count="$(echo -n "$AIRFLOW_RAW_FERNET_KEY")"
+        if [[ "$fernet_char_count" -lt 32 ]]; then
+            print_validation_error "AIRFLOW_RAW_FERNET_KEY must have at least 32 characters"
+        elif [[ "$fernet_char_count" -gt 32 ]]; then
+            warn "AIRFLOW_RAW_FERNET_KEY has more than 32 characters, the rest will be ignored"
+        fi
+        AIRFLOW_FERNET_KEY="$(echo -n "${AIRFLOW_RAW_FERNET_KEY:0:32}" | base64)"
+    fi
+
     return "$error_code"
 }