From 79321ac343440e48b330731828c56f6116adec5e Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 9 May 2023 00:41:05 +0200 Subject: [PATCH 1/4] Replace netcat with socat --- run/server.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/run/server.sh b/run/server.sh index b6a8a4e..06ab8f5 100644 --- a/run/server.sh +++ b/run/server.sh @@ -1,18 +1,19 @@ #!/usr/bin/env bash set -eu +TMP_FILE="" + stop() { trap - SIGINT EXIT - { pkill -f nc || true; } 2>/dev/null + { pkill -f socat || true; } 2>/dev/null + [ -f "$TMP_FILE" ] && rm -f "$TMP_FILE" } trap 'stop' EXIT SIGINT SIGTERM SIGHUP if [[ "$2" == "/"* ]]; then - while true ; do - nc -lp "${1:-5000}" -e "$2" & wait $! - done + socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"$2" 2> /dev/null & wait $! else @@ -20,10 +21,9 @@ else Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }

$2

" LENGTH="${#HTML}" - RESPONSE="HTTP/1.1 200 OK\nContent-Length: ${LENGTH}\nConnection: close\n\n$HTML\n\n" + TMP_FILE=$(mktemp -q /tmp/server.XXXXXX) - while true; do - echo -en "$RESPONSE" | nc -lp "${1:-5000}" & wait $! - done + echo -en "HTTP/1.1 200 OK\nContent-Length: ${LENGTH}\nConnection: close\n\n$HTML" > $TMP_FILE + socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"cat ${TMP_FILE}" 2> /dev/null & wait $! fi From c541e403224a4658b48a20c33dc06612fa1c889f Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 9 May 2023 00:45:21 +0200 Subject: [PATCH 2/4] Line ending --- run/network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/network.sh b/run/network.sh index 473d48c..4781009 100644 --- a/run/network.sh +++ b/run/network.sh @@ -238,7 +238,7 @@ if [[ "${DHCP}" == [Yy1]* ]]; then echo "setTimeout(function(){ window.location.assign('http://\${IP}:\${PORT}'); }, 3000);\"" echo "HTML=\"VirtualDSM

\$BODY

\"" - echo "LENGTH=\"\${#HTML}\"; RESPONSE=\"HTTP/1.1 200 OK\\nContent-Length: \${LENGTH}\\nConnection: close\\n\\n\$HTML\\n\\n\"" + echo "LENGTH=\"\${#HTML}\"; RESPONSE=\"HTTP/1.1 200 OK\\nContent-Length: \${LENGTH}\\nConnection: close\\n\\n\$HTML\"" echo "echo -e \"\$RESPONSE\"" } > "$SH_SCRIPT" From 14fd2666fc9a3af5c17148369c14e37db3f5d6ea Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 9 May 2023 00:50:46 +0200 Subject: [PATCH 3/4] Add netcat-openbsd --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0aaec57..58b98d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,15 +20,15 @@ RUN apt-get update && apt-get -y upgrade && \ fdisk \ unzip \ procps \ + dnsmasq \ xz-utils \ iptables \ iproute2 \ - dnsmasq \ net-tools \ btrfs-progs \ + netcat-openbsd \ ca-certificates \ qemu-system-x86 \ - netcat-traditional \ && apt-get clean COPY run/*.sh /run/ From fc3e65c414fd00650a863cbe39c3fd48b9e81abf Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 9 May 2023 00:58:15 +0200 Subject: [PATCH 4/4] Replace netcat with socat --- run/server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/server.sh b/run/server.sh index 06ab8f5..26c7722 100644 --- a/run/server.sh +++ b/run/server.sh @@ -23,7 +23,7 @@ else LENGTH="${#HTML}" TMP_FILE=$(mktemp -q /tmp/server.XXXXXX) - echo -en "HTTP/1.1 200 OK\nContent-Length: ${LENGTH}\nConnection: close\n\n$HTML" > $TMP_FILE + echo -en "HTTP/1.1 200 OK\nContent-Length: ${LENGTH}\nConnection: close\n\n$HTML" > "$TMP_FILE" socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"cat ${TMP_FILE}" 2> /dev/null & wait $! fi