X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=index.cgi;h=d83cb2ad944a5cf26cd2494f04a6854e9c0546c5;hp=92ccfd618583b874c3af61879b6b3c6287a2aec8;hb=3c2a130cdaeadf1a67eb37ab70a298fa756a3c01;hpb=456423f02f12ac71d2d14e1abf959dafdc5eb041 diff --git a/index.cgi b/index.cgi index 92ccfd6..d83cb2a 100755 --- a/index.cgi +++ b/index.cgi @@ -40,14 +40,14 @@ _EXEC="${real%/shcgi/index.cgi}" #execution directory PAGE=$(validate "${PAGE:-${_GET[page]}}" '[a-zA-Z0-9_-]+' '') ACTION=$(validate "${ACTION:-${_GET[action]}}" '[a-zA-Z0-9_-]+' '') -STATIC=$(validate "${STATIC:-${_GET[static]}}" '[^\.]+' '') +STATIC=$(invalidate "${STATIC:-${_GET[static]}}" '(^|.*/)\.\./.*' '') -if [ -n "$PAGE" -a -x "${_EXEC}/pages/${PAGE}.sh" ]; then - . "$_EXEC/shcgi/page.sh" +if [ -n "$STATIC" -a -e "${_EXEC}/static/${STATIC}" ]; then + . "$_EXEC/shcgi/static.sh" elif [ -n "$ACTION" -a -x "${_EXEC}/actions/${ACTION}.sh" ]; then . "${_EXEC}/actions/${ACTION}.sh" -elif [ -n "$STATIC" -a -e "${_EXEC}/static/${STATIC}" ]; then - . "$_EXEC/shcgi/static.sh" +elif [ -n "$PAGE" -a -x "${_EXEC}/pages/${PAGE}.sh" ]; then + . "$_EXEC/shcgi/page.sh" else printf 'HTTP/1.1 404 Not Found\r\n' PAGE=error