Commit b0840002 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Replace netcat with socat 

Replace netcat with socat
parents 1c68f9e2 fc3e65c4

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -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/

run/network.sh

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ if [[ "${DHCP}" == [Yy1]* ]]; then 
    echo "setTimeout(function(){ window.location.assign('http://\${IP}:\${PORT}'); }, 3000);</script>\""

    echo "HTML=\"<!DOCTYPE html><HTML><HEAD><TITLE>VirtualDSM</TITLE><STYLE>body { color: white; background-color: #125bdb; font-family: Verdana,\\"

    echo "Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }</STYLE></HEAD><BODY><BR><BR><H1><CENTER>\$BODY</CENTER></H1></BODY></HTML>\""

    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"

run/server.sh

+8 −8
Original line number Diff line number Diff line 
#!/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; }</STYLE></HEAD><BODY><BR><BR><H1><CENTER>$2</CENTER></H1></BODY></HTML>"



  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