diff --git a/bitnami/matomo/5/debian-12/Dockerfile b/bitnami/matomo/5/debian-12/Dockerfile index be816ed39e77..6eb4ba5e5794 100644 --- a/bitnami/matomo/5/debian-12/Dockerfile +++ b/bitnami/matomo/5/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-26T09:25:04Z" \ + org.opencontainers.image.created="2026-05-31T00:29:20Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/matomo/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/matomo" \ @@ -29,7 +29,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "render-template-1.0.9-165-linux-${OS_ARCH}-debian-12" \ - "php-8.4.21-3-linux-${OS_ARCH}-debian-12" \ + "php-8.4.21-5-linux-${OS_ARCH}-debian-12" \ "apache-2.4.67-1-linux-${OS_ARCH}-debian-12" \ "mysql-client-12.2.2-0-linux-${OS_ARCH}-debian-12" \ "postgresql-lib-18.4.0-0-linux-${OS_ARCH}-debian-12" \ @@ -40,12 +40,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 @@ -62,7 +62,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ APP_VERSION="5.10.0" \ BITNAMI_APP_NAME="matomo" \ - IMAGE_REVISION="8" \ + IMAGE_REVISION="9" \ LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib:$LD_LIBRARY_PATH" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:$PATH" diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..ffe4d71f0d07 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +cc9ec4ed758ad8502b7057aa3527cc003261038cd75f0a5fa8aa885bfea46ff1 apache-2.4.67-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..06e58dbe1e02 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +01aa3fe1d54b7ecde2e19098de2fe93205c1c105ff31391f98f5afc3274aa99e apache-2.4.67-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..f7f6d777442b --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +7576302f2870643e4c48e7a4be12fef12e472e68b0b407e6033f812c8742c1f1 ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..fd41b7a8f0ce --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +83dd2355db6b63fc46bb02008fdace7510b339c88d91d45abaa256f2a7ae54bd ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..9e20f02d08b0 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +1c0534f33b21dc6b1754967226d002345b0461f94601a55006b91441136c240f libphp-8.4.21-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..3645c6b66d95 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +949e96622f83b03c9abfdd23c4d45fefb96cbecde83a6315d8d556806a2d3e4a libphp-8.4.21-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/matomo-5.10.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/matomo-5.10.0-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..ab6c91b552cc --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/matomo-5.10.0-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +febaf2bc208169167ef666a714cf064b30cb39d5f9bcc627e968f03cc46d9c7b matomo-5.10.0-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/matomo-5.10.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/matomo-5.10.0-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..a0300f814bb5 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/matomo-5.10.0-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +18b53a79a84a08c5b567d062b38e3c63fa6802ceabc0cb9348d97c87bc67e412 matomo-5.10.0-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.2.2-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.2.2-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d30c327a19c5 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.2.2-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +774176309ecff1cb425ea9f4d887a4280404c017da7ddef06c6568345abb434e mysql-client-12.2.2-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.2.2-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.2.2-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..02edc10429de --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.2.2-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +f3cb04c8b0781e306ef47be8b97409b6b19bd3f7bc6b7dcabddc242b6a9ab6c2 mysql-client-12.2.2-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e6b37c12a0ea --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +101267a9e206d18be90a2bd1fc383a168359c96e1db7f7383d31a7366f1137fd php-8.4.21-5-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..f18b6e839e8d --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +73d961f31f79364d8c10385e3f2a918fc5b7e8bb4150cbdf11063a1ed60fde9a php-8.4.21-5-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-lib-18.4.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-lib-18.4.0-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e709b318aded --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-lib-18.4.0-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +e3a4e54345bbb5106076d25282c09391fb37035f9132cf2df482f0a854939810 postgresql-lib-18.4.0-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-lib-18.4.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-lib-18.4.0-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..a5c0df159cbb --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-lib-18.4.0-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +06994f7557096a92e9c75472b0336b1f90c0c854b6590583ff62738b98767c63 postgresql-lib-18.4.0-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..ecf216f2789c --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +374910c7361f00d393eca79a749d29f389b4522057902c7655f0a3a5ae3d1b32 render-template-1.0.9-165-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e15b6bdd7577 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +d492024d2d8261cfb147e7b508d341b91349fd41cf41aecd0706046be8cb108b render-template-1.0.9-165-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 1337f6c2dd59..b16efabd3230 100644 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/matomo/5/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/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl index ff6de13a321e..a830382f2dd3 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl @@ -5,9 +5,11 @@ Listen 443 -SSLProtocol all -SSLv2 -SSLv3 -SSLHonorCipherOrder on -SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !EDH !RC4" +SSLProtocol all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1 +# Ciphers for TLS 1.2, see https://wiki.mozilla.org/Security/Server_Side_TLS +SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 +SSLHonorCipherOrder off +SSLSessionTickets off SSLPassPhraseDialog builtin SSLSessionCache "shmcb:{{APACHE_LOGS_DIR}}/ssl_scache(512000)" SSLSessionCacheTimeout 300 diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmatomo.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmatomo.sh index f1344255dcdb..796f34eb7fe9 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmatomo.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmatomo.sh @@ -113,7 +113,7 @@ matomo_initialize() { info "Ensuring Matomo directories exist" ensure_dir_exists "$MATOMO_VOLUME_DIR" # Use daemon:root ownership for compatibility when running as a non-root user - am_i_root && configure_permissions_ownership "$MATOMO_VOLUME_DIR" -d "775" -f "664" -u "$WEB_SERVER_DAEMON_USER" -g "root" + am_i_root && configure_permissions_ownership "$MATOMO_VOLUME_DIR" -d "775" -f "664" -u "$WEB_SERVER_DAEMON_USER" -g "root" -n info "Trying to connect to the database server" db_host="$MATOMO_DATABASE_HOST" db_port="$MATOMO_DATABASE_PORT_NUMBER" @@ -241,7 +241,7 @@ EOF matomo_wait_for_db_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" info "Launching schema update" php "$MATOMO_BASE_DIR"/console "core:update" "--yes" - am_i_root && configure_permissions_ownership "$MATOMO_BASE_DIR"/tmp -d "775" -f "664" -u "$WEB_SERVER_DAEMON_USER" -g "root" + am_i_root && configure_permissions_ownership "$MATOMO_BASE_DIR"/tmp -d "775" -f "664" -u "$WEB_SERVER_DAEMON_USER" -g "root" -n debug "Re-creating .htaccess files" php "$MATOMO_BASE_DIR"/console "core:create-security-files" fi diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh index 054084de6928..1a3ae0d0dc67 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -1041,15 +1041,21 @@ mysql_client_extra_opts() { local -a opts=() local key value if is_boolean_yes "${DB_ENABLE_SSL:-no}"; then + ca_file="$(mysql_client_env_value "SSL_CA_FILE")" if [[ "$(mysql_client_flavor)" = "mysql" ]]; then - opts+=("--ssl-mode=REQUIRED") + if [[ -f "$ca_file " ]]; then + opts+=("--ssl-mode=VERIFY_CA") + else + opts+=("--ssl-mode=REQUIRED") + fi else opts+=("--ssl=TRUE") + [[ -f "$ca_file" ]] && opts+=("--ssl-verify-server-cert") fi - # Add "--ssl-ca", "--ssl-key" and "--ssl-cert" options if the env vars are defined + # Add "--ssl-ca", "--ssl-key" and "--ssl-cert" options if the env vars are defined and the files exist for key in ca key cert; do value="$(mysql_client_env_value "SSL_${key^^}_FILE")" - [[ -n "${value}" ]] && opts+=("--ssl-${key}=${value}") + [[ -f "${value}" ]] && opts+=("--ssl-${key}=${value}") done else # Skip SSL validation