%s: %s

' - print ' ' + site_name + ': ', if name: - print link_tag('?fullsearch=' + name, text, 'navlink') + ' ' + print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ' else: - print text + ' ' - print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink') + print ' ' + text + ' ' + print ' | ' + link_tag('FrontPage', 'Home', 'navlink') print ' | ' + link_tag('FindPage', 'Find Page', 'navlink') - if globals().has_key('history_url'): - print ' | Recent Changes' + if 'history_url' in globals(): + print ' | Recent Changes' if name: - print ' | Page History' + print ' | Page History' if name: print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink') if privileged_url is not None: - print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', privileged=True) + if writable: + print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True) + else: + print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True) + else: print ' | Immutable Page' @@ -162,6 +181,11 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'): print '

' - print ('

generated in %0.3fs' + - ' by GeekiGeeki' + - ' version %s

') % (clock() - start_time, __version__) + print ''' +' -# ---------------------------------------------------------- -# Macros -def _macro_TitleSearch(*vargs): - return _macro_search("titlesearch") - -def _macro_FullSearch(*vargs): - return _macro_search("fullsearch") - -def _macro_search(type): - if form.has_key('value'): - default = form["value"].value - else: - default = '' - return """""" % (type, default) - -def _macro_WordIndex(*vargs): - s = make_index_key() - pages = list(page_list()) - map = {} - word_re = re.compile('[A-Z][a-z]+') - for name in pages: - for word in word_re.findall(name): - try: - map[word].append(name) - except KeyError: - map[word] = [name] - - all_words = map.keys() - all_words.sort() - last_letter = None - # set title - for word in all_words: - letter = string.lower(word[0]) - if letter != last_letter: - s = s + ';

%s

' % (letter, letter) - last_letter = letter - - s = s + '%s

' + Page(name).link_to() - s = s + '

' - return s - - -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: - s = s + '

%s

' % (letter, letter) - current_letter = letter - else: - s = s + '
' - s = s + Page(name).link_to() - return s - - -# ---------------------------------------------------------- -class PageFormatter: +class WikiFormatter: """Object that turns Wiki markup into HTML. All formatting commands can be parsed one line at a time, though @@ -341,10 +307,10 @@ class PageFormatter: def __init__(self, raw): self.raw = raw self.h_level = 0 - self.in_pre = self.in_table = False + self.in_pre = self.in_html = self.in_table = self.in_li = False self.in_header = True self.list_indents = [] - self.tr_cnt = self.h_cnt = 0 + self.tr_cnt = 0 self.styles = { #wiki html enabled? "//": ["em", False], @@ -361,17 +327,16 @@ class PageFormatter: def _b_repl(self, word): style = self.styles[word] style[1] = not style[1] - return ['' + return ['' def _tit_repl(self, word): if self.h_level: - result = '' % self.h_level + result = '

\n' % self.h_level self.h_level = 0 else: self.h_level = len(word) - 1 - self.h_cnt += 1 - #abridged = re.sub('[^a-z_]', '', word.lower().replace(' ', '_')) - result = 'Â¶ ' % (self.h_level, self.h_cnt, self.h_cnt) + link = permalink(self.line) + result = '\n

Â¶ ' % (self.h_level, link, link) return result def _br_repl(self, word): @@ -384,8 +349,8 @@ class PageFormatter: return Page(word).link_to() def _img_repl(self, word): - path = relative_url(word) - return '

' % (path, path) + pathname = relative_url(word) + return '

' % (pathname, pathname) def _url_repl(self, word): if img_re.match(word): @@ -393,41 +358,78 @@ class PageFormatter: else: return '%s' % (word, word) - def _hurl_repl(self, word): - m = re.compile("\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word) + def _macro_repl(self, word): + m = re.compile("\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>").match(word) name = m.group(1) - descr = m.group(2) or name + argv = [name] + if m.group(2): + argv.extend(m.group(2).split('|')) + argv = map(str.strip, argv) macro = globals().get('_macro_' + name) + if not macro: + try: + execfile("macros/" + name + ".py", globals()) + except IOError, err: + if err.errno == errno.ENOENT: pass + macro = globals().get('_macro_' + name) if macro: - return apply(macro, (name, descr)) - elif img_re.match(name): - # The "extthumb" nonsense works around a limitation of the HTML block model - return '

' % (name, name, descr, descr) + return macro(argv) else: - if img_re.match(descr): - descr = '

' + return '<<' + '|'.join(argv) + '>>' - if url_re.match(name): - return '%s' % (name, descr) - elif name.startswith('/'): - return '%s' % (name, descr) - else: - return link_tag(name, descr, 'wikilink') + def _hurl_repl(self, word): + m = link_re.match(word) + name = m.group(1) + descr = m.group(2) + if descr is None: + descr = name + elif img_re.match(m.group(2)): + descr = '

' + + return link_tag(name, descr, 'wikilink') + + def _inl_repl(self, word): + m = link_re.match(word) + name = m.group(1) + descr = m.group(2) or name + name = relative_url(name) + argv = descr.split('|') + descr = argv.pop(0) + + if argv: + args = '?' + '&'.join(argv) + else: + args = '' + + if descr: + # The "extthumb" nonsense works around a limitation of the HTML block model + return '

' \ + % (name, name + args, descr, descr) + else: + return '

' % (name, name + args) def _email_repl(self, word): return '%s' % (word, word) def _html_repl(self, word): + self.in_html += 1 return word; # Pass through def _ent_repl(self, s): + if self.in_html and s == '>': + self.in_html -= 1 + return '>' return {'&': '&', '<': '<', '>': '>'}[s] def _li_repl(self, match): - return '

' + if self.in_li: + return '

' + else: + self.in_li = True + return '

' def _pre_repl(self, word): if word == '{{{' and not self.in_pre: @@ -439,13 +441,7 @@ class PageFormatter: return '' def _hi_repl(self, word): - if word == 'FIXME': - cl = 'error' - elif word == 'DONE': - cl = 'success' - elif word == 'TODO': - cl = 'notice' - return '' + word + '' + return '' + word + '' def _tr_repl(self, word): out = '' @@ -476,6 +472,9 @@ class PageFormatter: s = '

' while self._indent_level() > new_level: del(self.list_indents[-1]) + if self.in_li: + s += '

' + self.in_li = False # FIXME s += '\n' while self._indent_level() < new_level: self.list_indents.append(new_level) @@ -491,18 +490,18 @@ class PageFormatter: return res def replace(self, match): - for type, hit in match.groupdict().items(): + for rule, hit in match.groupdict().items(): if hit: - return apply(getattr(self, '_' + type + '_repl'), (hit,)) + return getattr(self, '_' + rule + '_repl')(hit) else: - raise "Can't handle match " + `match` + raise "Can't handle match " + repr(match) def print_html(self): print '

' # For each line, we scan through looking for magic # strings, outputting verbatim any intervening text - # TODO: highlight search words (look at referer) + # TODO: highlight search words (look at referrer) scan_re = re.compile( r"(?:" # Formatting @@ -510,20 +509,26 @@ class PageFormatter: + r"|(?P\={2,6})" + r"|(?P
\\\\)" + r"|(?P^-{3,})" - + r"|(?P<(/|)(div|span|iframe)[^<>]*>)" - + r"|(?P[<>&])" + r"|(?P\b(FIXME|TODO|DONE)\b)" # Links - + r"|(?P\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))" + + r"|(?P\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)" + + r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" + + # Inline HTML + + r"|(?P<(/|)(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])[^>]*>)" + + r"|(?P[<>&])" + + # Auto links (LEGACY) + + r"|(?P\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp|ico))" + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" - + 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\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})"
 
             # Tables
             + r"|(?P^\s*\|\|(=|)\s*)"
@@ -533,65 +538,62 @@ class PageFormatter:
         pre_re = re.compile(
             r"(?:"
             + r"(?P\s*\}\}\})"
+            + r"|(?P[<>&])"
             + r")")
         blank_re = re.compile(r"^\s*$")
         indent_re = re.compile(r"^\s*")
         tr_re = re.compile(r"^\s*\|\|")
         eol_re = re.compile(r"\r?\n")
-        raw = string.expandtabs(self.raw)
-        for line in eol_re.split(raw):
-            # Skip ACLs
+        for self.line in eol_re.split(self.raw.expandtabs()):
+            # Skip pragmas
             if self.in_header:
-                if line.startswith('#'):
-                   continue
+                if self.line.startswith('#'):
+                    continue
                 self.in_header = False
 
             if self.in_pre:
-                print re.sub(pre_re, self.replace, line)
+                print re.sub(pre_re, self.replace, self.line)
             else:
-                if self.in_table and not tr_re.match(line):
+                if self.in_table and not tr_re.match(self.line):
                     self.in_table = False
                     print ''
 
-                if blank_re.match(line):
+                if blank_re.match(self.line):
                     print '
'
                 else:
-                    indent = indent_re.match(line)
-                    print self._indent_to(len(indent.group(0)))
-                    print re.sub(scan_re, self.replace, line)
+                    indent = indent_re.match(self.line)
+                    print self._indent_to(len(indent.group(0))) ,
+                    print re.sub(scan_re, self.replace, self.line)
 
         if self.in_pre: print ''
         if self.in_table: print ''
         print self._undent()
         print '

' -# ---------------------------------------------------------- class Page: def __init__(self, page_name): self.page_name = page_name - self.msg = '' + self.msg_text = '' self.msg_type = 'error' def split_title(self): - # look for the end of words and the start of a new word, - # and insert a space there + # look for the end of words and the start of a new word and insert a space there return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name) - def _text_filename(self): - return path.join(data_dir, self.page_name) + def _filename(self): + return os.path.join(data_dir, self.page_name) def _tmp_filename(self): - return path.join(data_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#')) + return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#')) def exists(self): try: - os.stat(self._text_filename()) + os.stat(self._filename()) return True - except OSError, er: - if er.errno == errno.ENOENT: + except OSError, err: + if err.errno == errno.ENOENT: return False - else: - raise er + raise err def link_to(self): word = self.page_name @@ -602,50 +604,64 @@ class Page: def get_raw_body(self): try: - return open(self._text_filename(), 'rt').read() - except IOError, er: - if er.errno == errno.ENOENT: + return open(self._filename(), 'rb').read() + except IOError, err: + if err.errno == errno.ENOENT: return '' # just doesn't exist, use default - raise er + if err.errno == errno.EISDIR: + return self.format_dir() + raise err + + def format_dir(self): + out = '== ' + pathname = '' + for dirname in self.page_name.split('/'): + pathname = (pathname + '/' + dirname) if pathname else dirname + out += '[[' + pathname + '|' + dirname + ']]/' + out += ' ==\n' + + for filename in page_list(self._filename(), file_re): + if img_re.match(filename): + if image_maxwidth: + maxwidth_arg = '|maxwidth=' + str(image_maxwidth) + out += '{{' + self.page_name + '/' + filename + '|' + filename + maxwidth_arg + '}}\n' + else: + out += ' * [[' + self.page_name + '/' + filename + ']]\n' + return out - def get_attrs(self): - if self.__dict__.has_key('attrs'): - return self.attrs - self.attrs = {} - try: - file = open(self._text_filename(), 'rt') - attr_re = re.compile(r"^#(\S*)(.*)$") - for line in file: - m = attr_re.match(line) - if not m: - break - self.attrs[m.group(1)] = m.group(2).strip() - #print "bernie: attrs[" + m.group(1) + "] = " + m.group(2) + "
\n" - except IOError, er: - if er.errno != errno.ENOENT: - raise er - return self.attrs - - def get_attr(self, name, default): - if self.get_attrs().has_key(name): - return self.get_attrs()[name] - else: - return default + def pragmas(self): + if not '_pragmas' in self.__dict__: + self._pragmas = {} + try: + f = open(self._filename(), 'rt') + attr_re = re.compile(r"^#(\S*)(.*)$") + for line in f: + m = attr_re.match(line) + if not m: + break + self._pragmas[m.group(1)] = m.group(2).strip() + #print "bernie: _pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" + except IOError, err: + if err.errno != errno.ENOENT and err.errno != errno.EISDIR: + raise err + return self._pragmas + + def pragma(self, name, default): + return self.pragmas().get(name, default) def can(self, action, default=True): + acl = None try: #acl SomeUser:read,write All:read - acl = self.get_attr("acl", None) + acl = self.pragma("acl", None) for rule in acl.split(): - (user,perms) = rule.split(':') + (user, perms) = rule.split(':') if user == remote_user() or user == "All": - if action in perms.split(','): - return True - else: - return False + return action in perms.split(',') return False - except Exception, er: - pass + except Exception: + if acl: + self.msg_text = 'Illegal acl line: ' + acl return default def can_write(self): @@ -654,155 +670,172 @@ class Page: def can_read(self): return self.can("read", True) - def send_page(self): - page_name = None - 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) + def send_naked(self): if self.can_read(): - PageFormatter(self.get_raw_body()).print_html() + WikiFormatter(self.get_raw_body()).print_html() else: send_guru("Read access denied by ACLs", "notice") - send_footer(page_name, self._last_modified()) + + def format(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()) + self.send_naked() + send_footer(self._last_modified()) def _last_modified(self): 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 + modtime = localtime(os.stat(self._filename())[stat.ST_MTIME]) + except OSError, err: + if err.errno != errno.ENOENT: + raise err return None 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) + send_title(None, '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 + filename = '' + if 'file' in form: + filename = form['file'].value + print ('

Editing ' + self.page_name + ' for ' + cgi.escape(remote_user()) + ' from ' + cgi.escape(get_hostname(remote_host())) + '

') - print '

""" +

+ + """ print "

" + Page('EditingTips').link_to() + "

" if preview: print "

" - PageFormatter(preview).print_html() + WikiFormatter(preview).print_html() print "

" - send_footer(self.page_name) + send_footer() - def send_raw(self): - if not self.can_read(): - send_title(None, msg='Read access denied by ACLs', msg_type='notice') - return - emit_header("text/plain") - print self.get_raw_body() + def send_raw(self, mimetype='text/plain'): + if self.can_read(): + body = self.get_raw_body() + emit_header(mimetype) + print body + else: + send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') + + def send_image(self, mimetype, args=[]): + if 'maxwidth' in args: + import subprocess + emit_header(mimetype) + sys.stdout.flush() + subprocess.check_call(['gm', 'convert', self._filename(), + '-scale', args['maxwidth'].value + ' >', '-']) + else: + self.send_raw(mimetype) - def _write_file(self, text): + def _write_file(self, data): tmp_filename = self._tmp_filename() - open(tmp_filename, 'wt').write(text.replace('\r\n', '\n')) - text = self._text_filename() + open(tmp_filename, 'wb').write(data) + name = self._filename() if os.name == 'nt': # Bad Bill! POSIX rename ought to replace. :-( try: - os.remove(text) - except OSError, er: - if er.errno != errno.ENOENT: raise er - os.rename(tmp_filename, text) + os.remove(name) + except OSError, err: + if err.errno != errno.ENOENT: raise err + os.rename(tmp_filename, name) - def save_text(self, newtext): + def save(self, newdata, changelog): if not self.can_write(): - self.msg = 'Write access denied by ACLs' + self.msg_text = 'Write access denied by ACLs' self.msg_type = 'error' return - self._write_file(newtext) + self._write_file(newdata) rc = 0 if post_edit_hook: # FIXME: what's the std way to perform shell quoting in python? cmd = ( post_edit_hook + " '" + data_dir + '/' + self.page_name + "' '" + remote_user() - + "' '" + remote_host() + "'" + + "' '" + remote_host() + + "' '" + changelog + "'" ) out = os.popen(cmd) - msg = out.read() + output = out.read() rc = out.close() if rc: - self.msg += "Post-editing hook returned %d.\n" % rc - self.msg += 'Command was: ' + cmd + '\n' - if msg: - self.msg += 'Output follows:\n' + msg + self.msg_text += "Post-editing hook returned %d.\n" % rc + self.msg_text += 'Command was: ' + cmd + '\n' + if output: + self.msg_text += 'Output follows:\n' + output else: - self.msg = 'Thank you for your contribution. Your attention to detail is appreciated.' + self.msg_text = 'Thank you for your contribution. Your attention to detail is appreciated.' self.msg_type = 'success' -#TODO: merge into send_raw() -def send_verbatim(filename, mime_type='application/octet-stream'): - pathname = path.join(data_dir, filename) - data = open(pathname, 'rb').read() - emit_header(mime_type) - sys.stdout.write(data) - -# Main --------------------------------------------------------------- -try: - execfile("geekigeeki.conf.py") - - form = cgi.FieldStorage() - - handlers = { 'fullsearch': do_fullsearch, - 'titlesearch': do_titlesearch, - 'edit': do_edit, - 'raw': do_raw, - 'savepage': do_savepage } - - for cmd in handlers.keys(): - if form.has_key(cmd): - apply(handlers[cmd], (form[cmd].value,)) +def main(): + for cmd in form: + handler = globals().get('handle_' + cmd) + if handler: + handler(form[cmd].value) break else: - path_info = environ.get('PATH_INFO', '') + path_info = os.environ.get('PATH_INFO', '') if len(path_info) and path_info[0] == '/': query = path_info[1:] or 'FrontPage' else: - query = environ.get('QUERY_STRING', '') or 'FrontPage' + query = os.environ.get('QUERY_STRING', '') or 'FrontPage' if file_re.match(query): if word_re.match(query): - Page(query).send_page() - elif img_re.match(query): - #FIXME: use correct mime type - send_verbatim(query, 'image/jpeg') + Page(query).format() else: - send_verbatim(query) + from mimetypes import MimeTypes + mimetype, encoding = MimeTypes().guess_type(query) + if mimetype: + if mimetype.startswith('image/'): + Page(query).send_image(mimetype=mimetype, args=form) + else: + Page(query).send_raw(mimetype=mimetype) + else: + Page(query).format() else: - print "Status: 404 Not Found" - send_title(None, msg='Can\'t work out query: ' + query) -except: + send_httperror("403 Forbidden", query) + +try: + execfile("geekigeeki.conf.py") + form = cgi.FieldStorage() + main() +except Exception: import traceback - msg=traceback.format_exc() + msg_text = traceback.format_exc() if title_done: - send_guru(msg, "error") + send_guru(msg_text, "error") else: - send_title(None, msg=msg) - send_footer(None) + send_title(None, msg_text=msg_text) + send_footer() sys.stdout.flush()