diff --git a/bitnami/mysql/9.7/debian-12/Dockerfile b/bitnami/mysql/9.7/debian-12/Dockerfile index 1dba139ddd43..f6bbae3bdfcb 100644 --- a/bitnami/mysql/9.7/debian-12/Dockerfile +++ b/bitnami/mysql/9.7/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-23T09:42:33Z" \ + org.opencontainers.image.created="2026-06-09T14:46:20Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mysql/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mysql" \ @@ -28,18 +28,18 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "ini-file-1.4.9-10-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.9-11-linux-${OS_ARCH}-debian-12" \ "mysql-9.7.0-0-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 @@ COPY rootfs / RUN /opt/bitnami/scripts/mysql/postunpack.sh ENV APP_VERSION="9.7.0" \ BITNAMI_APP_NAME="mysql" \ - IMAGE_REVISION="4" \ + IMAGE_REVISION="5" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mysql/bin:/opt/bitnami/mysql/sbin:$PATH" EXPOSE 3306 diff --git a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..c67cf7de5e60 --- /dev/null +++ b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +4134a42e91271bd0a48f2d6d172910afdfbcaf5251bb8c8bd49e9700aa66d99f ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz diff --git a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..51232981438f --- /dev/null +++ b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +caafc64b69e970f938d535c3aaf7e66420e0dba2c5cbd332e55ccdfd926eed66 ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz diff --git a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-9.7.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-9.7.0-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d36d08ee631c --- /dev/null +++ b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-9.7.0-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +2e914c26aa71b42aaecb4a328ddee9a3bb53d85c8fcea1aba7604bbc017a566c mysql-9.7.0-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-9.7.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-9.7.0-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..b108ddc1ee04 --- /dev/null +++ b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-9.7.0-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +e2db40cdd159d6268626313f0db467cac1db826277933e02fb346dd087af6d0a mysql-9.7.0-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh index 1c69e0e48a5d..335c1c7c9ef7 100644 --- a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/mysql/9.7/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/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 1337f6c2dd59..b16efabd3230 100644 --- a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/mysql/9.7/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/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/mysql/9.7/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +} diff --git a/bitnami/mysql/9.7/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/9.7/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh index 5645ef1ea6f0..6b9f7cf4c845 100644 --- a/bitnami/mysql/9.7/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh +++ b/bitnami/mysql/9.7/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh @@ -96,6 +96,10 @@ mysql_validate() { if [[ -z "$DB_MASTER_HOST" ]]; then print_validation_error "Slave replication mode chosen without setting the environment variable $(get_env_var MASTER_HOST). Use it to indicate where the Master node is running" fi + if ! is_boolean_yes "$DB_REPLICATION_USE_SSL"; then + warn "SSL is not enabled for replication. MITM substitution of the RSA public key can recover DB_REPLICATION_PASSWORD." + fi + else print_validation_error "Invalid replication mode. Available options are 'master/slave'" fi @@ -179,6 +183,27 @@ pid_file=${DB_PID_FILE} EOF } +######################## +# Helper to get the SSL clause for replication +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# SSL clause for replication +######################### +mysql_replication_ssl_clause() { + local replication_ssl_clause + if is_boolean_yes "$DB_REPLICATION_USE_SSL"; then + replication_ssl_clause="SOURCE_SSL=1," + ca_file="$(mysql_client_env_value "SSL_CA_FILE")" + [[ -f "$ca_file" ]] && replication_ssl_clause+=" SOURCE_SSL_CA='${ca_file}', SOURCE_SSL_VERIFY_SERVER_CERT=1," + else + replication_ssl_clause="GET_SOURCE_PUBLIC_KEY=1," + fi + echo "$replication_ssl_clause" +} + ######################## # Make a dump on master database and update slave database # Globals: @@ -191,8 +216,13 @@ EOF mysql_exec_initial_dump() { local -r dump_file="${DB_DATA_DIR}/dump_all_databases.sql" + local ssl_flags=() + is_boolean_yes "$DB_REPLICATION_USE_SSL" && ssl_flags+=("--ssl-mode=REQUIRED") + ca_file="$(mysql_client_env_value "SSL_CA_FILE")" + [[ -f "$ca_file" ]] && ssl_flags+=("--ssl-ca=${ca_file}") + info "MySQL dump master data start..." - mysqldump --verbose --single-transaction --quick --source-data=2 --all-databases -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" > "$dump_file" + MYSQL_PWD="$DB_MASTER_ROOT_PASSWORD" mysqldump --verbose --single-transaction --quick --source-data=2 --all-databases -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" "${ssl_flags[@]}" > "$dump_file" debug "Finish dump databases" # Look for the line containing "CHANGE REPLICATION SOURCE" @@ -215,8 +245,8 @@ SOURCE_PASSWORD='$DB_REPLICATION_PASSWORD', SOURCE_DELAY=$DB_MASTER_DELAY, SOURCE_LOG_FILE='$log_file', SOURCE_LOG_POS=$log_position, -SOURCE_CONNECT_RETRY=10, -GET_SOURCE_PUBLIC_KEY=1; +$(mysql_replication_ssl_clause) +SOURCE_CONNECT_RETRY=10; EOF debug "Finish import dump databases" @@ -252,8 +282,8 @@ SOURCE_PORT=$DB_MASTER_PORT_NUMBER, SOURCE_USER='$DB_REPLICATION_USER', SOURCE_PASSWORD='$DB_REPLICATION_PASSWORD', SOURCE_DELAY=$DB_MASTER_DELAY, -SOURCE_CONNECT_RETRY=10, -GET_SOURCE_PUBLIC_KEY=1; +$(mysql_replication_ssl_clause) +SOURCE_CONNECT_RETRY=10; EOF fi @@ -632,7 +662,6 @@ mysql_execute_print_output() { fi args+=("-N" "-u" "$user") [[ -n "$db" ]] && args+=("$db") - [[ -n "$pass" ]] && args+=("-p$pass") [[ "${#opts[@]}" -gt 0 ]] && args+=("${opts[@]}") [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}") @@ -640,12 +669,19 @@ mysql_execute_print_output() { if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then local mysql_cmd mysql_cmd="$(