X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=geekigeeki.py;h=cd92c54edffbd737d1d6affdbe7e94f83faf3a2b;hb=f21a426a573a28806267553a963a5930304e2f01;hp=aa6d332a449e2b9b3ce481e38c0862f820ce67af;hpb=a0e866e20240e1b4c862a16c1ce798628985b823;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index aa6d332..cd92c54 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,10 +1,9 @@
-#! /usr/bin/env python
-"""Quick-quick implementation of WikiWikiWeb in Python
-"""
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
#
-# Copyright (C) 1999, 2000 Martin Pool
-# This version includes additional changes by Gerardo Poggiali (2002)
-# This version includes additional changes by Bernardo Innocenti (2007)
+# Copyright 1999, 2000 Martin Pool
+# Copyright 2002 Gerardo Poggiali
+# Copyright 2007 Bernardo 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
@@ -19,9 +18,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-__version__ = '$Revision: 1.63+gerry+bernie $'[11:-2]
+__version__ = '$Id$'[4:12]
-import cgi, sys, string, os, re, errno, time, stat
+from time import clock
+start_time = clock()
+
+import cgi, sys, string, os, re, errno, stat
from os import path, environ
# Regular expression defining a WikiWord
@@ -102,16 +104,17 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
# Head
emit_header()
- print """
-
-"""
+ print ''
+ print ''
+
+ site_name = globals().get('site_name', 'Unconfigured Site')
print "%s: %s " % (site_name, text)
print ' '
if not name:
print ' '
- if css_url:
- print ' ' % css_url
+ for css in css_url:
+ print ' ' % css
print ''
# Body
@@ -127,15 +130,17 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
print ''
print '
' + site_name + ': ',
if name:
- print link_tag('?fullsearch=' + name, text) + ' '
+ print link_tag('?fullsearch=' + name, text, 'navlink') + ' '
else:
print text + ' '
print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
- print ' |
Recent Changes '
+ if globals().has_key('history_url'):
+ print ' |
Recent Changes '
+ if name:
+ print ' |
Page History '
if name:
- print ' |
Page History '
print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
if privileged_url is not None:
print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', authentication=True)
@@ -154,8 +159,7 @@ def link_tag(params, text=None, ss_class=None, authentication=False):
classattr = ''
if ss_class:
classattr += 'class="%s" ' % ss_class
- # Prevent crawlers from following links to generated pages
- # and links added by potential spammers
+ # Prevent crawlers from following links potentially added by spammers or to generated pages
if ss_class == 'external' or ss_class == 'navlink':
classattr += 'rel="nofollow" '
if authentication:
@@ -187,13 +191,12 @@ def do_fullsearch(needle):
for (count, page_name) in hits:
print '
' + Page(page_name).link_to()
print ' . . . . ' + `count`
- print ['match', 'matches'][count <> 1]
+ print ['match', 'matches'][count != 1]
print '
'
print ""
print_search_stats(len(hits), len(all_pages))
-
def do_titlesearch(needle):
# TODO: check needle is legal -- but probably we can just accept any RE
send_title(None, "Title search for \"" + needle + '"')
@@ -209,10 +212,10 @@ def do_titlesearch(needle):
print_search_stats(len(hits), len(all_pages))
-
def print_search_stats(hits, searched):
print "
%d hits out of %d pages searched.
" % (hits, searched)
+#TODO: merge into do_savepage()
def do_edit(pagename):
Page(pagename).send_editor()
@@ -220,9 +223,6 @@ def do_raw(pagename):
Page(pagename).send_raw()
def do_savepage(pagename):
- if privileged_url is None:
- raise 'editing disallowed for ' + pagename
-
global form
pg = Page(pagename)
if 'preview' in form:
@@ -231,7 +231,7 @@ def do_savepage(pagename):
pg.save_text(form['savetext'].value)
pg.send_page()
elif 'cancel' in form:
- pg.msg = 'Editing cancelled'
+ pg.msg = 'Editing canceled'
pg.msg_type = 'notice'
pg.send_page()
else:
@@ -245,29 +245,29 @@ def make_index_key():
s = s + ''
return s
-
def page_list():
- return filter(word_re.match, os.listdir(text_dir))
-
+ return filter(word_re.match, os.listdir(data_dir))
def send_footer(name, mod_string=None):
- if debug_cgi:
+ if globals().get('debug_cgi', False):
cgi.print_arguments()
cgi.print_form(cgi.FieldStorage())
cgi.print_environ()
+ global __version__
print ''
-
# ----------------------------------------------------------
# Macros
-def _macro_TitleSearch():
+def _macro_TitleSearch(*vargs):
return _macro_search("titlesearch")
-def _macro_FullSearch():
+def _macro_FullSearch(*vargs):
return _macro_search("fullsearch")
def _macro_search(type):
@@ -275,9 +275,9 @@ def _macro_search(type):
default = form["value"].value
else:
default = ''
- return """
""" % (type, default)
+ return """
""" % (type, default)
-def _macro_WordIndex():
+def _macro_WordIndex(*vargs):
s = make_index_key()
pages = list(page_list())
map = {}
@@ -295,7 +295,7 @@ def _macro_WordIndex():
# set title
for word in all_words:
letter = string.lower(word[0])
- if letter <> last_letter:
+ if letter != last_letter:
s = s + ';
%s ' % (letter, letter)
last_letter = letter
@@ -310,14 +310,14 @@ def _macro_WordIndex():
return s
-def _macro_TitleIndex():
+def _macro_TitleIndex(*vargs):
s = make_index_key()
pages = list(page_list())
pages.sort()
current_letter = None
for name in pages:
letter = string.lower(name[0])
- if letter <> current_letter:
+ if letter != current_letter:
s = s + '
%s ' % (letter, letter)
current_letter = letter
else:
@@ -335,79 +335,94 @@ class PageFormatter:
"""
def __init__(self, raw):
self.raw = raw
- self.is_em = self.is_b = 0
self.h_level = 0
- self.list_indents = []
- self.in_pre = False
- self.in_table = False
- self.tr_cnt = 0
- self.in_var = False
+ self.in_pre = self.in_table = False
self.in_header = True
+ self.list_indents = []
+ self.tr_cnt = self.h_cnt = 0
+ self.styles = {
+ #wiki html enabled?
+ "//": ["em", False],
+ "''": ["em", False],
+ "**": ["b", False],
+ "'''": ["b", False],
+ "##": ["tt", False],
+ "``": ["tt", False],
+ "__": ["u", False],
+ "^^": ["sup", False],
+ ",,": ["sub", False]
+ }
- def _emph_repl(self, word):
- if len(word) == 3:
- self.is_b = not self.is_b
- return ['', '
'][self.is_b]
- else:
- self.is_em = not self.is_em
- return ['', ''][self.is_em]
+ def _b_repl(self, word):
+ style = self.styles[word]
+ style[1] = not style[1]
+ return ['','<'][style[1]] + style[0] + '>'
def _tit_repl(self, word):
if self.h_level:
- result = "" % self.h_level
+ result = '' % self.h_level
self.h_level = 0
else:
self.h_level = len(word) - 1
- result = "" % self.h_level
+ self.h_cnt += 1
+ #abridged = re.sub('[^a-z_]', '', word.lower().replace(' ', '_'))
+ result = '¶ ' % (self.h_level, self.h_cnt, self.h_cnt)
return result
+ def _br_repl(self, word):
+ return ' '
+
def _rule_repl(self, word):
- s = self._undent()
- if len(word) <= 3:
- s = s + "\n \n"
- else:
- s = s + "\n \n" % (len(word) - 2 )
- return s
+ return self._undent() + '\n \n' % (len(word) - 2)
def _word_repl(self, word):
return Page(word).link_to()
def _img_repl(self, word):
- return ' ' % (script_name(), word)
+ path = script_name() + '/' + word;
+ return ' ' % (path, path)
def _url_repl(self, word):
if img_re.match(word):
- return ' ' % word
+ return ' ' % (word, word)
else:
return '%s ' % (word, word)
def _hurl_repl(self, word):
- m = re.compile("\[\[(\S+)\ (.+)\]\]").match(word)
- anchor = m.group(1)
- descr = m.group(2)
- if img_re.match(anchor):
- return ' ' % (anchor, descr)
- elif url_re.match(anchor):
- return '%s ' % (anchor, descr)
- elif anchor.startswith('/'):
- return '%s ' % (anchor, descr)
+ m = re.compile("\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word)
+ name = m.group(1)
+ descr = m.group(2) or name
+
+ macro = globals().get('_macro_' + name)
+ if macro:
+ return apply(macro, (name, descr))
+ elif img_re.match(name):
+ return '%s
' % (name, name, descr, descr)
else:
- return link_tag(anchor, descr)
+ if img_re.match(descr):
+ descr = ' '
+
+ if url_re.match(name):
+ return '%s ' % (name, descr)
+ elif name.startswith('/'):
+ return '%s ' % (name, descr)
+ else:
+ return link_tag(name, descr, 'wikilink')
def _email_repl(self, word):
return '%s ' % (word, word)
+ def _html_repl(self, word):
+ return word; # Pass through
def _ent_repl(self, s):
return {'&': '&',
'<': '<',
'>': '>'}[s]
-
def _li_repl(self, match):
return ''
-
def _pre_repl(self, word):
if word == '{{{' and not self.in_pre:
self.in_pre = True
@@ -417,17 +432,14 @@ class PageFormatter:
return ''
return ''
- def _hilight_repl(self, word):
- return '' + word + ' '
-
- def _var_repl(self, word):
- if word == '{{' and not self.in_var:
- self.in_var = True
- return ''
- elif self.in_var:
- self.in_var = False
- return '
'
- return ''
+ def _hi_repl(self, word):
+ if word == 'FIXME':
+ cl = 'error'
+ elif word == 'DONE':
+ cl = 'success'
+ elif word == 'TODO':
+ cl = 'notice'
+ return '' + word + ' '
def _tr_repl(self, word):
out = ''
@@ -436,23 +448,19 @@ class PageFormatter:
self.tr_cnt = 0
out = '\n'
self.tr_cnt += 1
- return out + ''
+ out = out + ' '
+ return out + ['', ' '][word.strip() == '||=']
- def _tre_repl(self, word):
+ def _td_repl(self, word):
if self.in_table:
- return ' '
+ return ['', ' '][word.strip() == '||=']
return ''
- def _td_repl(self, word):
+ def _tre_repl(self, word):
if self.in_table:
- return ' '
+ return [' ', ''][word.strip() == '||=']
return ''
- def _macro_repl(self, word):
- macro_name = word[2:-2]
- # TODO: Somehow get the default value into the search field
- return apply(globals()['_macro_' + macro_name], ())
-
def _indent_level(self):
return len(self.list_indents) and self.list_indents[-1]
@@ -484,7 +492,7 @@ class PageFormatter:
raise "Can't handle match " + `match`
def print_html(self):
- print ""
+ print '
'
# For each line, we scan through looking for magic
# strings, outputting verbatim any intervening text
@@ -492,31 +500,29 @@ class PageFormatter:
scan_re = re.compile(
r"(?:"
# Formatting
- + r"(?P'{2,3})"
+ + r"(?P\*\*|'''|//|''|##|``|__|\^\^|,,)"
+ r"|(?P\={2,6})"
+ + r"|(?P \\\\)"
+ r"|(?P^-{3,})"
+ + r"|(?P<(/|)(div|span|iframe)[^<>]*>)"
+ r"|(?P[<>&])"
- + r"|(?P\b(FIXME|TODO)\b)"
+ + r"|(?P\b(FIXME|TODO|DONE)\b)"
# Links
+ r"|(?P \b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
+ r"|(?P\b(?:[A-Z][a-z]+){2,}\b)"
- + r"|(?P\[\[\S+\s+.+\]\])"
- + r"|(?P(http|ftp|nntp|news|mailto)\:[^\s'\"]+\S)"
+ + r"|(?P\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
+ + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)"
+ r"|(?P[-\w._+]+\@[\w.-]+)"
# Lists, divs, spans
- + r"|(?P^\s+\*)"
- + r"|(?P(\{\{\{|\s*\}\}\}))"
- + r"|(?P(\{\{|\}\}))"
+ + r"|(?P^\s+[\*#] +)"
+ + r"|(?P\{\{\{|\s*\}\}\})"
# Tables
- + r"|(?P^\s*\|\|\s*)"
- + r"|(?P\s*\|\|\s*$)"
- + r"|(?P\s*\|\|\s*)"
-
- # Macros
- + r"|(?P\[\[(TitleSearch|FullSearch|WordIndex|TitleIndex)\]\])"
+ + r"|(?P^\s*\|\|(=|)\s*)"
+ + r"|(?P\s*\|\|(=|)\s*$)"
+ + r"|(?P\s*\|\|(=|)\s*)"
+ r")")
pre_re = re.compile(
r"(?:"
@@ -551,7 +557,7 @@ class PageFormatter:
if self.in_pre: print ''
if self.in_table: print '
'
print self._undent()
- print "
"
+ print '
'
# ----------------------------------------------------------
class Page:
@@ -559,7 +565,6 @@ class Page:
self.page_name = page_name
self.msg = ''
self.msg_type = 'error'
- self.attrs = {}
def split_title(self):
# look for the end of words and the start of a new word,
@@ -567,18 +572,18 @@ class Page:
return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
def _text_filename(self):
- return path.join(text_dir, self.page_name)
+ return path.join(data_dir, self.page_name)
def _tmp_filename(self):
- return path.join(text_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#'))
+ return path.join(data_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#'))
def exists(self):
try:
os.stat(self._text_filename())
- return 1
+ return True
except OSError, er:
if er.errno == errno.ENOENT:
- return 0
+ return False
else:
raise er
@@ -587,25 +592,20 @@ class Page:
if self.exists():
return link_tag(word, word, 'wikilink')
else:
- if nonexist_qm:
- return link_tag(word, '?', 'nonexistent') + word
- else:
- return link_tag(word, word, 'nonexistent')
-
+ return link_tag(word, nonexist_pfx + word, 'nonexistent')
def get_raw_body(self):
try:
return open(self._text_filename(), 'rt').read()
except IOError, er:
if er.errno == errno.ENOENT:
- # just doesn't exist, use default
- return 'Describe %s here.' % self.page_name
- else:
- raise er
+ return '' # just doesn't exist, use default
+ raise er
def get_attrs(self):
- if self.attrs:
+ if self.__dict__.has_key('attrs'):
return self.attrs
+ self.attrs = {}
try:
file = open(self._text_filename(), 'rt')
attr_re = re.compile(r"^#(\S*)(.*)$")
@@ -620,38 +620,66 @@ class Page:
raise er
return self.attrs
- def can_edit(self):
- attrs = self.get_attrs()
+ def get_attr(self, name, default):
+ if self.get_attrs().has_key(name):
+ return self.get_attrs()[name]
+ else:
+ return default
+
+ def can(self, action, default=True):
try:
- # SomeUser:read,write All:read
- acl = attrs["acl"]
+ #acl SomeUser:read,write All:read
+ acl = self.get_attr("acl", None)
for rule in acl.split():
- (user,perms) = acl.split(':')
+ (user,perms) = rule.split(':')
if user == remote_user() or user == "All":
- if 'write' in perms.split(','):
+ if action in perms.split(','):
return True
+ else:
+ return False
return False
- except:
+ except Exception, er:
pass
- return True
+ return default
+
+ def can_write(self):
+ return self.can("write", True)
+
+ def can_read(self):
+ return self.can("read", True)
def send_page(self):
page_name = None
- if self.can_edit():
+ if self.can_write():
page_name = self.page_name
+
+ #FIXME: are there security implications?
+ #css foo.css bar.css
+ global css_url
+ css_url = css_url + self.get_attr("css", "").split()
+
send_title(page_name, self.split_title(), msg=self.msg, msg_type=self.msg_type)
- PageFormatter(self.get_raw_body()).print_html()
+ if self.can_read():
+ PageFormatter(self.get_raw_body()).print_html()
+ else:
+ send_guru("Read access denied by ACLs", "notice")
send_footer(page_name, self._last_modified())
def _last_modified(self):
- if not self.exists():
+ try:
+ from time import localtime, strftime
+ modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
+ except OSError, er:
+ if er.errno != errno.ENOENT:
+ raise er
return None
- from time import localtime, strftime
- modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
return strftime(datetime_fmt, modtime)
def send_editor(self, preview=None):
send_title(None, 'Edit ' + self.split_title(), msg=self.msg, msg_type=self.msg_type)
+ if not self.can_write():
+ send_guru("Write access denied by ACLs", "error")
+ return
print ('Editing ' + self.page_name
+ ' for ' + cgi.escape(remote_user())
@@ -659,7 +687,7 @@ class Page:
+ '
')
print '