]> Pileus Git - vpaste/blobdiff - index.cgi
move trim to end
[vpaste] / index.cgi
index 56e87a03066492e6d224b0420fe154da5b39a1f0..f1b8b15c0a99533fa6fcc59dde43912448c9f1ed 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,21 +1,21 @@
 #!/bin/bash
 
-# Copyright (C) 2009 Andy Spencer
+# 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 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 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 General Public License for more details.
+# 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" | 
+               echo "$QUERY_STRING" |
                sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\\x\1/g; s/[,&]/ /g' |
                xargs echo -e
        )
@@ -23,16 +23,25 @@ function get_modeline {
 }
 
 # Extract an uploaded file from standard input
-# $1 is the boundary delimiter for the file
+#   $2 is the name of the input to extract
 function cut_file {
-       awk -v "bnd=$1" '{
-               if ($0 == "--"bnd"\r")     { st=1;     }
-               if ($0 == "--"bnd"--\r")   { st=0;     }
-               if (st == 2)               { print $0; }
-               if ($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,13 +50,31 @@ function header {
        echo
 }
 
-# Format a file for viewing 
+# 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
@@ -60,7 +87,7 @@ function do_print {
                # Create a temp file with the provided modeline
                output="$(mktemp)"
                tmp="$(mktemp)"
-               sed "1a$(get_modeline)" "$input" > "$tmp"
+               sed "\$a$(get_modeline)" "$input" > "$tmp"
 
                # - I have some plugins in ~/.vim
                # - Run ex in screen to trick it into thinking that it
@@ -68,19 +95,19 @@ function do_print {
                #   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=' \
-                       "+set titlestring=$1\ -\ vpaste.net" \
-                       '+set noml'     \
-                       '+2d|'$trim     \
-                       '+%s/\r//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
@@ -91,7 +118,14 @@ function do_print {
 
 # Upload handler
 function do_upload {
-       text=$(cut_file "$1")
+       body=$(cat -)
+       spam=$(echo -n "$body" | cut_file "ignoreme")
+       text=$(echo -n "$body" | cut_file "(text|x)")
+       if [ ! -z "$spam" ]; then
+               header text/plain
+               echo "Spam check.."
+               exit
+       fi
        if [ -z "$text" ]; then
                header text/plain
                echo "No text pasted"
@@ -99,17 +133,38 @@ function do_upload {
        fi
        output="$(mktemp db/XXXXX)"
        uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
-       (get_modeline; echo "$text") > "$output"
-       echo "Status: 302 Found"
-       echo "Location: $uri"
-       header text/plain
-       echo "$uri"
+
+       # Format, spam check, and save message
+       (
+               get_modeline
+               echo "Date: $(date -R)"
+               echo "From: $REMOTE_ADDR"
+               echo
+               echo "$text"
+       ) | HOME=/home/vpaste spamc -E > "$output"
+
+       # Test for spam
+       if [ "$?" -ne 0 ]; then
+               # Report spam
+               header text/plain
+               echo "Your post has been marked as spam!"
+               echo "Spam test results are as folllows.. "
+               echo
+               cat "$output"
+               mv  "$output" spam
+       else
+               # Redirect user
+               echo "Status: 302 Found"
+               echo "Location: $uri"
+               header text/plain
+               echo "$uri"
+       fi
 }
 
 # Default index page
 function do_help {
 filetypes=$(
-       ls /usr/share/vim/vim*/syntax/ /home/andy/.vim/after/syntax/ |
+       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
 )
@@ -123,6 +178,8 @@ cat - <<EOF
        <head>
                <title>vpaste.net - Vim based pastebin</title>
                <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+               <meta name="description" content="vpaste: Vim based pastebin" />
+               <meta name="keywords" content="vpaste,paste,pastebin,vim" />
                <style type="text/css">
                        * { margin:0; padding:0; }
                        body { margin:1em; }
@@ -136,6 +193,7 @@ cat - <<EOF
        <body>
                <form id="form" method="post" action="?" enctype="multipart/form-data">
                <div style="margin:0 0 1.5em 0;">
+               <input style="display:none" type="text" name="ignoreme" value="">
                <textarea name="text" cols="80" rows="25" style="width:100%; height:20em;"></textarea>
                <select onchange="document.getElementById('form').action =
                        document.location + '?ft=' + this.value;">
@@ -157,7 +215,7 @@ cat - <<EOF
                <pre> vpaste file [option=value,..]</pre>
                <pre> &lt;command&gt; | vpaste [option=value,..]</pre>
                <br />
-               <pre> &lt;command&gt; | curl -F 'x=&lt;-' $url[?option=value,..]</pre>
+               <pre> &lt;command&gt; | curl -F 'text=&lt;-' $url[?option=value,..]</pre>
                <br />
                <pre> :map vp :exec "w !vpaste ft=".&amp;ft&lt;CR&gt;</pre>
                <pre> :vmap vp &lt;ESC&gt;:exec "'&lt;,'&gt;w !vpaste ft=".&amp;ft&lt;CR&gt;</pre>
@@ -192,7 +250,9 @@ cat - <<EOF
                <li><a href="vpaste?ft=sh">vpaste</a></li>
                <li><a href="index.cgi?ft=sh">index.cgi</a>
                    <a href="vimrc?ft=vim">vimrc</a>
-                   <a href="htaccess?ft=apache">htaccess</a></li>
+                   <a href="htaccess?ft=apache">htaccess</a>
+                   <a href="robots.txt?ft=robots">robots.txt</a>
+                   <a href="sitemap.xml?ft=xml">sitemap.xml</a></li>
                <li><a href="2html.patch?ft=diff">2html.patch</a></li>
                <li><a href="https://lug.rose-hulman.edu/svn/misc/trunk/htdocs/vpaste/">Subversion</a></li>
                </ul>
@@ -204,7 +264,10 @@ cat - <<EOF
                        echo -n "<a href='$upload'>text</a> "
                        echo -n "<a href='$upload?'>rainbow</a>"
                        echo "</li>"
-               done)</ul>
+               done)
+               </ul>
+               <p><a href="ls">list all</a></p>
+               <p><a href="head">sample all</a></p>
        </body>
 </html>
 EOF
@@ -215,10 +278,14 @@ url="http://$HTTP_HOST${REQUEST_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