LLM/n8n-install
1
0
Fork 0
mirror of https://github.com/kossakovsky/n8n-install.git synced 2026-05-02 04:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor WAHA API key generation in 03_generate_secrets.sh to ensure it occurs after .env write/substitutions. This change prevents overwriting existing values and maintains the integrity of generated secrets.

Browse Source
This commit is contained in:
Yury Kossakovsky
2025-10-15 12:51:12 -06:00
parent 5037bc6d16
commit fd96208619
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/03_generate_secrets.sh
View File

@@ -428,22 +428,7 @@ for var in "FLOWISE_USERNAME" "DASHBOARD_USERNAME" "LETSENCRYPT_EMAIL" "RUN_N8N_
fi
done
# --- WAHA API KEY (sha512) ---
# Generate plaintext API key if missing, then compute sha512:HEX and store in WAHA_API_KEY
if [[ -z "${generated_values[WAHA_API_KEY_PLAIN]}" && -z "${WAHA_API_KEY_PLAIN}" ]]; then
generated_values[WAHA_API_KEY_PLAIN]="$(gen_base64 48 | tr -d '\n' | tr '/+' 'AZ')"
fi
PLAINTEXT_KEY="${generated_values[WAHA_API_KEY_PLAIN]:-${WAHA_API_KEY_PLAIN}}"
if [[ -n "$PLAINTEXT_KEY" ]]; then
SHA_HEX="$(printf "%s" "$PLAINTEXT_KEY" | openssl dgst -sha512 | awk '{print $2}')"
if [[ -n "$SHA_HEX" ]]; then
generated_values[WAHA_API_KEY]="sha512:${SHA_HEX}"
fi
fi
_update_or_add_env_var "WAHA_API_KEY_PLAIN" "${generated_values[WAHA_API_KEY_PLAIN]}"
_update_or_add_env_var "WAHA_API_KEY" "${generated_values[WAHA_API_KEY]}"
# --- WAHA API KEY (sha512) --- (moved after .env write to avoid overwrite)
# Second pass: Substitute generated values referenced like ${VAR}
# We'll process the substitutions line by line to avoid escaping issues
@@ -516,6 +501,23 @@ for key in "${!generated_values[@]}"; do
rm -f "$value_file"
done
# --- WAHA API KEY (sha512) --- ensure after .env write/substitutions ---
# Generate plaintext API key if missing, then compute sha512:HEX and store in WAHA_API_KEY
if [[ -z "${generated_values[WAHA_API_KEY_PLAIN]}" ]]; then
generated_values[WAHA_API_KEY_PLAIN]="$(gen_base64 48 | tr -d '\n' | tr '/+' 'AZ')"
fi
PLAINTEXT_KEY="${generated_values[WAHA_API_KEY_PLAIN]}"
if [[ -n "$PLAINTEXT_KEY" ]]; then
SHA_HEX="$(printf "%s" "$PLAINTEXT_KEY" | openssl dgst -sha512 | awk '{print $2}')"
if [[ -n "$SHA_HEX" ]]; then
generated_values[WAHA_API_KEY]="sha512:${SHA_HEX}"
fi
fi
_update_or_add_env_var "WAHA_API_KEY_PLAIN" "${generated_values[WAHA_API_KEY_PLAIN]}"
_update_or_add_env_var "WAHA_API_KEY" "${generated_values[WAHA_API_KEY]}"
# Hash passwords using caddy with bcrypt
PROMETHEUS_PLAIN_PASS="${generated_values["PROMETHEUS_PASSWORD"]}"
SEARXNG_PLAIN_PASS="${generated_values["SEARXNG_PASSWORD"]}"