X-Git-Url: http://pileus.org/git/?p=vpaste;a=blobdiff_plain;f=index.cgi;h=09e5c985d394b6307e4dc22c5c8350195e3aa603;hp=f3a4a7e76f11921aaa61c96a893a54b734fa0cd8;hb=HEAD;hpb=1e266b439c4550432abc1c20512f6edf2786c88e
diff --git a/index.cgi b/index.cgi
index f3a4a7e..09e5c98 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2009-2012 Andy Spencer
+# Copyright (C) 2009-2013 Andy Spencer
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
@@ -15,7 +15,8 @@
# Remove url codings from stdin
function get_modeline {
echo "$QUERY_STRING" |
- sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\\x\1/g; s/[,&?]/ /g' |
+ sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\\x\1/g' \
+ -e 's/[^a-zA-Z0-9.:=_\-]/ /g' |
xargs echo -e
}
function get_param {
@@ -44,45 +45,140 @@ function cut_file {
' | head -c $((128*1024)) # Limit size to 128K
}
-# Print out a generic header
-function header {
- echo "Content-Type: $1; charset=UTF-8"
+# Respond to a request
+function respond {
+ local allow ctype heads files texts gzip h f
+ while [ "$1" ]; do
+ case $1 in
+ -y) allow="true"; ;;
+ -c) ctype="$2"; shift ;;
+ -h) heads=("${heads[@]}" "$2"); shift ;;
+ -f) files=("${files[@]}" "$2"); shift ;;
+ *) texts=("${texts[@]}" "$1"); ;;
+ esac
+ shift
+ done
+
+ # Check if the browser supports gzip
if [[ "$HTTP_ACCEPT_ENCODING" == *'gzip'* ]]; then
+ gzip=true
+ fi
+
+ # Output header
+ if [ "$ctype" ]; then
+ echo "Content-Type: $ctype; charset=UTF-8"
+ else
+ echo "Content-Type: text/plain; charset=UTF-8"
+ fi
+ if [ "$gzip" ]; then
echo "Content-Encoding: gzip"
- echo
+ fi
+ if [ "$allow" ]; then
+ echo "Access-Control-Allow-Origin: *"
+ echo "Access-Control-Allow-Headers: Content-Type"
+ fi
+ for h in "${heads[@]}"; do
+ echo "$h"
+ done
+ echo
+
+ # Output text messages
+ if [ "$texts" ]; then
+ if [ "$gzip" ]; then
+ echo "${texts[@]}" | gzip
+ else
+ echo "${texts[@]}"
+ fi
+ exit
+ fi
+
+ # Output body files
+ if [ "$files" ]; then
+ for f in "${files[@]}"; do
+ if [[ "$gzip" && "$f" != *'.gz' ]]; then
+ gzip < "$f"
+ elif [[ ! "$gzip" && "$f" == *'.gz' ]]; then
+ zcat < "$f"
+ else
+ cat "$f"
+ fi
+ done
+ exit
+ fi
+
+ # Gzip remaining stream
+ if [ "$gzip" ]; then
exec 1> >(gzip)
- else
- echo
fi
}
-# Print plain message and exit
-function message {
- while [ "$1" == '-h' ]; do
- shift; echo "$1"; shift
- done
- header text/plain
- echo "$*"
- exit
+# Format and output a file
+function format {
+ # Create a temp file with the provided modeline
+ tmp="$(mktemp)"
+ sed -e "1ivim: $(get_modeline)" \
+ -e "\$avim: $(get_modeline)" "$1" > "$tmp"
+
+ # Determine cache name
+ md5="$(cat index.cgi vimrc "$tmp" /usr/bin/ex | md5sum -b)"
+ out="cache/${md5% *}.htm"
+ zip="$out.gz"
+
+ # Cache the file, if needed
+ if [ ! -f "$zip" ]; then
+ # - I have some plugins in ~/.vim
+ # - Run ex in pty to trick it into thinking that it
+ # has a real terminal, note that we also have to set
+ # term=xterm-256color in vimrc
+ HOME=/home/andy \
+ /home/vpaste/bin/pty \
+ /usr/bin/ex -nXZ -i NONE -u vimrc \
+ '+sil! set fde= fdt= fex= inde= inex= key= pa= pexpr=' \
+ '+sil! set iconstring= ruf= stl= tal=' \
+ "+sil! set titlestring=$1\ -\ vpaste.net" \
+ '+sil! set noml' \
+ '+sil! 1d|$d|'$2 \
+ '+sil! %s/\r//g' \
+ '+sil! TOhtml' \
+ "+sav! $out" \
+ '+qall!' \
+ "$tmp" >/dev/null 2>&1
+ gzip "$out"
+ fi
+ rm "$tmp"
+
+ # Output the file
+ respond -y -c "text/html" -f "$zip"
}
# List previous pastes
function do_cmd {
- header text/plain
+ respond
case "$1" in
+ ls)
+ ls -t db | column
+ ;;
head)
- awk '
- BEGIN { rows=4; cols=60; }
+ awk -v 'rows=4' -v 'cols=60' '
FNR==1 { gsub(/.*\//, "", FILENAME);
print FILENAME
print "-----" }
FNR==1,/^$/ { next }
/\S/ { i++; printf "%."cols"s\n", $0 }
- i>=rows { i=0; print ""; nextfile }
+ i>=rows { nextfile }
+ ENDFILE { i=0; print "" }
' $(ls -t db/*)
;;
- ls)
- ls -t db | column
+ stat)
+ ls -l --time-style='+%Y %m' db |
+ awk -v 'hdr=Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec' '
+ BEGIN { printf "%64s\n", hdr }
+ NR>1 { cnt[$6+0][$7+0]++ }
+ END { for (y in cnt) {
+ printf "%4d", y
+ for (m=1; m<=12; m++)
+ printf "%5s", cnt[y][m]
+ printf "\n" } }'
;;
esac
}
@@ -95,55 +191,45 @@ function do_print {
input="db/$1"
trim='1,/^$/d' # sed command to remove cruft
else
- message -h 'Status: 404 Not Found' \
+ respond -h 'Status: 404 Not Found' \
"File '$1' not found"
fi
+ # Check for javascript
+ if [[ "$input" == 'embed.js' &&
+ "$HTTP_ACCEPT" != *'html'* ]]; then
+ respond -c text/javascript -f "$input"
+ fi
+
# Check for raw paste
if [[ "$QUERY_STRING" == 'raw'* ||
"$REQUEST_URI" != *'?'* &&
( "$input" != 'db/'* ||
"$HTTP_ACCEPT" != *'html'* ) ]]; then
- header text/plain
+ respond
sed "$trim" "$input"
exit
fi
- # Create a temp file with the provided modeline
- output="$(mktemp)"
- tmp="$(mktemp)"
- sed "\$avim: $(get_modeline)" "$input" > "$tmp"
-
- # - I have some plugins in ~/.vim
- # - Run ex in screen to trick it into thinking that it
- # has a real terminal, note that we also have to set
- # term=xterm-256color in vimrc
- HOME=/home/andy \
- screen -D -m ex -nXZ -i NONE -u vimrc \
- '+sil! set fde= fdt= fex= inde= inex= key= pa= pexpr=' \
- '+sil! set iconstring= ruf= stl= tal=' \
- "+sil! set titlestring=$1\ -\ vpaste.net" \
- '+sil! set noml' \
- '+sil! $d|'$trim \
- '+sil! %s/\r//g' \
- '+sil! TOhtml' \
- "+sav! $output" \
- '+qall!' \
- "$tmp"
-
- header text/html
- cat "$output"
- rm "$tmp" "$output"
+ # Output the file
+ format "$input" "$trim"
}
+# Format a file for viewing
+function do_view {
+ format -
+}
# Upload handler
function do_upload {
body=$(cat -)
spam=$(echo -n "$body" | cut_file "ignoreme")
text=$(echo -n "$body" | cut_file "(text|x)")
- [ ! -z "$spam" ] && message "Spam check.."
- [ -z "$text" ] && message "No text pasted"
+ bans=$(echo -n "$REMOTE_ADDR" | grep -f blacklist)
+
+ [ ! -z "$spam" ] && respond -h "Status: 403 Forbidden" "Spam check.."
+ [ ! -z "$bans" ] && respond -h "Status: 403 Forbidden" "You have been banned"
+ [ -z "$text" ] && respond "No text pasted"
# Format and save message
output="$(mktemp db/XXXXX)"
@@ -151,13 +237,14 @@ function do_upload {
vim: $(get_modeline)
Date: $(date -R)
From: $REMOTE_ADDR
+ User-Agent: $HTTP_USER_AGENT
$text
EOF
# Redirect user
uri="$url$(basename "$output")"
- message -h 'Status: 302 Found' \
+ respond -h 'Status: 302 Found' \
-h "Location: $uri" \
"$uri"
}
@@ -169,11 +256,15 @@ function do_help {
sed -n '/^\(syntax\|manual\|synload\|2html\|colortest\|hitest\).vim$/d; s/.vim$//p' |
sort | uniq
)
- uploads=$(ls -t db | head -n 5)
+ uploads=$(ls -t db 2>/dev/null | head -n 5)
filetype=$(get_param '^(ft|filet(y(pe?)?)?)$')
vpaste='vpaste'
+ pileus='http://pileus.org/tools/vpaste'
+ gitweb='http://pileus.org/git/?p=vpaste'
+ mailman='http://pileus.org/mailman/listinfo/dev'
+ repo='git://pileus.org/vpaste'
- header text/html
+ respond -c text/html
cat <<-EOF
@@ -184,21 +275,16 @@ function do_help {
+
+
+