X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=d63850fb57b8e55494930871cc8f4f23271b3b5c;hp=f088774ea6d0c4ab2f912ea73a1aede57faf06b2;hb=ae02752908b5369019933b080324189ee373bed2;hpb=fbde07e56f0d9f58c56b4b0479721b381e2a3a17 diff --git a/geekigeeki.py b/geekigeeki.py index f088774..d63850f 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -3,7 +3,7 @@ # # Copyright (C) 1999, 2000 Martin Pool # Copyright (C) 2002 Gerardo Poggiali -# Copyright (C) 2007, 2008, 2009 Bernie Innocenti +# Copyright (C) 2007, 2008, 2009, 2010 Bernie Innocenti # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -29,7 +29,6 @@ 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"\.([^\./]+)$") -# CGI stuff --------------------------------------------------------- def config_get(key, default=None): return globals().get(key, default) @@ -106,11 +105,12 @@ def url_args(kvargs): return '?' + '&'.join(argv) return '' -# Formatting stuff -------------------------------------------------- def emit_header(mtime=None, mime_type="text/html"): if mtime: print("Last-Modified: " + strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime(mtime))) - print("Content-type: " + mime_type + "; charset=utf-8\n") + if mime_type: + print("Content-type: " + mime_type + "; charset=utf-8") + print('') def send_guru(msg_text, msg_type): if not msg_text: return @@ -123,83 +123,14 @@ def send_guru(msg_text, msg_type): print('' \ % relative_url('sys/GuruMeditation.js')) -def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None, navbar="on"): - global title_done - if title_done: return - - # HEAD - emit_header(mtime) - print('\n') - print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text)) - print(' ') - if not name: - print(' ') - - for http_equiv, content in config_get('meta_urls', {}): - print(' ' % (http_equiv, relative_url(content))) - - for link in config_get('link_urls', {}): - rel, href = link - print(' ' % (rel, relative_url(href))) - - editable = name and writable and is_privileged() - if editable: - print(' ' \ - % relative_url('?a=edit&q=' + name, privileged=True)) - - history = config_get('history_url') - if history is not None: - print(' ' \ - % relative_url(history + '?a=rss')) - - print('') - - # BODY - if editable: - print('') - else: - print('') - - title_done = True - send_guru(msg_text, msg_type) - - if navbar != "on": - return - - # NAVBAR - print('') - -def send_httperror(status="403 Not Found", query=""): +def send_httperror(status="403 Not Found", query="", trace=False): print("Status: %s" % status) + msg_text = "%s: on query '%s'" % (status, query) + if trace: + import traceback + msg_text += '\n\n' + traceback.format_exc() page = Page() - send_title(None, msg_text=("%s: on query '%s'" % (status, query))) + page.send_title(msg_text=msg_text) page.send_footer() def link_tag(dest, text=None, privileged=False, **kvargs): @@ -248,14 +179,12 @@ def link_inline_glob(pattern, descr=None, kvargs={}): else: return link_inline(pattern, descr, kvargs) -# Search --------------------------------------------------- - -def print_search_stats(hits, searched): - print("

%d hits out of %d pages searched.

" % (hits, searched)) +def search_stats(hits, searched): + return "%d hits out of %d pages searched.\n" % (hits, searched) def handle_fullsearch(query, form): needle = form['q'].value - send_title(None, 'Full text search for "' + needle + '"') + Page().send_title(text='Full text search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) hits = [] @@ -266,59 +195,50 @@ def handle_fullsearch(query, form): if count: hits.append((count, page_name)) - # The default comparison for tuples compares elements in order, - # so this sorts by number of hits + # The default comparison for tuples compares elements in order, so this sorts by number of hits hits.sort() hits.reverse() - print("
    ") + out = '' for (count, page_name) in hits: - print('

  • ' + link_tag(page_name)) - print(' . . . . ' + `count`) - print(['match', 'matches'][count != 1]) - print('

    • ') - print("
") + out += ' * [[' + page_name + ']] . . . ' + str(count) + ' ' + ['match', 'matches'][count != 1] + '\n' - print_search_stats(len(hits), len(all_pages)) + out += search_stats(len(hits), len(all_pages)) + WikiFormatter(out).print_html() def handle_titlesearch(query, form): needle = form['q'].value - send_title(None, 'Title search for "' + needle + '"') + Page().send_title(text='Title search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) all_pages = page_list() hits = list(filter(needle_re.search, all_pages)) - print("
    ") + out = '' for filename in hits: - print('

  • ' + link_tag(filename) + "

    • ") - print("
") + out += ' * [[' + filename + ']]\n' - print_search_stats(len(hits), len(all_pages)) + out += search_stats(len(hits), len(all_pages)) + WikiFormatter(out).print_html() def handle_raw(pagename, form): - if not file_re.match(pagename): - send_httperror("403 Forbidden", pagename) - return - Page(pagename).send_raw() -def handle_edit(pagename, form): - if not file_re.match(pagename): - send_httperror("403 Forbidden", pagename) - return +def handle_atom(pagename, form): + Page(pagename).send_atom() +def handle_edit(pagename, form): pg = Page(form['q'].value) if 'save' in form: if form['file'].value: pg.save(form['file'].file.read(), form['changelog'].value) else: pg.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value) - pg.format() + pg.send() elif 'cancel' in form: pg.msg_text = 'Editing canceled' pg.msg_type = 'notice' - pg.format() + pg.send() else: # preview or edit text = None if 'preview' in form: @@ -326,16 +246,13 @@ def handle_edit(pagename, form): pg.send_editor(text) def handle_get(pagename, form): - if file_re.match(pagename): - # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension! - from mimetypes import MimeTypes - mimetype, encoding = MimeTypes().guess_type(pagename) - if mimetype: - Page(pagename).send_raw(mimetype=mimetype, args=form) - else: - Page(pagename).format() - else: - send_httperror("403 Forbidden", pagename) + if not ext_re.search(pagename): # FIXME: no extension guesses a wiki page + Page(pagename).send() + else: + # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension! + from mimetypes import MimeTypes + mimetype, encoding = MimeTypes().guess_type(pagename) + Page(pagename).send_raw(mimetype=mimetype, args=form) # Used by sys/macros/WordIndex and sys/macros/TitleIndex def make_index_key(): @@ -355,11 +272,7 @@ def _macro_VERSION(*args, **kvargs): return __version__ class WikiFormatter: - """Object that turns Wiki markup into HTML. - - All formatting commands can be parsed one line at a time, though - some state is carried over between lines. - """ + """Object that turns Wiki markup into HTML.""" def __init__(self, raw, kvargs=None): self.raw = raw self.kvargs = kvargs or {} @@ -613,11 +526,18 @@ class WikiFormatter: print(self._indent_to(0)) print('

') +class HttpException(Exception): + def __init__(self, error, query): + self.error = error + self.query = query + class Page: def __init__(self, page_name="Limbo"): self.page_name = page_name.rstrip('/'); self.msg_text = '' self.msg_type = 'error' + if not file_re.match(self.page_name): + raise HttpException("403 Forbidden", self.page_name) def split_title(self): # look for the end of words and the start of a new word and insert a space there @@ -714,6 +634,76 @@ class Page: def can_read(self): return self.can("read", True) + def send_title(self, name=None, text="Limbo", msg_text=None, msg_type='error'): + global title_done + if title_done: return + + # HEAD + emit_header(self._mtime()) + print('\n') + print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text)) + print(' ') + if not name: + print(' ') + + for http_equiv, content in config_get('meta_urls', {}): + print(' ' % (http_equiv, relative_url(content))) + + for link in config_get('link_urls', {}): + rel, href = link + print(' ' % (rel, relative_url(href))) + + editable = name and self.can_write() and is_privileged() + if editable: + print(' ' \ + % relative_url('?a=edit&q=' + name, privileged=True)) + + history = config_get('history_url') + if history is not None: + print(' ' \ + % relative_url(history + '?a=rss')) + + print('') + + # BODY + if editable: + print('') + else: + print('') + + title_done = True + send_guru(msg_text, msg_type) + + if self.pragma("navbar", "on") != "on": + return + + # NAVBAR + print('') + def send_footer(self): if config_get('debug_cgi', False): cgi.print_arguments() @@ -722,7 +712,7 @@ class Page: footer = self.pragma("footer", "sys/footer") if footer != "off": link_inline(footer, kvargs = { - 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(self._mtime())) + 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime())) }) print("") @@ -732,21 +722,31 @@ class Page: else: send_guru("Read access denied by ACLs", "notice") - def format(self): + def send(self): #css foo.css value = self.pragma("css", None) if value: global link_urls link_urls += [ [ "stylesheet", value ] ] - send_title(self.page_name, self.split_title(), - msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write(), mtime=self._mtime(), - navbar=self.pragma("navbar", "on")) + self.send_title(name=self.page_name, text=self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) self.send_naked() self.send_footer() + def send_atom(self): + emit_header(self._mtime(), 'application/atom+xml') + self.in_html = True + link_inline("sys/atom_header", kvargs = { + 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a, %d %b %Y %I:%M:%S %p'), localtime(self._mtime())) + }) + self.in_html = False + self.send_naked() + self.in_html = True + link_inline("sys/atom_footer") + self.in_html = False + def send_editor(self, preview=None): - send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) + self.send_title(text='Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) if not self.can_write(): send_guru("Write access denied by ACLs", "error") return @@ -767,7 +767,7 @@ class Page: def send_raw(self, mimetype='text/plain', args=[]): if not self.can_read(): - send_title(None, msg_text='Read access denied by ACLs', msg_type='notice', mtime=self._mtime()) + self.send_title(msg_text='Read access denied by ACLs', msg_type='notice') return emit_header(self._mtime(), mimetype) @@ -833,13 +833,9 @@ try: else: send_httperror("403 Forbidden", query_string()) +except HttpException, e: + send_httperror(e.error, query=e.query) except Exception: - import traceback - msg_text = traceback.format_exc() - if title_done: - send_guru(msg_text, "error") - else: - send_title(None, msg_text=msg_text) - Page().send_footer() + send_httperror("500 Internal Server Error", query=query_string(), trace=True) sys.stdout.flush()