Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bitnami/keycloak] Add support for ipv6 #40224

Merged
merged 6 commits into from
Jul 19, 2023
Merged

[bitnami/keycloak] Add support for ipv6 #40224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4e982e
Add validate_ipv6 function for keycloak
covert8 Jul 7, 2023
58d3407
Add combinatory fuction for validate ipv4 & ipv6
covert8 Jul 7, 2023
b9c29a4
Use combinated validate_ip function for keycloak envVars check
covert8 Jul 7, 2023
50b9a4c
Fix return error description validate_ip helper function
covert8 Jul 12, 2023
0a0d5ba
Small syntax fixes
covert8 Jul 18, 2023
0ff25d2
Merge branch 'bitnami:main' into patch-2
covert8 Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions bitnami/keycloak/21/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,26 @@ validate_port() {
fi
}

########################
# Validate if the provided argument is a valid IPv4 or IPv6 address
# Arguments:
# $1 - IP to validate
# Returns:
# Boolean
#########################
validate_ip() {
local ip="${1:?ip is missing}"
local stat=1

if validate_ipv4 "$ip"; then
stat=0
else
stat=$(validate_ipv6 "$ip")
fi

return $stat
}

########################
# Validate if the provided argument is a valid IPv4 address
# Arguments:
Expand All @@ -207,6 +227,25 @@ validate_ipv4() {
return $stat
}

########################
# Validate if the provided argument is a valid IPv6 address
# Arguments:
# $1 - IP to validate
# Returns:
# Boolean
#########################
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 [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
stat=0
fi
return $stat
}

########################
# Validate a string format
# Arguments:
Expand Down
4 changes: 2 additions & 2 deletions bitnami/keycloak/21/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ keycloak_validate() {
fi
fi

if ! validate_ipv4 "${KEYCLOAK_BIND_ADDRESS}"; then
if ! validate_ip "${KEYCLOAK_BIND_ADDRESS}"; then
if ! is_hostname_resolved "${KEYCLOAK_BIND_ADDRESS}"; then
print_validation_error print_validation_error "The value for KEYCLOAK_BIND_ADDRESS ($KEYCLOAK_BIND_ADDRESS) should be an IPv4 address or it must be a resolvable hostname"
print_validation_error print_validation_error "The value for KEYCLOAK_BIND_ADDRESS ($KEYCLOAK_BIND_ADDRESS) should be an IPv4 or IPv6 address, or it must be a resolvable hostname"
fi
fi

Expand Down
Loading