fix 1.23.4: normalize taler:// :443/:80 + mon scan all landings
Shared lib.sh normalize_taler_uri for ladder/e2e/pay. urls phase checks public bank/exchange/merchant intros and bank mint JSON for residual default ports (ERROR on GOA/local). Unit test included.
This commit is contained in:
parent
a103eeab9d
commit
d420043863
10 changed files with 225 additions and 12 deletions
12
check_e2e.sh
12
check_e2e.sh
|
|
@ -944,7 +944,7 @@ e2e_one_withdraw() {
|
|||
"$BANK/accounts/${USER}/withdrawals"
|
||||
WID=$(python3 -c 'import json;d=json.load(open("'"$SCRATCH"'/wd-'"$tag"'.json"));print(d.get("withdrawal_id") or d.get("id") or "")' 2>/dev/null || true)
|
||||
URI=$(python3 -c 'import json;d=json.load(open("'"$SCRATCH"'/wd-'"$tag"'.json"));print(d.get("taler_withdraw_uri") or "")' 2>/dev/null || true)
|
||||
URI_CLEAN=$(python3 -c 'import json;u=json.load(open("'"$SCRATCH"'/wd-'"$tag"'.json")).get("taler_withdraw_uri") or "";print(u.replace(":443/","/"))' 2>/dev/null || true)
|
||||
URI_CLEAN=$(normalize_taler_uri "$URI")
|
||||
if [ -z "$WID" ] || [ -z "$URI_CLEAN" ]; then
|
||||
warn "Bank withdraw $WITHDRAW_AMT" "create failed — $(head -c 80 "$SCRATCH/wd-$tag.json" | tr '\n' ' ')"
|
||||
return 1
|
||||
|
|
@ -952,13 +952,13 @@ e2e_one_withdraw() {
|
|||
ok "Bank withdrawal created $WITHDRAW_AMT ($WID)"
|
||||
cp "$SCRATCH/wd-$tag.json" "$SCRATCH/wd.json"
|
||||
|
||||
USE_URI="$URI"
|
||||
[ -z "$USE_URI" ] && USE_URI="$URI_CLEAN"
|
||||
# Always prefer stripped URI (libeufin often emits host:443)
|
||||
USE_URI="${URI_CLEAN:-$URI}"
|
||||
if wcli withdraw accept-uri --exchange "${EXCHANGE_PUBLIC}/" "$USE_URI" >"$SCRATCH/accept-$tag.out" 2>&1; then
|
||||
ok "wallet accept $WITHDRAW_AMT"
|
||||
elif [ "$USE_URI" != "$URI_CLEAN" ] && [ -n "$URI_CLEAN" ] \
|
||||
&& wcli withdraw accept-uri --exchange "${EXCHANGE_PUBLIC}/" "$URI_CLEAN" >"$SCRATCH/accept-$tag.out" 2>&1; then
|
||||
ok "wallet accept $WITHDRAW_AMT (no :443)"
|
||||
elif [ -n "$URI" ] && [ "$USE_URI" != "$URI" ] \
|
||||
&& wcli withdraw accept-uri --exchange "${EXCHANGE_PUBLIC}/" "$URI" >"$SCRATCH/accept-$tag.out" 2>&1; then
|
||||
ok "wallet accept $WITHDRAW_AMT (raw URI fallback)"
|
||||
else
|
||||
# Prefer the real Error/ENOENT line over noise (perl -e source, stack frames)
|
||||
_acc_err=$(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue