diff --git a/bitnami/hubble-ui/0/debian-12/Dockerfile b/bitnami/hubble-ui/0/debian-12/Dockerfile index 51f489a47f8e..4d1216a2db35 100644 --- a/bitnami/hubble-ui/0/debian-12/Dockerfile +++ b/bitnami/hubble-ui/0/debian-12/Dockerfile @@ -8,11 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-02-20T21:02:13Z" \ + org.opencontainers.image.created="2025-03-15T19:35:28Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/hubble-ui/README.md" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.13.2-debian-12-r3" \ + org.opencontainers.image.ref.name="0.13.2-debian-12-r4" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/hubble-ui" \ org.opencontainers.image.title="hubble-ui" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -29,8 +28,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl gettext libcrypt1 libgeoip1 libpcre3 libssl3 openssl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.7-13-linux-${OS_ARCH}-debian-12" \ - "nginx-1.27.4-3-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.7-14-linux-${OS_ARCH}-debian-12" \ + "nginx-1.27.4-5-linux-${OS_ARCH}-debian-12" \ "hubble-ui-0.13.2-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index d6c43643f84d..5b5c390aad95 100644 --- a/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,12 +9,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.27.4-3" + "version": "1.27.4-5" }, "render-template": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-13" + "version": "1.0.7-14" } } \ No newline at end of file diff --git a/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh index 450f05bd823f..1e18ef9866fa 100644 --- a/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -39,7 +39,14 @@ stderr_print() { # None ######################### log() { - stderr_print "${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")${RESET}${*}" + local color_bool="${BITNAMI_COLOR:-true}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]]; then + stderr_print "${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")${RESET}${*}" + else + stderr_print "${MODULE:-} $(date "+%T.%2N ")${*}" + fi } ######################## # Log an 'info' message @@ -49,7 +56,14 @@ log() { # None ######################### info() { - log "${GREEN}INFO ${RESET} ==> ${*}" + local msg_color="" + local color_bool="${BITNAMI_COLOR:-true}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + msg_color="$GREEN" + fi + log "${msg_color}INFO ${RESET} ==> ${*}" } ######################## # Log message @@ -59,7 +73,14 @@ info() { # None ######################### warn() { - log "${YELLOW}WARN ${RESET} ==> ${*}" + local msg_color="" + local color_bool="${BITNAMI_COLOR:-true}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + msg_color="$YELLOW" + fi + log "${msg_color}WARN ${RESET} ==> ${*}" } ######################## # Log an 'error' message @@ -69,7 +90,14 @@ warn() { # None ######################### error() { - log "${RED}ERROR${RESET} ==> ${*}" + local msg_color="" + local color_bool="${BITNAMI_COLOR:-true}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + msg_color="$RED" + fi + log "${msg_color}ERROR${RESET} ==> ${*}" } ######################## # Log a 'debug' message @@ -81,12 +109,16 @@ error() { # None ######################### debug() { - # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it - local bool="${BITNAMI_DEBUG:-false}" + local msg_color="" + local color_bool="${BITNAMI_COLOR:-true}" # comparison is performed without regard to the case of alphabetic characters shopt -s nocasematch - if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then - log "${MAGENTA}DEBUG${RESET} ==> ${*}" + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]] ;then + msg_color="$MAGENTA" + fi + local debug_bool="${BITNAMI_DEBUG:-false}" + if [[ "$debug_bool" = 1 || "$debug_bool" =~ ^(yes|true)$ ]]; then + log "${msg_color}DEBUG${RESET} ==> ${*}" fi } diff --git a/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf b/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/nginx/conf/bitnami/00_protect-hidden-files.conf similarity index 100% rename from bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf rename to bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/nginx/conf/bitnami/00_protect-hidden-files.conf diff --git a/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/nginx/conf/bitnami/00_protect-uploads-dirs.conf b/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/nginx/conf/bitnami/00_protect-uploads-dirs.conf new file mode 100644 index 000000000000..18f901f13fbf --- /dev/null +++ b/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/nginx/conf/bitnami/00_protect-uploads-dirs.conf @@ -0,0 +1,5 @@ +# Deny access to any files with a .php extension in the uploads directory +# See: https://developer.wordpress.org/advanced-administration/server/web-server/nginx/#global-restrictions-file +location ~* /(?:uploads|files)/.*\.php$ { + deny all; +} \ No newline at end of file