diff --git a/bitnami/keycloak/21/debian-11/Dockerfile b/bitnami/keycloak/21/debian-11/Dockerfile index 450848332ba4..187d0f230dac 100644 --- a/bitnami/keycloak/21/debian-11/Dockerfile +++ b/bitnami/keycloak/21/debian-11/Dockerfile @@ -6,11 +6,12 @@ FROM docker.io/bitnami/minideb:bullseye ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-07-14T09:58:05Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-07-20T15:33:18Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="21.1.2-debian-11-r6" \ + org.opencontainers.image.ref.name="21.1.2-debian-11-r22" \ org.opencontainers.image.title="keycloak" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="21.1.2" diff --git a/bitnami/keycloak/21/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/keycloak/21/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index ba4b246e09c9..54987abca42a 100644 --- a/bitnami/keycloak/21/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/keycloak/21/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -188,23 +188,22 @@ validate_port() { } ######################## -# Validate if the provided argument is a valid IPv4 or IPv6 address +# Validate if the provided argument is a valid IPv6 address # Arguments: # $1 - IP to validate # Returns: # Boolean ######################### -validate_ip() { +validate_ipv6() { local ip="${1:?ip is missing}" local stat=1 + local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$' + local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$' - if validate_ipv4 "$ip"; then - stat=0 - else - stat=$(validate_ipv6 "$ip") - fi - - return $stat + if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then + stat=0 + fi + return "$stat" } ######################## @@ -224,26 +223,26 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return $stat + return "$stat" } ######################## -# Validate if the provided argument is a valid IPv6 address +# Validate if the provided argument is a valid IPv4 or IPv6 address # Arguments: # $1 - IP to validate # Returns: # Boolean ######################### -validate_ipv6() { +validate_ip() { local ip="${1:?ip is missing}" local stat=1 - local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$' - local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$' - if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then + if validate_ipv4 "$ip"; then stat=0 + else + stat=$(validate_ipv6 "$ip") fi - return $stat + return "$stat" } ########################