From: Denys Vlasenko Date: Thu, 22 Dec 2016 14:33:11 +0000 (+0100) Subject: Make POST upload example script easier to use X-Git-Tag: 1_27_0~311 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d27cb364020f46e9dcd14f30d58c25e94e9b33b;p=oweals%2Fbusybox.git Make POST upload example script easier to use Signed-off-by: Denys Vlasenko --- diff --git a/networking/httpd_post_upload.cgi b/networking/httpd_post_upload.cgi new file mode 100755 index 000000000..e4ffd2bb5 --- /dev/null +++ b/networking/httpd_post_upload.cgi @@ -0,0 +1,59 @@ +#!/bin/sh + +# post_upload.htm example: +# +# +# + +# POST upload format: +# -----------------------------29995809218093749221856446032^M +# Content-Disposition: form-data; name="file1"; filename="..."^M +# Content-Type: application/octet-stream^M +# ^M <--------- headers end with empty line +# file contents +# file contents +# file contents +# ^M <--------- extra empty line +# -----------------------------29995809218093749221856446032--^M + +file=/tmp/$$-$RANDOM + +CR=`printf '\r'` + +# CGI output must start with at least empty line (or headers) +printf '\r\n' + +IFS="$CR" +read -r delim_line +IFS="" + +while read -r line; do + test x"$line" = x"" && break + test x"$line" = x"$CR" && break +done + +cat >"$file" + +# We need to delete the tail of "\r\ndelim_line--\r\n" +tail_len=$((${#delim_line} + 6)) + +# Get and check file size +filesize=`stat -c"%s" "$file"` +test "$filesize" -lt "$tail_len" && exit 1 + +# Check that tail is correct +dd if="$file" skip=$((filesize - tail_len)) bs=1 count=1000 >"$file.tail" 2>/dev/null +printf "\r\n%s--\r\n" "$delim_line" >"$file.tail.expected" +if ! diff -q "$file.tail" "$file.tail.expected" >/dev/null; then + printf "\n\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 "\n\nFile upload has been accepted" diff --git a/networking/httpd_post_upload.txt b/networking/httpd_post_upload.txt deleted file mode 100644 index 9d504f484..000000000 --- a/networking/httpd_post_upload.txt +++ /dev/null @@ -1,65 +0,0 @@ -POST upload example: - -post_upload.htm -=============== - - - - - -post_upload.cgi -=============== -#!/bin/sh - -# POST upload format: -# -----------------------------29995809218093749221856446032^M -# Content-Disposition: form-data; name="file1"; filename="..."^M -# Content-Type: application/octet-stream^M -# ^M <--------- headers end with empty line -# file contents -# file contents -# file contents -# ^M <--------- extra empty line -# -----------------------------29995809218093749221856446032--^M - -file=/tmp/$$-$RANDOM - -CR=`printf '\r'` - -# CGI output must start with at least empty line (or headers) -printf '\r\n' - -IFS="$CR" -read -r delim_line -IFS="" - -while read -r line; do - test x"$line" = x"" && break - test x"$line" = x"$CR" && break -done - -cat >"$file" - -# We need to delete the tail of "\r\ndelim_line--\r\n" -tail_len=$((${#delim_line} + 6)) - -# Get and check file size -filesize=`stat -c"%s" "$file"` -test "$filesize" -lt "$tail_len" && exit 1 - -# Check that tail is correct -dd if="$file" skip=$((filesize - tail_len)) bs=1 count=1000 >"$file.tail" 2>/dev/null -printf "\r\n%s--\r\n" "$delim_line" >"$file.tail.expected" -if ! diff -q "$file.tail" "$file.tail.expected" >/dev/null; then - printf "\n\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 "\n\nFile upload has been accepted"