xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

/rc/bin/rc-httpd/handlers/{dir-index, serve-static}: commit the correct files this time (thanks, igor)

Browse source
This commit is contained in:
glenda 2022-04-01 01:59:47 +00:00
parent 60ef662b98
commit 241667b933
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rc/bin/rc-httpd/handlers/dir-index
View file

@ -2,6 +2,10 @@
PATH_INFO=`{echo $PATH_INFO | urlencode -d} PATH_INFO=`{echo $PATH_INFO | urlencode -d}
full_path=$"FS_ROOT^$"PATH_INFO full_path=$"FS_ROOT^$"PATH_INFO
full_path=$"full_path full_path=$"full_path
if(! ~ `{cleanname -d$FS_ROOT $full_path} `{cleanname $FS_ROOT}^*){
error 503
exit
}
if(! test -d $full_path){ if(! test -d $full_path){
error 404 error 404
exit exit
@ -14,8 +18,7 @@ builtin cd $full_path
if(~ $"NOINDEXFILE ^ $"NOINDEX ''){ if(~ $"NOINDEXFILE ^ $"NOINDEX ''){
ifile=index.htm* ifile=index.htm*
if(! ~ $ifile(1) *'*'){ if(! ~ $ifile(1) *'*'){
PATH_INFO=$ifile(1) PATH_INFO=$PATH_INFO^$ifile(1)
FS_ROOT=''
exec serve-static exec serve-static
} }
} }

4
rc/bin/rc-httpd/handlers/serve-static
View file

@ -1,6 +1,10 @@
#!/bin/rc #!/bin/rc
full_path=`{echo $"FS_ROOT^$"PATH_INFO | urlencode -d} full_path=`{echo $"FS_ROOT^$"PATH_INFO | urlencode -d}
full_path=$"full_path full_path=$"full_path
if(! ~ `{cleanname -d$FS_ROOT $full_path} `{cleanname $FS_ROOT}^*){
error 503
exit
}
if(~ $full_path */) if(~ $full_path */)
error 503 error 503
if(test -d $full_path){ if(test -d $full_path){