Ignore query when parsing URL params

if a route contained a static string with the same name as one
of the named params, said string would overwrite the payload from
the previous named param. this commit adds a check for `:` in the
template to prevent this

config/master_example.sh

@@ -21,9 +21,9 @@ cfg[ssl_cert]=''
 cfg[ssl_key]=''
 
 cfg[extension]='shs'
-cfg[extra_headers]='server: HTTP.sh/0.94 (devel)'
+cfg[extra_headers]='server: HTTP.sh/0.95 (devel)'
 
-cfg[title]='HTTP.sh 0.94'
+cfg[title]='HTTP.sh 0.95'
 
 cfg[php_enabled]=false # enable PHP script evalutaion (requires PHP)
 cfg[python_enabled]=false # enable Python script evalutaion (requires Python)

http.sh

@@ -3,7 +3,7 @@ trap ctrl_c INT
 
 if [[ ! -f "config/master.sh" ]]; then
 	mkdir -p config
-	cat <<MaeIsCute > "config/master.sh"
+	cat <<EOF > "config/master.sh"
 declare -A cfg
 
 cfg[ip]=0.0.0.0 # IP address to bind to - use 0.0.0.0 to bind to all
@@ -19,7 +19,7 @@ cfg[index]='index.shs'
 cfg[autoindex]=true
 
 cfg[auth_required]=false
-cfg[auth_realm]="Luna is cute <3"
+cfg[auth_realm]="asdf"
 
 cfg[ssl]=false # enables/disables listening on HTTPS
 cfg[ssl_port]=8443
@@ -27,9 +27,9 @@ cfg[ssl_cert]=''
 cfg[ssl_key]=''
 
 cfg[extension]='shs'
-cfg[extra_headers]='server: HTTP.sh/0.94 (devel)'
+cfg[extra_headers]='server: HTTP.sh/0.95 (devel)'
 
-cfg[title]='HTTP.sh 0.94'
+cfg[title]='HTTP.sh 0.95'
 
 cfg[php_enabled]=false # enable PHP script evalutaion (requires PHP)
 cfg[python_enabled]=false # enable Python script evalutaion (requires Python)
@@ -46,7 +46,7 @@ cfg[mail_server]=""
 cfg[mail_password]=""
 cfg[mail_ssl]=true
 cfg[mail_ignore_bad_cert]=false
-MaeIsCute
+EOF
 fi
 
 source config/master.sh
@@ -89,22 +89,24 @@ if [[ $error == true ]]; then
 fi
 
 if [[ $1 == "init" ]]; then # will get replaced with proper parameter parsing in 1.0
+	#set -e
+	
 	mkdir -p "${cfg[namespace]}/${cfg[root]}" "${cfg[namespace]}/workers/example" "${cfg[namespace]}/views" "${cfg[namespace]}/templates"
 	touch "${cfg[namespace]}/config.sh" "${cfg[namespace]}/workers/example/control"
-	cat <<LauraIsCute > "${cfg[namespace]}/config.sh"
+	cat <<EOF > "${cfg[namespace]}/config.sh"
 ## app config
 ## your application-specific config goes here!
 
-
 # worker_add example 5
-LauraIsCute
+cfg[enable_multipart]=false # by default, uploading files is disabled
+EOF
 
-	cat <<LauraIsCute > "${cfg[namespace]}/workers/example/worker.sh"
+	cat <<EOF > "${cfg[namespace]}/workers/example/worker.sh"
 #!/usr/bin/env bash
 date
-LauraIsCute
+EOF
 
-	cat <<LauraIsCute > "${cfg[namespace]}/${cfg[root]}/index.shs"
+	cat <<EOF > "${cfg[namespace]}/${cfg[root]}/index.shs"
 #!/usr/bin/env bash
 source templates/head.sh
 echo "<h1>Hello from HTTP.sh!</h1><br>To get started with your app, check out $(pwd)/${cfg[namespace]}/
@@ -119,40 +121,39 @@ echo "<h1>Hello from HTTP.sh!</h1><br>To get started with your app, check out $(
 	 <li>$(pwd)/config/<hostname> - config loaded if a request is made to a specific hostname</li>
 	 <li>$(pwd)/storage/ - directory for storing all and any data your app may produce</li>
 	 <li>$(pwd)/secret/ - user accounts and other secret tokens live here</li>
-	 <li>$(pwd)/src/ - HTTP.sh src, feel free to poke around ;P</li></ul> 
-	 &copy; sdomi, ptrcnull, selfisekai - 2020, 2021"
-LauraIsCute
-	cat <<MaeIsCute > "${cfg[namespace]}/routes.sh"
+	 <li>$(pwd)/src/ - HTTP.sh src, feel free to poke around ;P</li></ul>"
+EOF
+	cat <<EOF > "${cfg[namespace]}/routes.sh"
 ## routes - application-specific routes
 ##
 ## HTTP.sh supports both serving files using a directory structure (webroot),
 ## and using routes. The latter may come in handy if you want to create nicer
 ## paths, e.g.
 ##
-## (webroot) https://example.com/profile.shs?name=ptrcnull
+## (webroot) https://example.com/profile.shs?name=asdf
 ## ... may become ...
-## (routes)  https://example.com/profile/ptrcnull
+## (routes)  https://example.com/profile/asdf
 ##
 ## To set up routes, define rules in this file (see below for examples)
 
 # router "/test" "app/views/test.shs"
 # router "/profile/:user" "app/views/user.shs"
-MaeIsCute
+EOF
 
 	chmod +x "${cfg[namespace]}/workers/example/worker.sh"
 	
-	echo -e "Success..?\nTry running ./http.sh now"
+	echo -e "Success..?\nTry running \`./http.sh\` now"
 	exit 0
 fi
 
-cat <<MaeIsCute >&2
+cat <<EOF >&2
  _    _ _______ _______ _____  ______ _    _ 
 | |  | |_______|_______|  _  \/  ___/| |  | |
 | |__| |  | |     | |  | |_| | |___  | |__| |
 | |__| |  | |     | |  |  ___/\___ \ | |__| |
 | |  | |  | |     | |  | |     ___\ \| |  | |
 |_|  |_|  |_|     |_|  |_|  □ /_____/|_|  |_|
-MaeIsCute
+EOF
 
 if [[ "$1" == "debug" ]]; then
 	cfg[dbg]=true
@@ -181,9 +182,16 @@ else
 		# this is a workaround because ncat kept messing up large (<150KB) files over HTTP - but not over HTTPS!
 		socket=$(mktemp -u /tmp/socket.XXXXXX)
 		if [[ ${cfg[dbg]} == true ]]; then
-			ncat -l -U "$socket" -c src/server.sh -k &
+			# ncat with the "timeout" (-i) option has a bug which forces it
+			# to quit after the first time-outed connection, ignoring the
+			# "broker" (-k) mode. This is a workaround for this. 
+			while true; do
+				ncat -i 600s -l -U "$socket" -c src/server.sh -k
+			done &
 		else
-			ncat -l -U "$socket" -c src/server.sh -k 2>> /dev/null &
+			while true; do
+				ncat -i 600s -l -U "$socket" -c src/server.sh -k 2>> /dev/null &
+			done &
 		fi
 		socat TCP-LISTEN:${cfg[port]},fork,bind=${cfg[ip]} UNIX-CLIENT:$socket &
 		echo "[HTTP] listening on ${cfg[ip]}:${cfg[port]} through '$socket'"
@@ -192,9 +200,13 @@ else
 	if [[ ${cfg[ssl]} == true ]]; then
 		echo "[SSL] listening on port ${cfg[ip]}:${cfg[ssl_port]}"
 		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]}") &
+			while true; do
+				ncat -i 600s -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]}")
+			done &
 		else
-			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 &
+			while true; do
+				ncat -i 600s -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
+			done &
 		fi
 	fi
 fi

src/misc.sh

@@ -55,3 +55,9 @@ function url_encode() {
 function url_decode() {
 	echo -ne "$(sed -E 's/%[0-1][0-9a-f]//g;s/%/\\x/g' <<< "$1")"
 }
+
+# bogus function!
+# this is here to prevent "command not found" errors in debug mode
+function worker_add() {
+	:
+}

src/response/200.sh

@@ -1,14 +1,22 @@
-if [[ "${cfg[unbuffered]}" != true ]]; then
-	printf "HTTP/1.0 200 OK
-${cfg[extra_headers]}\r\n"
-else
-	echo "uh oh - we're running unbuffered" > /dev/stderr
-fi
-
-if [[ ${r[status]} == 200 ]]; then
-	get_mime "${r[uri]}"
-	[[ "$mimetype" != '' ]] && printf "content-type: $mimetype\r\n"
-fi
+function __headers() {
+	if [[ "${cfg[unbuffered]}" != true ]]; then
+		if [[ "${r[headers]}" == *'Location'* ]]; then
+			printf "HTTP/1.0 302 aaaaa\r\n"	
+		else
+			printf "HTTP/1.0 200 OK\r\n"
+		fi
+		[[ "${r[headers]}" != '' ]] && printf "${r[headers]}"
+		printf "${cfg[extra_headers]}\r\n"
+	else
+		echo "uh oh - we're running unbuffered" > /dev/stderr
+	fi
+	
+	if [[ ${r[status]} == 200 ]]; then
+		get_mime "${r[uri]}"
+		[[ "$mimetype" != '' ]] && printf "content-type: $mimetype\r\n"
+	fi
+	printf "\r\n"
+}
 
 if [[ ${r[status]} == 212 ]]; then
 	if [[ "${cfg[unbuffered]}" == true ]]; then
@@ -16,7 +24,7 @@ if [[ ${r[status]} == 212 ]]; then
 	else
 		temp=$(mktemp)
 		source "${r[view]}" > $temp
-		[[ "${r[headers]}" != '' ]] && printf "${r[headers]}\r\n" || printf "\r\n"
+		__headers
 		cat $temp
 		rm $temp
 	fi
@@ -24,21 +32,21 @@ if [[ ${r[status]} == 212 ]]; then
 elif [[ "${cfg[php_enabled]}" == true && "${r[uri]}" =~ ".php" ]]; then
 	temp=$(mktemp)
 	php "${r[uri]}" "$(get_dump)" "$(post_dump)" > $temp
-	[[ "${r[headers]}" != '' ]] && printf "${r[headers]}\r\n" || printf "\r\n"
+	__headers
 	cat $temp
 	rm $temp
 
 elif [[ "${cfg[python_enabled]}" == true && "${r[uri]}" =~ ".py" ]]; then
 	temp=$(mktemp)
 	python "${r[uri]}" "$(get_dump)" "$(post_dump)" > $temp
-	[[ "${r[headers]}" != '' ]] && printf "${r[headers]}\r\n" || printf "\r\n"
+	__headers
 	cat $temp
 	rm $temp
 
 elif [[ "${r[uri]}" =~ \.${cfg[extension]}$ ]]; then
 	temp=$(mktemp)
 	source "${r[uri]}" > $temp
-	[[ "${r[headers]}" != '' ]] && printf "${r[headers]}\r\n" || printf "\r\n"
+	__headers
 	if [[ "${cfg[encoding]}" != '' ]]; then
 		iconv $temp -f UTF-8 -t "${cfg[encoding]}"
 	else
@@ -47,7 +55,7 @@ elif [[ "${r[uri]}" =~ \.${cfg[extension]}$ ]]; then
 	rm $temp
 
 else
-	printf "\r\n"
+	__headers
 	if [[ "$mimetype" == "text/"* && "${cfg[encoding]}" != '' ]]; then
 		iconv "${r[uri]}" -f UTF-8 -t "${cfg[encoding]}"
 	else

src/server.sh

@@ -84,8 +84,8 @@ while read -r param; do
 			data="$(sed -E 's/\?/<2F><>Lun4_iS_CuTe<54>/;s/^(.*)<29><>Lun4_iS_CuTe<54>//' <<< "${r[url]}")"
 			IFS='&'
 			for i in $data; do
-				name="$(sed -E 's/\=(.*)$//' <<< "$i")"
-				value="$(sed "s/$name\=//" <<< "$i")"
+				name="${i/=*/}"
+				value="${i/*=/}"
 				get_data[$name]="$value"
 			done
 		fi
@@ -99,8 +99,8 @@ while read -r param; do
 			data="$(sed -E 's/\?/<2F><>Lun4_iS_CuTe<54>/;s/^(.*)<29><>Lun4_iS_CuTe<54>//' <<< "${r[url]}")"
 			IFS='&'
 			for i in $data; do
-				name="$(sed -E 's/\=(.*)$//' <<< "$i")"
-				value="$(sed "s/$name\=//" <<< "$i")"
+				name="${i/=*/}"
+				value="${i/*=/}"
 				get_data[$name]="$value"
 			done
 		fi		
@@ -130,10 +130,10 @@ if [[ ${r[status]} != 101 ]]; then
 			r[view]="${route[$((i+2))]}"
 			IFS='/'
 			url=(${route[$i]})
-			url_=(${r[url]})
+			url_=($(cut -d '?' -f 1 <<< "${r[url]}"))
 			unset IFS
 			for (( j=0; j<${#url[@]}; j++ )); do
-				if [[ ${url_[$j]} != '' ]]; then
+				if [[ ${url_[$j]} != '' && ${url[$j]} == ":"* ]]; then
 					params[$(sed 's/://' <<< "${url[$j]}")]="${url_[$j]}"
 				fi
 			done
@@ -175,7 +175,7 @@ if [[ "${cfg[proxy]}" == true ]]; then
 	r[status]=211
 fi
 
-if [[ "${r[post]}" == true && "${r[status]}" == 200 ]] || [[ "${r[post]}" == true && "${r[status]}" == 212 ]]; then
+if [[ "${r[post]}" == true ]] && [[ "${r[status]}" == 200 ||  "${r[status]}" == 212 ]]; then
 	# This whole ordeal is here to prevent passing binary data as a variable.
 	# I could have done it as an array, but this solution works, and it's
 	# speedy enough so I don't care.
@@ -209,8 +209,8 @@ if [[ "${r[post]}" == true && "${r[status]}" == 200 ]] || [[ "${r[post]}" == tru
 		
 		IFS='&'
 		for i in $(tr -d '\n' <<< "$data"); do
-			name="$(sed -E 's/\=(.*)$//' <<< "$i")"
-			param="$(sed "s/$name\=//" <<< "$i")"
+			name="${i/=*/}"
+			param="${i/*=/}"
 			post_data[$name]="$param"
 		done
 		unset IFS

src/template.sh

@@ -1,22 +1,72 @@
 #!/usr/bin/env bash
 # template.sh - basic templating engine
 
-# render(array, template_file)
+# nightmare fuel
+# render(array, template_file, recurse)
 function render() {
-	local template="$(cat "$2")"
+	if [[ "$3" != true ]]; then
+		local template="$(tr -d $'\01'$'\02' < "$2" | sed 's/\&/<2F>UwU<77>/g')"
+	else
+		local template="$(cat "$2" | sed -E 's/\\/\\\\/g')"
+	fi
 	local -n ref=$1
 	local tmp=$(mktemp)
+
+	local key
 	for key in ${!ref[@]}; do
-		if [[ "${ref[$key]}" != "" ]]; then
-			local value="$(html_encode "${ref[$key]}" | sed -E 's/\&/<2F>UwU<77>/g')"
-			echo 's/\{\{\.'"$key"'\}\}/'"$value"'/g' >> "$tmp"
+		if [[ "$key" == "_"* ]]; then # iter mode
+			local subtemplate=$(mktemp)
+			echo "$template" | grep "{{start $key}}" -A99999 | grep "{{end $key}}" -B99999 | tr '\n' $'\01' > "$subtemplate"
+
+			echo 's'$'\02''\{\{start '"$key"'\}\}.*\{\{end '"$key"'\}\}'$'\02''\{\{'"$key"'\}\}'$'\02'';' >> "$tmp"
+
+			local -n asdf=${ref[$key]}
+			local j
+			local value=''
+			for j in ${!asdf[@]}; do
+				local -n fdsa=_${asdf[$j]}
+
+				value+="$(render fdsa "$subtemplate" true)"
+			done
+			value="$(sed -E 's'$'\02''\{\{start '"$key"'\}\}'$'\02'$'\02'';s'$'\02''\{\{end '"$key"'\}\}'$'\02'$'\02' <<< "$value")"
+
+			echo 's'$'\02''\{\{'"$key"'\}\}'$'\02'''"$value"''$'\02'';' >> "$tmp"
+			rm "$subtemplate"
+		elif [[ "$key" == "@"* && "${ref[$key]}" != '' ]]; then
+			local value="$(sed -E 's/\&/<2F>UwU<77>/g' <<< "${ref[$key]}")"
+			echo 's'$'\02''\{\{\'"$key"'\}\}'$'\02'''"$value"''$'\02''g;' >> "$tmp"
+		elif [[ "$key" == '?'* ]]; then
+			local _key="\\?${key/?/}"
+
+			local subtemplate=$(mktemp)
+			echo 's'$'\02''\{\{start '"$_key"'\}\}((.*)\{\{else '"$_key"'\}\}.*\{\{end '"$_key"'\}\}|(.*)\{\{end '"$_key"'\}\})'$'\02''\2\3'$'\02'';' >> "$subtemplate"
+			cat <<< $(cat "$subtemplate" "$tmp") > "$tmp" # call that cat abuse
+
+			rm "$subtemplate"
+		elif [[ "${ref[$key]}" != "" ]]; then
+			echo "VALUE: ${ref[$key]}" > /dev/stderr
+			if [[ "$3" != true ]]; then
+				local value="$(html_encode <<< "${ref[$key]}" | sed -E 's/\&/<2F>UwU<77>/g')"
+			else
+				local value="$(sed -E 's/\\\\/<2F>OwO<77>/g;s/\\//g;s/<2F>OwO<77>/\\/g' <<< "${ref[$key]}" | html_encode | sed -E 's/\&/<2F>UwU<77>/g')"
+			fi
+			echo 's'$'\02''\{\{\.'"$key"'\}\}'$'\02'''"$value"''$'\02''g;' >> "$tmp"
 		else
-			echo 's/\{\{\.'"$key"'\}\}//g' >> "$tmp"
+			echo 's'$'\02''\{\{\.'"$key"'\}\}'$'\02'$'\02''g;' >> "$tmp"
 		fi
 	done
-	template="$(sed -E -f "$tmp" <<< "$template")"
-	sed -E 's/<2F>UwU<77>/\&/g' <<< "$template"
-	rm "$tmp"
+
+	if [[ "$3" != true ]]; then # are we recursing?
+		cat "$tmp" | tr '\n' $'\01' | sed -E 's/'$'\02'';'$'\01''/'$'\02'';/g;s/'$'\02''g;'$'\01''/'$'\02''g;/g' > "${tmp}_"
+		
+		echo 's/\{\{start \?([a-zA-Z0-9_-]*[^}])\}\}(.*\{\{else \?\1\}\}(.*)\{\{end \?\1\}\}|.*\{\{end \?\1\}\})/\3/g' >> "${tmp}_"
+		template="$(tr '\n' $'\01' <<< "$template" | sed -E -f "${tmp}_" | tr $'\01' '\n')"
+		sed -E 's/<2F>UwU<77>/\&/g' <<< "$template"
+		rm "$tmp" "${tmp}_"
+	else
+		tr '\n' $'\01' <<< "$template" | sed -E -f "$tmp" | tr $'\01' '\n'
+		rm "$tmp"
+	fi
 }
 
 # render_unsafe(array, template_file)
@@ -25,10 +75,53 @@ function render_unsafe() {
 	local -n ref=$1
 	local tmp=$(mktemp)
 	for key in ${!ref[@]}; do
-		local value="$(xxd -ps <<< "${ref[$key]}" | tr -d '\n' | sed -E 's/.{2}/\\x&/g')"
-		echo 's/\{\{\.'"$key"'\}\}/'"$value"'/g' >> "$tmp"
+		if [[ "$key" == "_"* ]]; then # iter mode
+			# grep "start _test" -A99999 | grep "end _test" -B99999
+			local -n item_array=${ref[$key]}
+			local value
+			for ((_i = 0; _i < ${#item_array[@]}; _i++)); do
+				value+="$(xxd -p <<< "${item_array[$_i]}" | tr -d '\n' | sed -E 's/../\\x&/g')"
+			done
+			echo 's/\{\{'"$key"'\}\}/'"$value"'/g' >> "$tmp"
+		else
+			local value="$(xxd -p <<< "${ref[$key]}" | tr -d '\n' | sed -E 's/../\\x&/g')"
+			echo 's/\{\{\.'"$key"'\}\}/'"$value"'/g' >> "$tmp"
+		fi
 	done
 
 	sed -E -f "$tmp" <<< "$template"
 	rm "$tmp"
 }
+
+
+# mmmm this should be a library because i am so much copying those later
+# _nested_random
+function _nested_random() {
+	dd if=/dev/urandom bs=1 count=16 status=none | xxd -p
+}
+
+# nested_declare(ref)
+function nested_declare() {
+	declare -g -a $1
+}
+
+# nested_add(ref, array)
+function nested_add() {
+	local nested_id=$(_nested_random)
+	declare -n nested_ref=$2
+	declare -g -A _$nested_id
+	
+	# poor man's array copy
+	for k in ${!nested_ref[@]}; do
+		declare -g -A _$nested_id[$k]="${nested_ref[$k]}"
+	done
+	
+	local -n ref=$1
+	ref+=("$nested_id")
+}
+
+# nested_get(ref, i)
+function nested_get() {
+	local -n ref=$1
+	declare -g -n res=_${ref[$2]}
+}