From fe02fa38a306ff9f17383a9fa3f66d925e09843a Mon Sep 17 00:00:00 2001
From: Dominika Liberda <sdomi@sakamoto.pl>
Date: Fri, 1 Jan 2021 07:15:51 +0100
Subject: [PATCH] + debug mode; - potential RCE bug, problems with '!'

---
 http.sh             | 16 ++++++++++++----
 src/mime.sh         |  4 ++--
 src/response/200.sh |  4 ++--
 src/server.sh       |  1 -
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/http.sh b/http.sh
index 8f3221d..16e36e0 100755
--- a/http.sh
+++ b/http.sh
@@ -66,6 +66,10 @@ LauraIsCute
 	exit 0
 fi
 
+if [[ $1 == "debug" ]]; then
+	cfg[dbg]=true
+fi
+
 source src/worker.sh
 
 if [[ -f "${cfg[namespace]}/config.sh" ]]; then
@@ -75,7 +79,11 @@ fi
 if [[ ${cfg[http]} == true ]]; then
 	# this is a workaround because ncat kept messing up large (<150KB) files over HTTP - but not over HTTPS!
 	socket=$(mktemp -u /tmp/XXXX.socket)
-	ncat -l -U "$socket" -c src/server.sh -k 2>> /dev/null &
+	if [[ ${cfg[dbg]} == true ]]; then
+		ncat -l -U "$socket" -c src/server.sh -k &
+	else
+		ncat -l -U "$socket" -c src/server.sh -k 2>> /dev/null &
+	fi
 	socat TCP-LISTEN:${cfg[port]},fork,bind=${cfg[ip]} UNIX-CLIENT:$socket &
 	echo "[HTTP] listening on ${cfg[ip]}:${cfg[port]} through '$socket'"
 	#ncat -v -l ${cfg[ip]} ${cfg[port]} -c ./src/server.sh -k 2>> /dev/null &
@@ -83,10 +91,10 @@ fi
 
 if [[ ${cfg[ssl]} == true ]]; then
 	echo "[SSL] listening on port ${cfg[ip]}:${cfg[ssl_port]}"
-	if [[ ${cfg[ssl_key]} != '' && ${cfg[ssl_cert]} != '' ]]; then
-		ncat -l ${cfg[ip]} ${cfg[ssl_port]} -c ./src/server.sh -k --ssl --ssl-cert ${cfg[ssl_cert]} --ssl-key ${cfg[ssl_key]} 2>> /dev/null &
+	if [[ ${cfg[dbg]} == true ]]; then
+		ncat -l ${cfg[ip]} ${cfg[ssl_port]} -c src/server.sh -k --ssl $([[ ${cfg[ssl_key]} != '' && ${cfg[ssl_cert]} != '' ]] && echo "--ssl-cert ${cfg[ssl_cert]} --ssl-key ${cfg[ssl_key]}") &
 	else
-		ncat -l ${cfg[ip]} ${cfg[ssl_port]} -c ./src/server.sh -k --ssl 2>> /dev/null &
+		ncat -l ${cfg[ip]} ${cfg[ssl_port]} -c src/server.sh -k --ssl $([[ ${cfg[ssl_key]} != '' && ${cfg[ssl_cert]} != '' ]] && echo "--ssl-cert ${cfg[ssl_cert]} --ssl-key ${cfg[ssl_key]}") 2>> /dev/null &
 	fi
 fi
 
diff --git a/src/mime.sh b/src/mime.sh
index 45cb44f..f5b5a02 100755
--- a/src/mime.sh
+++ b/src/mime.sh
@@ -13,8 +13,8 @@
 # Python (.py) -> no content-type
 
 function get_mime() {
-	local file=$@
-	local mime=$(file --mime-type -b $file)
+	local file="$@"
+	local mime="$(file --mime-type -b "$file")"
 	if [[ $file == *".htm" || $file == *".html" ]]; then
 		content_type="text/html"
 		return 0
diff --git a/src/response/200.sh b/src/response/200.sh
index ed2b0d0..c6d717e 100755
--- a/src/response/200.sh
+++ b/src/response/200.sh
@@ -1,6 +1,6 @@
 printf "HTTP/1.0 200 OK
 ${cfg[extra_headers]}\r\n"
-get_mime ${r[uri]}
+get_mime "${r[uri]}"
 [[ $content_type != '' ]] && printf "content-type: $content_type\r\n"
 
 if [[ ${cfg[php_enabled]} == true && ${r[uri]} =~ ".php" ]]; then
@@ -27,5 +27,5 @@ elif [[ ${r[uri]} =~ \.${cfg[extension]}$ ]]; then
 else
 	printf "\r\n"
 	cat "${r[uri]}"
+	
 fi
-
diff --git a/src/server.sh b/src/server.sh
index 9dcac5d..be146ab 100755
--- a/src/server.sh
+++ b/src/server.sh
@@ -106,7 +106,6 @@ fi
 
 echo "$(date) - IP: ${r[ip]}, PROTO: ${r[proto]}, URL: ${r[url]}, GET_data: ${get_data[@]}, POST_data: ${post_data[@]}, POST_multipart: ${post_multipart[@]}" >> "${cfg[namespace]}/${cfg[log]}"
 
-
 if [[ ${r[status]} != 101 ]]; then
 	if [[ -a ${r[uri]} && ! -r ${r[uri]} ]]; then
 		r[status]=403