laantungir/fips
1
0
Fork 0
mirror of https://github.com/jmcorgan/fips.git synced 2026-07-30 19:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix generate-configs.sh: use set_key/get_key for resolved keys

Browse Source 
The bash 3.2 compatibility fix (841b376) added set_key/get_key helpers
but didn't update the 6 call sites that still used RESOLVED_*[$key]
associative array syntax. Without declare -A, bash treats string
subscripts as arithmetic (evaluating to 0), so all nodes silently got
the last node's identity. Switch all references to the existing helpers.
This commit is contained in:
Johnathan Corgan
2026-02-18 21:38:57 +00:00
parent 841b376653
commit 2964a71ea7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/docker-network/scripts/generate-configs.sh
+8 -6
View File
@@ -81,7 +81,7 @@ generate_peer_block() {
local topology_file="$1"
local peer_id="$2"
local peer_npub="${RESOLVED_NPUB[$peer_id]}"
local peer_npub="$(get_key RESOLVED_NPUB "$peer_id")"
local peer_ip=$(get_node_attr "$topology_file" "$peer_id" "address")
cat <<EOF
@@ -99,8 +99,10 @@ generate_config() {
local topology_file="$2"
local output_file="$3"
local node_npub="${RESOLVED_NPUB[$node_id]}"
local node_nsec="${RESOLVED_NSEC[$node_id]}"
local node_npub
node_npub="$(get_key RESOLVED_NPUB "$node_id")"
local node_nsec
node_nsec="$(get_key RESOLVED_NSEC "$node_id")"
local peers=$(get_peers "$topology_file" "$node_id")
# Generate peers section
@@ -164,8 +166,8 @@ generate_topology() {
for node_id in $(get_node_ids "$topology_file"); do
local keys=""
keys=$(resolve_keys "$topology_file" "$node_id")
RESOLVED_NSEC[$node_id]=$(echo "$keys" | grep "^nsec=" | cut -d= -f2)
RESOLVED_NPUB[$node_id]=$(echo "$keys" | grep "^npub=" | cut -d= -f2)
set_key RESOLVED_NSEC "$node_id" "$(echo "$keys" | grep "^nsec=" | cut -d= -f2)"
set_key RESOLVED_NPUB "$node_id" "$(echo "$keys" | grep "^npub=" | cut -d= -f2)"
done
# Phase 2: generate config files for docker nodes
@@ -189,7 +191,7 @@ generate_topology() {
fi
for node_id in $(get_node_ids "$topology_file"); do
local var_name="NPUB_$(echo "$node_id" | tr '[:lower:]' '[:upper:]')"
echo "${var_name}=${RESOLVED_NPUB[$node_id]}" >> "$env_file"
echo "${var_name}=$(get_key RESOLVED_NPUB "$node_id")" >> "$env_file"
done
echo " ✓ Generated $env_file"
}