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.

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

feat: PUC-752: reading OIDCCryptoPassphrase from a file #650

Merged
merged 2 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion components/keystone/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,18 @@ pod:
- name: keystone-sso
mountPath: /etc/keystone-sso
readOnly: true
- name: oidc-secret
mountPath: /etc/oidc-secret
readOnly: true
volumes:
- name: keystone-sso
secret:
secretName: keystone-sso
- name: oidc-secret
secret:
secretName: sso-passphrase
replicas:
api: 2
lifecycle:
disruption_budget:
api:
Expand Down Expand Up @@ -287,7 +295,9 @@ conf:
OIDCProviderMetadataURL http://dex.dex.svc:5556/.well-known/openid-configuration
OIDCClientID keystone
OIDCClientSecret "exec:/bin/cat /etc/keystone-sso/client-secret"
OIDCCryptoPassphrase "exec:/bin/bash -c \"head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32\""
OIDCCryptoPassphrase "exec:/bin/cat /etc/oidc-secret/password"
OIDCCacheType memcache
OIDCMemCacheServers "memcached.openstack.svc.cluster.local:11211"
OIDCClaimDelimiter ;

# avoid redirect issues per the following
Expand Down
24 changes: 23 additions & 1 deletion scripts/gitops-secrets-gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ convert_to_secret_name() {
load_or_gen_os_secret() {
local data_var=$1
local secret_var=$2
local charset=$3 # Optional third argument for custom charset
local charset_length=${4:-32} # Optional fourth argument, Default to 32 if not provided

if kubectl -n openstack get secret "${secret_var}" &>/dev/null; then
data="$(kubectl -n openstack get secret "${secret_var}" -o jsonpath='{.data.password}' | base64 -d)"
Expand All @@ -274,7 +276,13 @@ load_or_gen_os_secret() {
return 1
else
echo "Generating ${secret_var}"
data="$("${SCRIPTS_DIR}/pwgen.sh" 2>/dev/null)"

if [[ -n "$charset" ]]; then
data="$("${SCRIPTS_DIR}/pwgen.sh" "$charset_length" "$charset" 2>/dev/null)"
else
data="$("${SCRIPTS_DIR}/pwgen.sh" "$charset_length" 2>/dev/null)"
fi

# good ol' bash 3 compat for macOS
eval "${data_var}=\"${data}\""
# return 0 because we need to write this out
Expand Down Expand Up @@ -367,4 +375,18 @@ find "${DEST_DIR}" -maxdepth 1 -mindepth 1 -type d | while read -r component; do
fi
done

echo "Checking keystone oidc passphrase Sealed Secret"
mkdir -p "${DEST_DIR}/keystone"

# Generate or retrieve passphrase
VARNAME_PASSPHRASE="OS_SSO_PASSPHRASE"
SECRET_PASSPHRASE="sso-passphrase"

load_or_gen_os_secret "${VARNAME_PASSPHRASE}" "${SECRET_PASSPHRASE}" "A-Za-z" && \
create_os_secret "PASSPHRASE" "keystone" "passphrase"

# Export for Helm templating if needed
export OS_SSO_PASSPHRASE


exit 0
9 changes: 8 additions & 1 deletion scripts/pwgen.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/bin/sh -e

export LC_ALL=C
dd bs=512 if=/dev/urandom count=1 | tr -dc _A-Z-a-z-0-9 | head -c${1:-32}

# Default password length (32 characters)
LENGTH="${1:-32}"

# Default character set (alphanumeric + special characters)
CHARSET="${2:-_A-Z-a-z-0-9}"

dd bs=512 if=/dev/urandom count=1 2>/dev/null | tr -dc "$CHARSET" | head -c"$LENGTH"
echo