testing

piawg.sh

@@ -98,7 +98,7 @@ pia_addkey() {
 			--cacert ./ca.rsa.4096.crt \
 			--data-urlencode "pt=$pia_token" \
 			--data-urlencode "pubkey=$piawg_pubkey" \
-			"https://$server_cn:1337/addKey"
+			"https://$server_cn:$server_port/addKey"
 	); then
 		err "Failed connect to $server_cn to addKey"
 	fi
@@ -352,6 +352,7 @@ wg_reply="$(bao_curl "$BAO_KV_MOUNT/data/$BAO_PATH_CONFIG")"
 server_ip="$(printf '%s' "$wg_reply" | jq -r .data.data.server_ip)"
 server_cn="$(printf '%s' "$wg_reply" | jq -r .data.data.server_cn)"
 server_port="$(printf '%s' "$wg_reply" | jq -r .data.data.server_port)"
+server_vip="$(printf '%s' "$wg_reply" | jq -r .data.data.server_vip)"
 debug -f "Config from OpenBao ($BAO_PATH_CONFIG)\n%s" \
 	"$(printf '%s' "$wg_reply" | jq .)"
 unset wg_reply
@@ -382,3 +383,22 @@ else
 		fi
 	fi
 fi
+
+if conf_reply="$(bao_curl "$BAO_KV_MOUNT/data/$BAO_PATH_CONFIG")"; then
+	port_forward="$(printf '%s' "$conf_reply" | jq -r '.data.data.port_forward')"
+	if [ "$port_forward" = "true" ]; then
+		server_cn="$(printf '%s' "$conf_reply" | jq -r '.data.data.server_cn')"
+		server_vip="$(printf '%s' "$conf_reply" | jq -r '.data.data.server_vip')"
+		set -x
+		if ! pf_sig_reply="$(_curl -G --cacert ./ca.rsa.4096.crt \
+			--resolve "$server_cn:19999:$server_vip" \
+			--data-urlencode "token=$pia_token" \
+			"https://$server_cn:19999/getSignature")"; then
+			err "Failed to connect to https://$server_cn:19999/getSignature"
+		fi
+		set +x
+		debug -f "getSignature\n%s" "$(printf '%s' "$pf_sig_reply" | jq .)"
+	fi
+fi
+debug -f "Check for port_forward value in OpenBao ($BAO_PATH_CONFIG)\n%s" \
+	"$(printf '%s' "$conf_reply" | jq .)"