X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=index.cgi;h=d4b3b54a994aaa82badeefbc560ddeb4cf254d1b;hb=d675f5d2af2d4735c96d7bfb238a6e6646671984;hp=ca539496cc155f99a3217490ce6ec09ae9fbba02;hpb=76e13d5c5c16aca3fb6708b124ace6094b8cb3db;p=vpaste diff --git a/index.cgi b/index.cgi index ca53949..d4b3b54 100755 --- a/index.cgi +++ b/index.cgi @@ -1,38 +1,44 @@ #!/bin/bash -# Copyright (C) 2009 Andy Spencer -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# Remove url codings form stdin +# Copyright (C) 2009-2011 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 +# Software Foundation, either version 3 of the License, or (at your option) any +# later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +# details. + +# Remove url codings from stdin function get_modeline { - modeline=$( - echo "$QUERY_STRING" | - sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\\x\1/g; s/[,&]/ /g' | - xargs echo -e - ) - echo "vim: $modeline" + echo "$QUERY_STRING" | + sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\\x\1/g; s/[,&]/ /g' | + xargs echo -e } # Extract an uploaded file from standard input -# $1 is the boundary delimiter for the file +# $1 is the name of the input to extract function cut_file { - awk " - /--$1/ {st=1}; - st==2 {print \$0}; - /$1--/ {st=0}; - /^\\r$/ && st==1 {st=2}; - " | head -c -2 | head -c $((128*1024)) - # Remove trailing ^M's that come with CGI - # Limit size to 128K + bnd="${CONTENT_TYPE/*boundary\=/}" + awk -v "want=$1" -v "bnd=$bnd" ' + BEGIN { RS="\r\n" } + + # reset based on boundaries + $0 == "--"bnd"" { st=1; next; } + $0 == "--"bnd"--" { st=0; next; } + $0 == "--"bnd"--\r" { st=0; next; } + + # search for wanted file + st == 1 && $0 ~ "^Content-Disposition:.* name=\""want"\"" { st=2; next; } + st == 1 && $0 == "" { st=9; next; } + + # wait for newline, then start printing + st == 2 && $0 == "" { st=3; next; } + st == 3 { print $0 } + ' | head -c $((128*1024)) # Limit size to 128K } # Print out a generic header @@ -41,45 +47,72 @@ function header { echo } -# Format a file for viewing +# Print plain message and exit +function message { + while [ "$1" == '-h' ]; do + shift; echo $1; shift + done + header text/plain + echo "$*" + exit +} + +# List previous pastes +function do_cmd { + header text/plain + case "$1" in + head) + for i in $(ls -t db/*); do + basename $i + basename $i | sed 's/./-/g' + sed '1,/^$/d; /^\s*$/d' $i | sed -n '1,5s/\(.\{0,60\}\).*/\1/p' + echo + done + ;; + ls) + ls -t db | column + ;; + esac +} + +# Format a file for viewing function do_print { if [ -f "./$1" ]; then input="$1" elif [ -f "db/$1" ]; then input="db/$1" - trim='1d' # sed command to remove cruft + trim='1,/^$/d' # sed command to remove cruft else - echo "Status: 404 Not Found" - header text/plain - echo "File '$1' not found" - return + message -h 'Status: 404 Not Found' \ + "File '$1' not found" fi - - if [[ "$REQUEST_URI" == *'?'* ]]; then + if [[ "$HTTP_ACCEPT" == *'html'* && + "$QUERY_STRING" != 'raw'* ]]; then # Create a temp file with the provided modeline output="$(mktemp)" tmp="$(mktemp)" - sed "1a$(get_modeline)" "$input" > "$tmp" + 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, not that we also have to set + # 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 \ - '+set bexpr= fde= fdt= fex= inde= inex= key= pa= pexpr' \ - '+set iconstring= ruf= stl= tal= titlestring=' \ - '+set noml' \ - '+2d|'$trim \ - '+%s/ //g' \ - '+TOhtml' \ + '+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" + cat "$output" rm "$tmp" "$output" else header text/plain @@ -90,123 +123,153 @@ function do_print { # 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" + + # Format and save message output="$(mktemp db/XXXXX)" - uri="$url$(basename "$output")${QUERY_STRING:+"?"}" - (get_modeline; cut_file "$1") > "$output" - echo "Status: 302 Found" - echo "Location: $uri" - header text/plain - echo "$uri" + cat >"$output" <<-EOF + vim: $(get_modeline) + Date: $(date -R) + From: $REMOTE_ADDR + + $text + EOF + + # Redirect user + uri="$SCRIPT_URI$(basename "$output")" + message -h 'Status: 302 Found' \ + -h "Location: $uri" \ + "$uri" } # Default index page function do_help { -filetypes=$( - ls /usr/share/vim/vim*/syntax/ /home/andy/.vim/after/syntax/ | - sed -n '/^\(syntax\|manual\|synload\|2html\|colortest\|hitest\).vim$/d; s/.vim$//p' | - sort | uniq -) -uploads=$(ls -t db | head -n 5 | sed "s!^!$url!") - -header text/html -cat - < - - - vpaste.net - Vim based pastebin - - - - -
-
- - - -
-
- -

NAME

-

vpaste: Vim based pastebin

- -

SYNOPSIS

-
- 
 vpaste file [option=value,..]
- 
 <command> | vpaste [option=value,..]
-
- 
 <command> | curl -F 'x=<-' $url[?option=value,..]
-
- 
 :map vp :exec "w !vpaste ft=".&ft<CR>
- 
 :vmap vp <ESC>:exec "'<,'>w !vpaste ft=".&ft<CR>
-
- -

DESCRIPTION

-

Add ?[option[=value],..] to make your text a rainbow.

-

Options specified when uploading are used as defaults.

- -

OPTIONS

-
-
ft, filetype={filetype}
-
A filetype to use for highlighting, see above menu for supported types
-
bg, background={light|dark}
-
Background color to use for the page
-
et, expandtab
-
Expand tabs to spaces
-
ts, tabstop=[N]
-
Number of spaces to use for tabs when et is set
-
...
-
See :help modeline for more information
-
- -

BUGS

- - -

SOURCE

- - -

LATEST UPLOADS

- - - -EOF + filetypes=$( + ls /usr/share/vim/vim*/syntax/ /home/andy/.vim/syntax/ | + sed -n '/^\(syntax\|manual\|synload\|2html\|colortest\|hitest\).vim$/d; s/.vim$//p' | + sort | uniq + ) + uploads=$(ls -t db | head -n 5) + + header text/html + cat <<-EOF + + + + vpaste.net - Vim based pastebin + + + + + + +
+
+ + + + +
+
+ +

NAME

+

vpaste: Vim based pastebin

+ +

SYNOPSIS

+
+ 
 vpaste file [option=value,..]
+ 
 <command> | vpaste [option=value,..]
+
+ 
 <command> | curl -F 'text=<-' $SCRIPT_URI[?option=value,..]
+
+ 
 :map vp :exec "w !vpaste ft=".&ft<CR>
+ 
 :vmap vp <ESC>:exec "'<,'>w !vpaste ft=".&ft<CR>
+
+ +

DESCRIPTION

+

Add ?[option[=value],..] to make your text a rainbow.

+

Options specified when uploading are used as defaults.

+ +

OPTIONS

+
+
ft, filetype={filetype}
+
A filetype to use for highlighting, see above menu for supported types
+
bg, background={light|dark}
+
Background color to use for the page
+
et, expandtab
+
Expand tabs to spaces
+
ts, tabstop=[N]
+
Number of spaces to use for tabs when et is set
+
...
+
See :help modeline for more information
+
+ +

BUGS

+ + +

SOURCE

+ + +

LATEST UPLOADS

+ +

list all

+

sample all

+ + + EOF } # Main -url="http://$HTTP_HOST/$SCRIPT_URI" pathinfo="${REQUEST_URI/*\/}" pathinfo="${pathinfo/\?*}" -if [ "$pathinfo" ]; then +if [ "$pathinfo" = ls ]; then + do_cmd ls +elif [ "$pathinfo" = head ]; then + do_cmd head +elif [ "$pathinfo" ]; then do_print "$pathinfo" elif [ "$CONTENT_TYPE" ]; then - do_upload "${CONTENT_TYPE/*boundary\=/}" + do_upload else do_help fi