X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=cgilite.sh;h=d6f2242130cf0b4cfdb9b266ca196d8847081da1;hp=8a2ee57292a3cffe60904e337eb2d0e0b2f5518e;hb=e292c85154624ea2496a3caae22ffc8df52d5838;hpb=df71d6cb43c25034a8922e02b5bb86adb1118d01 diff --git a/cgilite.sh b/cgilite.sh index 8a2ee57..d6f2242 100755 --- a/cgilite.sh +++ b/cgilite.sh @@ -19,66 +19,102 @@ # along with CGIlite. If not, see . # ksh and zsh workaround -set -o posix -o OCTAL_ZEROES 2>&- +# set -o posix # ksh, not portable +setopt -o OCTAL_ZEROES 2>&- + +BR="$(printf '\n')" +CR="$(printf '\r')" + +HEADER(){ + if [ -n "$cgilite_headers+x" ]; then + printf %s "$cgilite_headers" \ + | sed -rn 's;^'"${1}"': ([^\r]+)\r?$;\1;ip;q;' + else + eval $(printf 'printf $HTTP_'; printf '%s' "${1}" |tr '[a-z]-' '[A-Z]_') + fi +} + +if [ "$1" = '--inetd' -a -z "$REQUEST_METHOD" ]; then + REMOTE_ADDR="${TCPREMOTEIP:-$NCAT_REMOTE_ADDR}" + SERVER_NAME="${TCPLOCALIP:-$NCAT_LOCAL_ADDR}" + SERVER_PORT="${TCPLOCALPORT:-$NCAT_LOCAL_PORT}" + + read REQUEST_METHOD REQUEST_URI SERVER_PROTOCOL + PATH_INFO="${REQUEST_URI%\?*}" + QUERY_STRING="${REQUEST_URI#*\?}" + cgilite_headers="$(sed -u '/^\r\?$/q')" + + HTTP_CONTENT_LENGTH="$(HEADER Content-Length |grep -xE '[0-9]+')" + HTTP_COOKIE="$(HEADER Cookie)" + + export REMOTE_ADDR SERVER_NAME SERVER_PORT REQUEST_METHOD REQUEST_URI SERVER_PROTOCOL \ + PATH_INFO QUERY_STRING HTTP_CONTENT_LENGTH HTTP_COOKIE + + . "$0" |sed '1{s;^Status: ;HTTP/1.0 ;; t; iHTTP/1.0 200 OK\r + }' + exit $? +fi if [ "$REQUEST_METHOD" = POST -a "${HTTP_CONTENT_LENGTH:=${CONTENT_LENGTH:=0}}" -gt 0 ]; then cgilite_post="$(head -c "$HTTP_CONTENT_LENGTH")" fi +[ -n "${DEBUG+x}" ] && env + cgilite_count(){ - printf "$( - case $1 in - GET) printf %s "${QUERY_STRING}";; - POST) printf %s "?${cgilite_post}";; - REF) printf %s "?${HTTP_REFERER#*\?}";; - esac \ - | grep -Eo '[&?]'"$2"'=[^&]*' \ - | wc -l - )" + case $1 in + GET) printf %s "&${QUERY_STRING}";; + POST) printf %s "&${cgilite_post}";; + REF) printf %s "&${HTTP_REFERER#*\?}";; + esac \ + | grep -Eo '&'"$2"'=[^&]*' \ + | wc -l } cgilite_value(){ printf "$( case $1 in - GET) printf %s "${QUERY_STRING}";; - POST) printf %s "?${cgilite_post}";; - REF) printf %s "?${HTTP_REFERER#*\?}";; + GET) printf %s "&${QUERY_STRING}";; + POST) printf %s "&${cgilite_post}";; + REF) printf %s "&${HTTP_REFERER#*\?}";; esac \ - | grep -Eo '[&?]'"$2"'=[^&]*' \ - | sed -rn "${3:-1}"'{s;^[^=]+=;;; s;\+; ;g; s;\\;\\\\;g; s;%;\\x;g; p}' + | grep -Eo '&'"$2"'=[^&]*' \ + | sed -rn "${3:-1}"'{s;^[^=]+=;;; s;\+; ;g; s;\\;\\\\;g; + # Hexadecimal { %00 - %FF } will be transformed to octal { \000 - \377 } for posix printf + s;%[0123].;&\\0;g; s;%[4567].;&\\1;g; s;%[89AB].;&\\2;g; s;%[CDEF].;&\\3;g; + s;%[048C][0-7]\\.;&0;g; s;%[048C][89A-F]\\.;&1;g; s;%[159D][0-7]\\.;&2;g; s;%[159D][89A-F]\\.;&3;g; + s;%[26AE][0-7]\\.;&4;g; s;%[26AE][89A-F]\\.;&5;g; s;%[37BF][0-7]\\.;&6;g; s;%[37BF][89A-F]\\.;&7;g; + s;%.[08](\\..);\10;g; s;%.[19](\\..);\11;g; s;%.[2A](\\..);\12;g; s;%.[3B](\\..);\13;g; + s;%.[4C](\\..);\14;g; s;%.[5D](\\..);\15;g; s;%.[6E](\\..);\16;g; s;%.[7F](\\..);\17;g; + p}' )" } -GET(){ - cgilite_value GET $@ -} -GET_no(){ - cgilite_count GET $1 -} +GET(){ cgilite_value GET $@; } +GET_COUNT(){ cgilite_count GET $1; } -POST(){ - cgilite_value POST $@ -} -POST_no(){ - cgilite_count POST $1 -} +POST(){ cgilite_value POST $@; } +POST_COUNT(){ cgilite_count POST $1; } -REF(){ - cgilite_value REF $@ -} -REF_no(){ - cgilite_count REF $1 -} +REF(){ cgilite_value REF $@; } +REF_COUNT(){ cgilite_count REF $1; } COOKIE(){ printf "$( - printf %s " ${HTTP_COOKIE}" \ - | grep -Eo '[; ]'"$1"'=[^;]*' \ - | sed -rn "${2:-1}"'{s;^[^=]+=;;; s;\+; ;g; s;\\;\\\\;g; s;%;\\x;g; p}' + HEADER Cookie \ + | grep -oE '(^|; ?)'"$1"'=[^;]*' \ + | sed -rn "${2:-1}"'{s;^[^=]+=;;; s;\+; ;g; s;\\;\\\\;g; + # Hexadecimal { %00 - %FF } will be transformed to octal { \000 - \377 } for posix printf + s;%[0123].;&\\0;g; s;%[4567].;&\\1;g; s;%[89AB].;&\\2;g; s;%[CDEF].;&\\3;g; + s;%[048C][0-7]\\.;&0;g; s;%[048C][89A-F]\\.;&1;g; s;%[159D][0-7]\\.;&2;g; s;%[159D][89A-F]\\.;&3;g; + s;%[26AE][0-7]\\.;&4;g; s;%[26AE][89A-F]\\.;&5;g; s;%[37BF][0-7]\\.;&6;g; s;%[37BF][89A-F]\\.;&7;g; + s;%.[08](\\..);\10;g; s;%.[19](\\..);\11;g; s;%.[2A](\\..);\12;g; s;%.[3B](\\..);\13;g; + s;%.[4C](\\..);\14;g; s;%.[5D](\\..);\15;g; s;%.[6E](\\..);\16;g; s;%.[7F](\\..);\17;g; + p}' )" } -HTMLEC(){ +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 @@ -86,12 +122,13 @@ HTMLEC(){ | hexdump -ve '/1 "%03o\n"' \ | while read n; do case $n in - [01]??) printf '0000%s' $n;; - 2??) printf '%s' ${n#2};; - 3[0123]?) printf '000%s' ${n#3};; - 34?) printf '00%s' ${n#34};; - 35?) printf '01%s' ${n#35};; - 36?) printf '%s' ${n#36};; + # bitbanging octal UTF-8 chains into singular 7 digit octal numbers + [01]??) printf '0000%s' $n;; # 7 bit ASCII character, nothing to do + 2??) printf '%s' ${n#2};; # tail fragment, append 6 bit + 3[0123]?) printf '000%s' ${n#3};; # 2 octet (11 bit) chain start + 34?) printf '00%s' ${n#34};; # 3 octet (16 bit) chain start + 35?) printf '01%s' ${n#35};; # 3 octet chain start, high + 36?) printf '%s' ${n#36};; # 4 octet (21 bit) chain start esac done \ | sed -r 's;.{7};&\n;g;' \ @@ -100,7 +137,7 @@ HTMLEC(){ done } -urlsafe(){ +URL(){ # Code every character in URL escape hex format # except alphanumeric ascii @@ -109,16 +146,11 @@ urlsafe(){ | tr , % } -redirect(){ - printf '%s\r\n\r\n' "Location: $(urlsafe $*)" - exit 0 -} - -set_cookie(){ +SET_COOKIE(){ case "$1" in - session|0) expire='';; - ''|default) expire="$(LANG=C date -d "+ 1 week" +'%a, %d %b %Y %T %Z')";; - *) expire="$(LANG=C date -d "$1" +'%a, %d %b %Y %T %Z' 2>&-)";; + ''|0|session) expire='';; + [+-][0-9]*) expire="$(date -R -d @$(($(date +%s) + $1)))";; + *) expire="$(date -R -d "$1")";; esac cookie="$2" @@ -127,3 +159,9 @@ set_cookie(){ [ $# -ge 3 ] && shift 2 && printf '; %s' "$@" printf '\r\n' } + +REDIRECT(){ + printf 'Status: 303 See Other\r\nLocation: %s\r\n\r\n' "$*" + exit 0 +} +