Prevent Address in use error

Use dynamic listening port (assigned from system), detect it from process by calling lsof.
latchset · May 8, 2024 · a7de265 · a7de265
1 parent d579f02
commit a7de265
Show file tree

Hide file tree

Showing 24 changed files with 121 additions and 90 deletions.
diff --git a/.github/workflows/install-dependencies b/.github/workflows/install-dependencies
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-COMMON="meson curl git make file bzip2 jose tang cryptsetup keyutils jq socat ${CC}"
+COMMON="meson curl git make file bzip2 jose tang cryptsetup keyutils jq socat lsof ${CC}"
 
 case "${DISTRO}" in
 debian:*|ubuntu:*)
@@ -33,7 +33,7 @@ debian:*|ubuntu:*)
     printf 'max_parallel_downloads=10\nfastestmirror=1\n' >> /etc/dnf/dnf.conf
     dnf -y clean all
     dnf -y --setopt=deltarpm=0 update
-    dnf -y install dnf-utils jq socat cryptsetup keyutils cracklib-dicts
+    dnf -y install dnf-utils jq socat cryptsetup keyutils cracklib-dicts lsof
     dnf -y builddep clevis
     ;;
 

diff --git a/src/luks/tests/assume-yes b/src/luks/tests/assume-yes
@@ -33,8 +33,8 @@ trap 'on_exit' ERR
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 cfg=$(printf '{"url":"%s"}' "$url")

diff --git a/src/luks/tests/assume-yes-luks2 b/src/luks/tests/assume-yes-luks2
@@ -33,8 +33,8 @@ trap 'on_exit' ERR
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 cfg=$(printf '{"url":"%s"}' "$url")

diff --git a/src/luks/tests/bind-binary-keyfile-luks1 b/src/luks/tests/bind-binary-keyfile-luks1
@@ -33,8 +33,8 @@ trap 'on_exit' EXIT
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 ADV="${TMP}/adv.jws"

diff --git a/src/luks/tests/bind-luks1-avoid-luksmeta-corruption b/src/luks/tests/bind-luks1-avoid-luksmeta-corruption
@@ -37,8 +37,9 @@ DEV="${TMP}/luks1-device"
 new_device "luks1" "${DEV}"
 
 # TANG server specifics
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
+
 url="http://localhost:${port}"
 
 # Initial binding to ensure luksmeta gets corrupted

diff --git a/src/luks/tests/edit-tang-luks1 b/src/luks/tests/edit-tang-luks1
@@ -36,8 +36,8 @@ trap 'on_exit' ERR
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 
@@ -64,9 +64,9 @@ fi
 
 # Now let's have another tang instance running and change the config to use
 # the new one.
-port2=$(tang_new_random_port)
 TMP2="$(mktemp -d)"
-tang_run "${TMP2}" "${port2}"
+tang_run "${TMP2}"
+port2=$(tang_get_port "${TMP2}")
 new_url="http://localhost:${port2}"
 new_cfg=$(printf '{"url":"%s"}' "${new_url}")
 

diff --git a/src/luks/tests/edit-tang-luks2 b/src/luks/tests/edit-tang-luks2
@@ -36,8 +36,8 @@ trap 'on_exit' ERR
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 
@@ -64,9 +64,9 @@ fi
 
 # Now let's have another tang instance running and change the config to use
 # the new one.
-port2=$(tang_new_random_port)
 TMP2="$(mktemp -d)"
-tang_run "${TMP2}" "${port2}"
+tang_run "${TMP2}"
+port2=$(tang_get_port "${TMP2}")
 new_url="http://localhost:${port2}"
 new_cfg=$(printf '{"url":"%s"}' "${new_url}")
 

diff --git a/src/luks/tests/pass-tang-luks1 b/src/luks/tests/pass-tang-luks1
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/pass-tang-luks2 b/src/luks/tests/pass-tang-luks2
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/regen-inplace-luks1 b/src/luks/tests/regen-inplace-luks1
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/regen-inplace-luks2 b/src/luks/tests/regen-inplace-luks2
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/regen-not-inplace-luks1 b/src/luks/tests/regen-not-inplace-luks1
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 export TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/regen-not-inplace-luks2 b/src/luks/tests/regen-not-inplace-luks2
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 export TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/report-sss-luks1 b/src/luks/tests/report-sss-luks1
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/report-sss-luks2 b/src/luks/tests/report-sss-luks2
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/report-tang-luks1 b/src/luks/tests/report-tang-luks1
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/report-tang-luks2 b/src/luks/tests/report-tang-luks2
@@ -32,8 +32,8 @@ trap 'on_exit' EXIT
 
 TMP=$(mktemp -d)
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/unlock-arbitrary-parameter b/src/luks/tests/unlock-arbitrary-parameter
@@ -30,8 +30,8 @@ trap 'on_exit' ERR
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/unlock-tang-luks1 b/src/luks/tests/unlock-tang-luks1
@@ -33,8 +33,8 @@ trap 'on_exit' ERR
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/luks/tests/unlock-tang-luks2 b/src/luks/tests/unlock-tang-luks2
@@ -33,8 +33,8 @@ trap 'on_exit' ERR
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 adv="${TMP}/adv"

diff --git a/src/pins/tang/tests/default-thp-alg b/src/pins/tang/tests/default-thp-alg
@@ -34,8 +34,8 @@ trap 'on_exit' EXIT
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-tang_run "${TMP}" "${port}"
+tang_run "${TMP}"
+port=$(tang_get_port "${TMP}")
 
 url="http://localhost:${port}"
 data="just a sample text"

diff --git a/src/pins/tang/tests/pin-tang b/src/pins/tang/tests/pin-tang
@@ -31,9 +31,8 @@ trap 'on_exit' EXIT
 
 TMP="$(mktemp -d)"
 
-port=$(tang_new_random_port)
-
-tang_run "${TMP}" "${port}" sig exc
+tang_run "${TMP}" sig exc
+port=$(tang_get_port "${TMP}")
 
 thp="$(jose jwk thp -i "$TMP/db/sig.jwk")"
 adv="${TMP}/adv.jws"