diff --git a/bitnami/superset/6/debian-12/Dockerfile b/bitnami/superset/6/debian-12/Dockerfile index 8070fe34f5fd..05a5cda86c00 100644 --- a/bitnami/superset/6/debian-12/Dockerfile +++ b/bitnami/superset/6/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-05-23T11:52:15Z" \ + org.opencontainers.image.created="2026-06-01T17:52:06Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/superset/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/superset" \ @@ -30,17 +30,17 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ COMPONENTS=( \ "python-3.10.20-13-linux-${OS_ARCH}-debian-12" \ "mariadb-lib-12.2.2-3-linux-${OS_ARCH}-debian-12" \ - "superset-6.1.0-0-linux-${OS_ARCH}-debian-12" \ + "superset-6.1.0-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \ fi ; \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done + rm -rf "${COMPONENT}".tar.gz ; \ + done ; \ + rm -rf /opt/bitnami/checksums ; RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami @@ -51,7 +51,7 @@ RUN /opt/bitnami/scripts/superset/postunpack.sh ENV APP_VERSION="6.1.0" \ BITNAMI_APP_NAME="superset" \ FLASK_APP="superset.app:create_app()" \ - IMAGE_REVISION="1" \ + IMAGE_REVISION="2" \ LD_LIBRARY_PATH="/opt/bitnami/mariadb/lib:$LD_LIBRARY_PATH" \ PATH="/opt/bitnami/superset/venv/bin:/opt/bitnami/python/bin:$PATH" \ SUPERSET_HOME="/opt/bitnami/superset/superset_home" diff --git a/bitnami/superset/6/debian-12/docker-compose.yml b/bitnami/superset/6/debian-12/docker-compose.yml index 62bc53adbd2a..938ca66b1914 100644 --- a/bitnami/superset/6/debian-12/docker-compose.yml +++ b/bitnami/superset/6/debian-12/docker-compose.yml @@ -25,6 +25,7 @@ services: environment: - BITNAMI_DEBUG=true - SUPERSET_ROLE=init + - SUPERSET_PASSWORD=bitnami - SUPERSET_DATABASE_HOST=postgresql - SUPERSET_DATABASE_NAME=bitnami_superset - SUPERSET_DATABASE_USER=bn_superset diff --git a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/mariadb-lib-12.2.2-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/mariadb-lib-12.2.2-3-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d2063a7a5133 --- /dev/null +++ b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/mariadb-lib-12.2.2-3-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +a4c1ec7675e8b5f5d8565ebfe2f0af242950d9e815d62b11bcadcdee9606b130 mariadb-lib-12.2.2-3-linux-amd64-debian-12.tar.gz diff --git a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/mariadb-lib-12.2.2-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/mariadb-lib-12.2.2-3-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..0342bc6c424c --- /dev/null +++ b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/mariadb-lib-12.2.2-3-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +065a632ae105baeeecd4ce6022ed60a261fe255b65b8e434a43a3b1821b77905 mariadb-lib-12.2.2-3-linux-arm64-debian-12.tar.gz diff --git a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/python-3.10.20-13-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/python-3.10.20-13-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..ba1599d09965 --- /dev/null +++ b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/python-3.10.20-13-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +ef7ba5effe21f6b7009296dfc18a157388d166f1ed0603ef52eca24170bc949d python-3.10.20-13-linux-amd64-debian-12.tar.gz diff --git a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/python-3.10.20-13-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/python-3.10.20-13-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..a8b3264d67e3 --- /dev/null +++ b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/python-3.10.20-13-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +8da58de196dcaa2026dc6834e2b70ae266956144b767f67af90a99ac538fe0f7 python-3.10.20-13-linux-arm64-debian-12.tar.gz diff --git a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/superset-6.1.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/superset-6.1.0-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..7682345d2787 --- /dev/null +++ b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/superset-6.1.0-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +ce3d7576a386d5c3e50c62d670e3c01fb4634f49cae88c4e24767059ef155c5b superset-6.1.0-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/superset-6.1.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/superset-6.1.0-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..faa7fe258632 --- /dev/null +++ b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/checksums/superset-6.1.0-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +206fbb11a52d52902018b6f6939022546311590a00f95513fd80d9d9b60c1729 superset-6.1.0-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh index 1c69e0e48a5d..335c1c7c9ef7 100644 --- a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -139,3 +139,40 @@ wait_for_log_entry() { return 1 fi } + +######################## +# Creates a secure temporary file containing the provided secret +# Arguments: +# $1 - secret to write to the temporary file +# Returns: +# String +######################### +credential_to_temp_file() { + local secret="$1" + local tmp_file + + # Use mktemp with a specific prefix for easier debugging if something lingers + if ! tmp_file=$(mktemp "${TMPDIR:-/tmp}/at.cred.XXXXXXXX"); then + echo "Error: Failed to create temp file" >&2 + return 1 + fi + + # Restrict permissions before writing the secret + chmod 0600 "$tmp_file" + # Write secret and ensure it's flushed to disk + printf "%s" "$secret" > "$tmp_file" + # Output the filename so the caller can capture it + echo "$tmp_file" +} + +######################## +# Cleans up temporary files created by credential_to_temp_file +# Arguments: +# None +# Returns: +# None +######################### +cleanup_credentials() { + debug "Cleaning up temporary files containing credentials" + rm -rf "${TMPDIR:-/tmp}"/at.cred.* +} diff --git a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 1337f6c2dd59..b16efabd3230 100644 --- a/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/superset/6/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -131,6 +131,7 @@ relativize() { # -d|--dir-mode - mode for files. # -u|--user - user # -g|--group - group +# -n|--no-dereference - do not follow symlinks (use for runtime root chown of daemon-writable dirs) # Returns: # None ######################### @@ -140,6 +141,7 @@ configure_permissions_ownership() { local file_mode="" local user="" local group="" + local follow_symlinks="yes" # Validate arguments shift 1 @@ -161,6 +163,9 @@ configure_permissions_ownership() { shift group="${1:?missing group}" ;; + -n | --no-dereference) + follow_symlinks="no" + ;; *) echo "Invalid command line flag $1" >&2 return 1 @@ -169,22 +174,29 @@ configure_permissions_ownership() { shift done + # -L: follow symlinks and emits the target path + # This is dangerous at runtime, given a co-located lower-privileged process with write access + # to the target path can redirect the chown/chmod to arbitrary paths. Example: + # Lower-privileged process run: ln -s /etc /tmp/etc + # Then, setup.sh runs: configure_permissions_ownership --dir-mode 775 /tmp + local find_L_flag=(); [[ "$follow_symlinks" == "yes" ]] && find_L_flag=("-L") + # -h: changes symlink inode ownership without touching the target. + local chown_flags=(); [[ "$follow_symlinks" == "no" ]] && chown_flags=("-h") read -r -a filepaths <<<"$paths" for p in "${filepaths[@]}"; do if [[ -e "$p" ]]; then - find -L "$p" -printf "" if [[ -n $dir_mode ]]; then - find -L "$p" -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode" + find "${find_L_flag[@]}" "$p" -not -type l -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode" fi if [[ -n $file_mode ]]; then - find -L "$p" -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode" + find "${find_L_flag[@]}" "$p" -not -type l -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode" fi if [[ -n $user ]] && [[ -n $group ]]; then - find -L "$p" -print0 | xargs -r -0 chown "${user}:${group}" + find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chown "${chown_flags[@]}" "${user}:${group}" elif [[ -n $user ]] && [[ -z $group ]]; then - find -L "$p" -print0 | xargs -r -0 chown "${user}" + find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chown "${chown_flags[@]}" "${user}" elif [[ -z $user ]] && [[ -n $group ]]; then - find -L "$p" -print0 | xargs -r -0 chgrp "${group}" + find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chgrp "${chown_flags[@]}" "${group}" fi else stderr_print "$p does not exist" diff --git a/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/libsuperset.sh b/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/libsuperset.sh index b28eb4672482..b86d8b9c33a8 100644 --- a/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/libsuperset.sh +++ b/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/libsuperset.sh @@ -34,6 +34,11 @@ superset_validate() { error "$1" error_code=1 } + check_empty_value() { + if is_empty_value "${!1}"; then + print_validation_error "${1} must be set" + fi + } check_multi_value() { if [[ " ${2} " != *" ${!1} "* ]]; then print_validation_error "The allowed values for ${1} are: ${2}" @@ -56,14 +61,21 @@ superset_validate() { ! is_empty_value "$SUPERSET_DATABASE_PORT_NUMBER" && check_valid_port "SUPERSET_DATABASE_PORT_NUMBER" ! is_empty_value "$REDIS_PORT_NUMBER" && check_valid_port "REDIS_PORT_NUMBER" - # Check Superset secret key - if [[ -z "$SUPERSET_SECRET_KEY" ]]; then - print_validation_error "SUPERSET_SECRET_KEY must be set" - fi - # Check Superset node role check_multi_value "SUPERSET_ROLE" "webserver celery-worker celery-beat celery-flower init" + # Check Superset secret key ... + check_empty_value "SUPERSET_SECRET_KEY" + # ... and other role-specific credentials + case "$SUPERSET_ROLE" in + "init") + check_empty_value "SUPERSET_PASSWORD" + ;; + "celery-flower") + is_empty_value "FLOWER_BASIC_AUTH" && warn "Basic authentication is not enabled for Celery Flower. This is not recommended for production environments." + ;; + esac + return "$error_code" } diff --git a/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/superset-env.sh b/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/superset-env.sh index 2fab9ea71630..46653d516d98 100644 --- a/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/superset-env.sh +++ b/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/superset-env.sh @@ -97,7 +97,7 @@ export SUPERSET_DAEMON_GROUP="superset" # Superset user configuration export SUPERSET_USERNAME="${SUPERSET_USERNAME:-user}" -export SUPERSET_PASSWORD="${SUPERSET_PASSWORD:-bitnami}" +export SUPERSET_PASSWORD="${SUPERSET_PASSWORD:-}" export SUPERSET_FIRSTNAME="${SUPERSET_FIRSTNAME:-Firstname}" export SUPERSET_LASTNAME="${SUPERSET_LASTNAME:-Lastname}" export SUPERSET_EMAIL="${SUPERSET_EMAIL:-user@example.com}" diff --git a/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/superset/files/superset_config.py b/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/superset/files/superset_config.py index cf28ab0643ad..9933a68abac8 100644 --- a/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/superset/files/superset_config.py +++ b/bitnami/superset/6/debian-12/rootfs/opt/bitnami/scripts/superset/files/superset_config.py @@ -77,9 +77,10 @@ REDIS_PASSWORD = env("REDIS_PASSWORD") REDIS_USER = env("REDIS_USER", "") REDIS_TLS_ENABLED = env("REDIS_TLS_ENABLED", False) REDIS_SSL_CERT_REQS = env("REDIS_SSL_CERT_REQS") -REDIS_URL_PARAMS = f"ssl_cert_reqs={REDIS_SSL_CERT_REQS}" if REDIS_SSL_CERT_REQS else "" +REDIS_URL_PARAMS = f"?ssl_cert_reqs={REDIS_SSL_CERT_REQS}" if REDIS_SSL_CERT_REQS else "" REDIS_AUTH = f"{REDIS_USER}:{REDIS_PASSWORD}@" if REDIS_PASSWORD else "" -REDIS_BASE_URL = f"redis://{REDIS_AUTH}{REDIS_HOST}:{REDIS_PORT}" +REDIS_SCHEME = "rediss" if REDIS_TLS_ENABLED else "redis" +REDIS_BASE_URL = f"{REDIS_SCHEME}://{REDIS_AUTH}{REDIS_HOST}:{REDIS_PORT}" # Redis URLs REDIS_CELERY_URL = f"{REDIS_BASE_URL}/{REDIS_CELERY_DB}{REDIS_URL_PARAMS}" REDIS_CACHE_URL = f"{REDIS_BASE_URL}/{REDIS_DB}{REDIS_URL_PARAMS}" diff --git a/bitnami/superset/docker-compose.yml b/bitnami/superset/docker-compose.yml index 62bc53adbd2a..938ca66b1914 100644 --- a/bitnami/superset/docker-compose.yml +++ b/bitnami/superset/docker-compose.yml @@ -25,6 +25,7 @@ services: environment: - BITNAMI_DEBUG=true - SUPERSET_ROLE=init + - SUPERSET_PASSWORD=bitnami - SUPERSET_DATABASE_HOST=postgresql - SUPERSET_DATABASE_NAME=bitnami_superset - SUPERSET_DATABASE_USER=bn_superset