X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=79960d45422760c24f867238426ee76b8a905af4;hp=470752de0d44076f31272693a206bf0a1ed9cdc2;hb=5008998dbd429f651f2463569ae3d4a1263e3754;hpb=0a5c27be02429f5fb00be79c4e11b70666713530 diff --git a/geekigeeki.py b/geekigeeki.py index 470752d..79960d4 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -1,42 +1,44 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright 1999, 2000 Martin Pool -# Copyright 2002 Gerardo Poggiali -# Copyright 2007, 2008, 2009 Bernie Innocenti +# Copyright (C) 1999, 2000 Martin Pool +# Copyright (C) 2002 Gerardo Poggiali +# Copyright (C) 2007, 2008, 2009, 2010, 2011 Bernie Innocenti # # 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. -# -# You should have received a copy of the GNU General Public License +# 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. +# You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -__version__ = '$Id$'[4:12] +__version__ = '4.0-' + '$Id$'[4:11] -from time import clock +from time import clock, localtime, gmtime, strftime start_time = clock() title_done = False -import cgi, sys, os, re, errno, stat +import cgi, sys, os, re, errno, stat, glob +image_ext = 'png|gif|jpg|jpeg|svg|bmp|ico' +video_ext = 'avi|webm|mkv|ogv' +image_re = re.compile(r".*\.(" + image_ext + ")$", re.IGNORECASE) +video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE) # FIXME: we accept stuff like foo/../bar and we shouldn't -file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$") -img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico|ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE) -video_re = re.compile(r"^.*\.(ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE) -url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$") -ext_re = re.compile(r"\.([^\./]+)$") +file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/ ]*)$") +url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S$") +ext_re = re.compile(r"\.([^\./]+)$") + +def config_get(key, default=None): + return globals().get(key, default) -# CGI stuff --------------------------------------------------------- def script_name(): return os.environ.get('SCRIPT_NAME', '') +#TODO: move post-edit hook into wiki, then kill this +def script_path(): + return os.path.split(os.environ.get('SCRIPT_FILENAME', ''))[0] + def query_string(): path_info = os.environ.get('PATH_INFO', '') if len(path_info) and path_info[0] == '/': @@ -44,8 +46,9 @@ def query_string(): else: return os.environ.get('QUERY_STRING', '') or 'FrontPage' -def privileged_path(): - return privileged_url or script_name() +def is_privileged(): + purl = config_get('privileged_url') + return (purl is not None) and os.environ.get('SCRIPT_URI', '').startswith(purl) def remote_user(): user = os.environ.get('REMOTE_USER', '') @@ -69,7 +72,7 @@ def is_external_url(pathname): def relative_url(pathname, privileged=False): if not is_external_url(pathname): if privileged: - url = privileged_path() + url = config_get('privileged_url') or script_name() else: url = script_name() pathname = url + '/' + pathname @@ -79,20 +82,20 @@ def permalink(s): return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip()) def humanlink(s): - return re.sub(r'([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' ')) + return re.sub(r'(?:.*[/:]|)([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' ')) -# Split arg lists like "blah| blah blah| width=100 | align = center", +# Split arg lists like "blah|blah blah| width=100 | align = center", # return a list containing anonymous arguments and a map containing the named arguments def parse_args(s): args = [] - kwargs = {} + kvargs = {} for arg in s.strip('<[{}]>').split('|'): m = re.match('\s*(\w+)\s*=\s*(.+)\s*', arg) if m is not None: - kwargs[m.group(1)] = m.group(2) + kvargs[m.group(1)] = m.group(2) else: args.append(arg.strip()) - return (args, kwargs) + return (args, kvargs) def url_args(kvargs): argv = [] @@ -102,103 +105,42 @@ def url_args(kvargs): return '?' + '&'.join(argv) return '' -# Formatting stuff -------------------------------------------------- -def emit_header(mime_type="text/html"): - print("Content-type: " + mime_type + "; charset=utf-8\n") +def emit_header(mtime=None, mime_type="text/html"): + if mtime: + # Prevent caching when the wiki engine gets updated + mtime = max(mtime, os.stat(__file__).st_mtime) + print("Last-Modified: " + strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime(mtime))) + else: + print("Cache-Control: must-revalidate, max-age=0") + print("Content-type: " + mime_type + "; charset=utf-8") + print('') def send_guru(msg_text, msg_type): if not msg_text: return print('
')
     if msg_type == 'error':
         print('    Software Failure.  Press left mouse button to continue.\n')
-    print(msg_text)
+    print(cgi.escape(msg_text))
     if msg_type == 'error':
         print '\n           Guru Meditation #DEADBEEF.ABADC0DE'
-    print('
' \ + print('' \ % relative_url('sys/GuruMeditation.js')) -def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False): - global title_done - if title_done: return - - # Head - emit_header() - print('') - print('') - - print("%s: %s" % (site_name, text)) - print(' ') - if not name: - print(' ') - - for meta in meta_urls: - http_equiv, content = meta - print(' ' % (http_equiv, relative_url(content))) - - for link in link_urls: - rel, href = link - print(' ' % (rel, relative_url(href))) - - if name and writable and privileged_url is not None: - print(' ' \ - % (privileged_path() + '?a=edit&q=' + name)) - - if history_url is not None: - print(' ' \ - % relative_url(history_url + '?a=rss')) - - print('') - - # Body - if name and writable and privileged_url is not None: - print('') - else: - print('') - - title_done = True - send_guru(msg_text, msg_type) - - # Navbar - print('
') - print link_tag('FrontPage', site_icon or 'Home', cssclass='navlink') - if name: - print(' ' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + ' ') - else: - print(' ' + text + ' ') - print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) - if 'history_url' in globals(): - print(' | Recent Changes') - if name: - print(' | Page History') - - if name: - print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) - if privileged_url is not None: - if writable: - print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) - else: - print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True)) - - else: - print(' | Immutable Page') - - user = remote_user() - if user != 'AnonymousCoward': - print(' | ') - - print('
') - -def send_httperror(status="403 Not Found", query=""): +def send_httperror(status="404 Not Found", query="", trace=False): print("Status: %s" % status) - send_title(None, msg_text=("%s: on query '%s'" % (status, query))) - send_footer() + msg_text = "%s: on query '%s'" % (status, query) + if trace: + import traceback + msg_text += '\n\n' + traceback.format_exc() + page = Page() + page.send_title(msg_text=msg_text) + page.send_footer() def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: text = humanlink(dest) - elif img_re.match(text): - text = '' + text + '' + elif image_re.match(text): + text = '' + text + '' link_class = kvargs.get('class', kvargs.get('cssclass', None)) if not link_class: @@ -207,12 +149,12 @@ def link_tag(dest, text=None, privileged=False, **kvargs): elif file_re.match(dest) and Page(dest).exists(): link_class = 'wikilink' else: - text = nonexist_pfx + text + text = config_get('nonexist_pfx', '') + text link_class = 'nonexistent' - # Prevent crawlers from following links potentially added by spammers or to generated pages + # Prevent crawlers from following links potentially added by spammers and to autogenerated pages nofollow = '' - if link_class == 'external' or link_class == 'navlink': + if link_class in ('external', 'navlink', 'nonexistent'): nofollow = 'rel="nofollow" ' return '%s' % (link_class, nofollow, relative_url(dest, privileged=privileged), text) @@ -221,23 +163,34 @@ def link_inline(name, descr=None, kvargs={}): if not descr: descr = humanlink(name) url = relative_url(name) if video_re.match(name): - return '' % url - elif img_re.match(name): + args = '' + if 'maxwidth' in kvargs: + args += 'width=' + kvargs['maxwidth'] + return '