httpd_post_upload.txt example: handle binary files too
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
5799248976
commit
e3600a042e
@ -24,53 +24,42 @@ post_upload.cgi
|
|||||||
# ^M <--------- extra empty line
|
# ^M <--------- extra empty line
|
||||||
# -----------------------------29995809218093749221856446032--^M
|
# -----------------------------29995809218093749221856446032--^M
|
||||||
|
|
||||||
# Beware: bashism $'\r' is used to handle ^M
|
|
||||||
|
|
||||||
file=/tmp/$$-$RANDOM
|
file=/tmp/$$-$RANDOM
|
||||||
|
|
||||||
|
CR=`printf '\r'`
|
||||||
|
|
||||||
# CGI output must start with at least empty line (or headers)
|
# CGI output must start with at least empty line (or headers)
|
||||||
printf '\r\n'
|
printf '\r\n'
|
||||||
|
|
||||||
IFS=$'\r'
|
IFS="$CR"
|
||||||
read -r delim_line
|
read -r delim_line
|
||||||
|
IFS=""
|
||||||
IFS=''
|
|
||||||
delim_line="${delim_line}--"$'\r'
|
|
||||||
|
|
||||||
while read -r line; do
|
while read -r line; do
|
||||||
test "$line" = '' && break
|
test x"$line" = x"" && break
|
||||||
test "$line" = $'\r' && break
|
test x"$line" = x"$CR" && break
|
||||||
done
|
done
|
||||||
|
|
||||||
# This will not work well for binary files: bash 3.2 is upset
|
cat >"$file"
|
||||||
# by reading NUL bytes and loses chunks of data.
|
|
||||||
# If you are not bothered by having junk appended to the uploaded file,
|
|
||||||
# consider using simple "cat >file" instead of the entire
|
|
||||||
# fragment below.
|
|
||||||
|
|
||||||
while read -r line; do
|
# We need to delete the tail of "\r\ndelim_line--\r\n"
|
||||||
|
tail_len=$((${#delim_line} + 6))
|
||||||
|
|
||||||
while test "$line" = $'\r'; do
|
# Get and check file size
|
||||||
read -r line
|
filesize=`stat -c"%s" "$file"`
|
||||||
test "$line" = "$delim_line" && {
|
test "$filesize" -lt "$tail_len" && exit 1
|
||||||
# Aha! Empty line + delimiter! All done
|
|
||||||
cat <<EOF
|
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
File upload has been accepted
|
|
||||||
EOF
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
# Empty line + NOT delimiter. Save empty line,
|
|
||||||
# and go check next line
|
|
||||||
printf "%s\n" $'\r' >&3
|
|
||||||
done
|
|
||||||
# Not empty line - just save
|
|
||||||
printf "%s\n" "$line" >&3
|
|
||||||
done 3>"$file"
|
|
||||||
|
|
||||||
cat <<EOF
|
# Check that tail is correct
|
||||||
<html>
|
dd if="$file" skip=$((filesize - tail_len)) bs=1 count=1000 >"$file.tail" 2>/dev/null
|
||||||
<body>
|
printf "\r\n%s--\r\n" "$delim_line" >"$file.tail.expected"
|
||||||
File upload was not terminated with '$delim_line' - ??!
|
if ! diff -q "$file.tail" "$file.tail.expected" >/dev/null; then
|
||||||
EOF
|
printf "<html>\n<body>\nMalformed file upload"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm "$file.tail"
|
||||||
|
rm "$file.tail.expected"
|
||||||
|
|
||||||
|
# Truncate the file
|
||||||
|
dd of="$file" seek=$((filesize - tail_len)) bs=1 count=0 >/dev/null 2>/dev/null
|
||||||
|
|
||||||
|
printf "<html>\n<body>\nFile upload has been accepted"
|
||||||
|
Loading…
Reference in New Issue
Block a user