]> Pileus Git - vpaste/blobdiff - index.cgi
Use /bin/sh for vpaste script
[vpaste] / index.cgi
index f3a4a7e76f11921aaa61c96a893a54b734fa0cd8..09e5c985d394b6307e4dc22c5c8350195e3aa603 100755 (executable)
--- 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='<a href="vpaste?ft=sh">vpaste</a>'
+       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
        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -184,21 +275,16 @@ function do_help {
                        <meta name="description" content="vpaste: Vim based pastebin" />
                        <meta name="keywords" content="vpaste,paste,pastebin,vim" />
                        <meta name="google-site-verification" content="OvHF73zD7osJ1VSq9rJxnMFlja36944ud6CiP_iXQnI" />
+                       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
                        <style type="text/css">
                                *          { margin: 0;
                                             padding: 0; }
-                               body       { margin: 4em 8em 4em 8em;
-                                            font-family: sans-serif; }
+                               body       { font-family: sans-serif; }
+                               input      { padding: 2px 6px 3px 6px; }
+                               a          { text-decoration: none; }
                                /* Items */
-                               textarea   { width: 100%;
-                                            margin-bottom: 0.5em; }
-                               .buttons   { float: left; }
-                               .links     { float: right; }
-                               .links *   { text-decoration: none;
-                                            margin-left: 0.5em; }
+                               textarea   { width: 100%; }
                                .box       { display: none;
-                                            clear: both;
-                                            margin-top: 2.7em;
                                             border-top: solid 1px #888; }
                                /* box contents */
                                h1         { margin-top: 1.0em;
@@ -206,9 +292,34 @@ function do_help {
                                ul,dd,dl,p { margin: 0 0 0 2em; }
                                dt         { font-weight: bold;
                                             padding: 0.5em 0 0 0; }
-                               span       { font-family: monospace; }
+                               .upload    { font-family: monospace; }
                                .cmds dd   { font-family: monospace; }
                        </style>
+                       <style type="text/css" media="screen and (min-device-width:800px)">
+                               body       { margin: 4em 8em; }
+                               textarea   { margin-bottom: 0.5em; }
+                               .buttons   { float: left; }
+                               .links     { float: right; }
+                               .links *   { margin-left: 0.5em; }
+                               .box       { clear: both;
+                                            margin-top: 2.7em; }
+                       </style>
+                       <style type="text/css" media="screen and (max-device-width:800px)">
+                               textarea, input, select, .links
+                                          { display: block;
+                                            width: 100%;
+                                            margin-bottom: 0.75em; }
+                               body       { margin: 1em; }
+                               textarea   { height: 17em; }
+                               select     { height: 2em; }
+                               input      { height: 3em; }
+                               .links     { text-align: center; }
+                               .links a   { margin: 0em 0.25em; }
+                               #vpaste    { font-size: large; }
+                               .sep       { display: block;
+                                            height: 0.5em;
+                                            visibility:hidden; }
+                       </style>
                        <script type="text/javascript">
                                //<![CDATA[
                                function show(id) {
@@ -251,7 +362,7 @@ function do_help {
                                        <input type="submit" value="Paste" />
                                </div>
                                <div class="links">
-                                       <a href="">vpaste</a> <span>-</span>
+                                       <a href="" id="vpaste">vpaste</a> <span class="sep">-</span>
                                        <a href="#usage"   onclick="show('usage'  )">Usage</a>
                                        <a href="#devel"   onclick="show('devel'  )">Development</a>
                                        <a href="#uploads" onclick="show('uploads')">Uploads</a>
@@ -297,26 +408,35 @@ function do_help {
 
                        <div class="box" id="devel">
                                <h1>License</h1>
-                               <p>Copyright © 2009-2012
+                               <p>Copyright © 2009-2013
                                   Andy Spencer &lt;andy753421@gmail.com&gt;</p>
                                <p>See individual files for licenses</p>
 
                                <h1>Source code</h1>
-                               <ul>
-                                       <li><a href="vpaste?ft=sh">vpaste</a></li>
-                                       <li><a href="index.cgi?ft=sh">index.cgi</a>
+                               <dl>
+                                       <dt>Client</dt>
+                                       <dd><a href="vpaste?ft=sh">vpaste</a>
+                                           <a href="embed.js?ft=javascript">embed.js</a></dd>
+                                       <dt>Server</dt>
+                                       <dd><a href="index.cgi?ft=sh">index.cgi</a>
                                            <a href="vimrc?ft=vim">vimrc</a>
                                            <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>
+                                           <a href="sitemap.xml?ft=xml">sitemap.xml</a>
+                                           <a href="blacklist?raw">blacklist</a></dd>
+                                       <dt>Patches</dt>
+                                       <dd><a href="2html.patch?ft=diff">2html.patch</a></dd>
+                                       <dt>Development</dt>
+                                       <dd><a href="$pileus">homepage</a>
+                                           <a href="$gitweb">gitweb</a><br />
+                                           <code>git clone $repo</code></dd>
+                               </dl>
 
                                <h1>Bugs</h1>
                                <ul>
                                        <li>Using strange filetypes (ft=2html) may result in strange output.</li>
-                                       <li><a href="mailto:andy753421@gmail.com?subject=vpaste bug">Other?</a></li>
+                                       <li>Other issues can be sent to the pileus.org
+                                           <a href="$mailman">mailing list</a>.</li>
                                </ul>
                        </div>
 
@@ -324,7 +444,7 @@ function do_help {
                                <h1>Recent Uploads</h1>
                                <ul>$(for upload in ${uploads[@]}; do
                                    echo -n "<li>"
-                                   echo -n "<span>$upload</span> "
+                                   echo -n "<span class=\"upload\">$upload</span> "
                                    echo -n "<a href='$upload?raw'>text</a> "
                                    echo -n "<a href='$upload'>rainbow</a>"
                                    echo "</li>"
@@ -332,6 +452,7 @@ function do_help {
                                </ul>
                                <p><a href="ls">list all</a></p>
                                <p><a href="head">sample all</a></p>
+                               <p><a href="stat">statistics</a></p>
                        </div>
                </body>
        </html>
@@ -348,6 +469,10 @@ if [ "$pathinfo" = ls ]; then
        do_cmd ls
 elif [ "$pathinfo" = head ]; then
        do_cmd head
+elif [ "$pathinfo" = stat ]; then
+       do_cmd stat
+elif [ "$pathinfo" = view ]; then
+       do_view
 elif [ "$pathinfo" ]; then
        do_print "$pathinfo"
 elif [ "$CONTENT_TYPE" ]; then