diff --git a/bitnami/spark/4.1/debian-12/Dockerfile b/bitnami/spark/4.1/debian-12/Dockerfile index 000813c7b02e..5cedfdbf378b 100644 --- a/bitnami/spark/4.1/debian-12/Dockerfile +++ b/bitnami/spark/4.1/debian-12/Dockerfile @@ -8,7 +8,7 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-05-23T11:42:20Z" \ + org.opencontainers.image.created="2026-06-01T09:55:53Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/spark/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spark" \ @@ -38,12 +38,12 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ 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 @@ -56,7 +56,7 @@ RUN /opt/bitnami/scripts/spark/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh ENV APP_VERSION="4.1.2" \ BITNAMI_APP_NAME="spark" \ - IMAGE_REVISION="1" \ + IMAGE_REVISION="2" \ JAVA_HOME="/opt/bitnami/java" \ LD_LIBRARY_PATH="/opt/bitnami/python/lib:/opt/bitnami/spark/venv/lib/python3.12/site-packages/numpy.libs:$LD_LIBRARY_PATH" \ LIBNSS_WRAPPER_PATH="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5fa4e9253e4d --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +f0c743ea17d6bb58c1d132dd5b96e1f2d94ef055a12bd0c769b737cd41df98d2 jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e904d564f5e4 --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +d77ed8eca85b273fcb7b3152712beda317ba6f080fff141fb1341e4640aade22 jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/nss-wrapper-1.1.16-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/nss-wrapper-1.1.16-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..cf2734607b9e --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/nss-wrapper-1.1.16-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +af31040a9ef21924a1d4c6d3f0bd6a6be9ef701c9e726b9b3997b82394779b6e nss-wrapper-1.1.16-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/nss-wrapper-1.1.16-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/nss-wrapper-1.1.16-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..c4594d6aa7c5 --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/nss-wrapper-1.1.16-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +9315fee0fbce2e445778f4cddd4b5a9ae657d40bcc4c9534430d8eaeecf7307c nss-wrapper-1.1.16-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d8d64cc5e94a --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +a13e9f6ab18a719682fd94b0bdd131a771835c8cb707e2451c472a8b6927f3f7 python-3.12.13-11-linux-amd64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..694ac13e1718 --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +f79c0e2b0c9179091f9b06c650c757680b91a9f655538e85968cce732f150ab6 python-3.12.13-11-linux-arm64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/spark-4.1.2-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/spark-4.1.2-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..f4e557905c54 --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/spark-4.1.2-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +e521ec88de1c8fbd77386a08f681cfb8acedf1e67ac04cdb026f03a7aabdaa35 spark-4.1.2-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/spark-4.1.2-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/spark-4.1.2-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..3fdd19f287f2 --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/spark-4.1.2-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +c9947c37e32a9369123193ff4aa4afd11d1f1865b6f2d6e682eb2afa17eb7dc0 spark-4.1.2-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh index 1c69e0e48a5d..335c1c7c9ef7 100644 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/spark/4.1/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/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 1337f6c2dd59..b16efabd3230 100644 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/spark/4.1/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/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/libspark.sh b/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/libspark.sh index 57757b28fe78..c7cf39857cf3 100644 --- a/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/libspark.sh +++ b/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/libspark.sh @@ -94,6 +94,7 @@ spark_validate() { spark_generate_conf_file() { info "Generating Spark configuration file..." mv "${SPARK_CONF_DIR}/spark-defaults.conf.template" "${SPARK_CONF_DIR}/spark-defaults.conf" + chmod 600 "${SPARK_CONF_DIR}/spark-defaults.conf" } ########################