dual use string functions (argument and pipe), make scripts of sed based functions...

[cgilite] / cgilite.sh

diff --git a/cgilite.sh b/cgilite.sh
index 46866266ea6f3250dd86106a00537a721da0a37f..e1b34802577a64c762d6f76828d8d992f90413cc 100755 (executable)
--- a/cgilite.sh
+++ b/cgilite.sh
@@ -50,7 +50,7 @@ HEX_DECODE(){
   ')"
 }
 
-if [ -z "$REQUEST_METHOD" -a -z "$SERVER_PROTOCOL" ]; then
+if [ -z "$REQUEST_METHOD" ]; then
   # no webserver variables means we are running via inetd / ncat
   # so use builtin web server
 
@@ -81,11 +81,16 @@ if [ -z "$REQUEST_METHOD" -a -z "$SERVER_PROTOCOL" ]; then
     # Without Content-Length header, connection will terminate after
     # script.
 
-    . "$0" |sed '1{s;^Status: ;HTTP/1.1 ;; t; s;^;HTTP/1.1 200 OK\r\n;;}' \
-    | while read -r l; do case $l in
-      Content-Length:*) printf '%s\n' "$l"; cat;;
-      $CR) printf 'Connection: close\r\n\r\n'; cat; exit 1;;
-      *) printf '%s\n' "$l";;
+    cgilite_status='200 OK'; cgilite_response=''; cgilite_cl="Connection: close${CR}";
+    . "$0" | while read -r l; do case $l in
+      Status:*) cgilite_status="${l#Status: }";;
+      Content-Length:*) cgilite_cl="${l}";;
+      $CR) printf '%s %s\r\n%s\n%s\n\r\n' \
+             'HTTP/1.1' "${cgilite_status%${CR}}" \
+             "$cgilite_response" "${cgilite_cl}"
+           cat
+           [ "${cgilite_cl#Connection}" = "${cgilite_cl}" ]; exit;;
+      *) cgilite_response="$cgilite_response${BR}$l";;
     esac; done || exit 0;
     (sleep $cgilite_timeout && kill $$) & cgilite_watchdog=$!
   done
@@ -140,7 +145,7 @@ HTML(){
   # HTML Entity Coding
   # Prints UTF-8 string as decimal Unicode Code Points
   # Useful for escaping user input for use in HTML text and attributes
-  printf %s "$*" \
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \
   | hexdump -ve '/1 "%03o\n"' \
   | while read n; do
     case $n in
@@ -163,27 +168,43 @@ URL(){
   # Code every character in URL escape hex format
   # except alphanumeric ascii
 
-  printf %s "$*" \
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \
   | hexdump -v -e '/1 ",%02X"' \
-  | tr , %
+  | sed 's;,;%;g; s;%2F;/;g;'
 }
 
+PATH(){
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \
+  | sed -r 's;^.*$;/&/;; s;/+;/;g;
+            :X;
+            s;^/\.\./;/;; s;/\./;/;g;
+            tX;
+            s;/[^/]+/\.\./;/;;
+            tX;
+            s;^(/.*)/$;\1;'
+}
+
+
 SET_COOKIE(){
+  local expire cookie
   case "$1" in
     ''|0|session) expire='';;
     [+-][0-9]*)   expire="$(date -R -d @$(($(date +%s) + $1)))";;
-    *)           expire="$(date -R -d "$1")";;
+    *)            expire="$(date -R -d "$1")";;
   esac
   cookie="$2"
-  
+
   printf 'Set-Cookie: %s' "$cookie"
-  [ -n "$expire" ] && printf '; Expires=%s' "$expire" 
+  [ -n "$expire" ] && printf '; Expires=%s' "${expire%+????}${expire:+GMT}"
   [ $# -ge 3 ] && shift 2 && printf '; %s' "$@"
   printf '\r\n'
 }
 
 REDIRECT(){
-  printf 'Status: 303 See Other\r\nLocation: %s\r\n\r\n' "$*"
+  printf '%s: %s\r\n' \
+    Status "303 See Other" \
+    Content-Length 0 \
+    Location "$*"
+  printf '\r\n'
   exit 0
 }
-