diff --git a/bitnami/elasticsearch/9.4/debian-12/Dockerfile b/bitnami/elasticsearch/9.4/debian-12/Dockerfile index 598238cb1699..1451ae1f4aef 100644 --- a/bitnami/elasticsearch/9.4/debian-12/Dockerfile +++ b/bitnami/elasticsearch/9.4/debian-12/Dockerfile @@ -9,7 +9,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-27T07:14:36Z" \ + org.opencontainers.image.created="2026-05-27T16:43:15Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch" \ @@ -33,7 +33,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ COMPONENTS=( \ "yq-4.53.2-1-linux-${OS_ARCH}-debian-12" \ "java-21.0.11-11-2-linux-${OS_ARCH}-debian-12" \ - "elasticsearch-9.4.1-0-linux-${OS_ARCH}-debian-12" \ + "elasticsearch-9.4.1-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -54,7 +54,7 @@ RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh ENV APP_VERSION="9.4.1" \ BITNAMI_APP_NAME="elasticsearch" \ - IMAGE_REVISION="4" \ + IMAGE_REVISION="5" \ JAVA_HOME="/opt/bitnami/java" \ LD_LIBRARY_PATH="/opt/bitnami/elasticsearch/jdk/lib:/opt/bitnami/elasticsearch/jdk/lib/server:$LD_LIBRARY_PATH" diff --git a/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index b076685f6e7d..000000000000 --- a/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -984705b900956886bd44a9884a3ab8c9ac1b84dc8c0eec1ae50392547f4e3ada elasticsearch-9.4.1-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 6724269454e0..000000000000 --- a/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -2cfdda56c0dc46645770a754d16dbe9d83c3c2a5acd15ca696f71802b5b60815 elasticsearch-9.4.1-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e43c3dbdc17f --- /dev/null +++ b/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +9ae4c2486fb7b7930e5e9bb781da4ad345978b1a2fe2ec0670fa55b47abec00e elasticsearch-9.4.1-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..a06df011938b --- /dev/null +++ b/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/checksums/elasticsearch-9.4.1-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +590fe860fa39b7e79339d9fa785900409a38302c1eadd53acca761cd62193439 elasticsearch-9.4.1-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 1337f6c2dd59..b16efabd3230 100644 --- a/bitnami/elasticsearch/9.4/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/elasticsearch/9.4/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/elasticsearch/9.4/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh b/bitnami/elasticsearch/9.4/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh index a5274d5ee2eb..ec9c0afcc3f7 100644 --- a/bitnami/elasticsearch/9.4/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh +++ b/bitnami/elasticsearch/9.4/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh @@ -942,6 +942,7 @@ elasticsearch_healthcheck() { user_file="$(credential_to_temp_file "${DB_USERNAME}:${DB_PASSWORD}")" curl_args+=("--user" "$(<"$user_file")") if is_boolean_yes "$DB_ENABLE_REST_TLS"; then + protocol="https" # TODO: use the CA certificate to verify the server certificate # Currently it's not trivial given keystores / truststores are mounted curl_args+=("-k")