\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 '
'
elif self.in_pre:
- self.in_pre = 0
+ self.in_pre = False
return ''
- else:
- 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 _var_repl(self, word):
if word == '{{' and not self.in_var:
- self.in_var = 1
+ self.in_var = True
return ''
elif self.in_var:
- self.in_var = 0
+ self.in_var = False
return ''
- else:
- 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], ())
+ return ''
+
+ def _tr_repl(self, word):
+ out = ''
+ if not self.in_table:
+ self.in_table = True
+ self.tr_cnt = 0
+ out = '| ' + + def _tre_repl(self, word): + if self.in_table: + return ' | '
+ return ''
def _indent_level(self):
return len(self.list_indents) and self.list_indents[-1]
@@ -461,33 +486,46 @@ 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
+ # TODO: highlight search words (look at referer)
scan_re = re.compile(
r"(?:"
+ # Formatting
+ r"(?P |
' + if blank_re.match(line): print '
' - continue - indent = indent_re.match(line) - print self._indent_to(len(indent.group(0))) - print re.sub(scan_re, self.replace, line) + else: + indent = indent_re.match(line) + print self._indent_to(len(indent.group(0))) + print re.sub(scan_re, self.replace, line) + if self.in_pre: print '' + if self.in_table: print '
' print self._undent() - print "
" + print '' # ---------------------------------------------------------- class Page: @@ -543,11 +587,7 @@ 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: @@ -576,27 +616,38 @@ class Page: raise er return self.attrs - def can_edit(self): + def can(self, action, default=True): attrs = self.get_attrs() try: # SomeUser:read,write All:read acl = attrs["acl"] 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 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): @@ -608,6 +659,9 @@ class Page: 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()) @@ -632,6 +686,9 @@ class Page: send_footer(self.page_name) 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() @@ -648,6 +705,11 @@ class Page: os.rename(tmp_filename, text) def save_text(self, newtext): + if not self.can_write(): + self.msg = 'Write access denied by ACLs' + self.msg_type = 'error' + return + self._write_file(newtext) rc = 0 if post_edit_hook: @@ -666,7 +728,7 @@ class Page: if msg: self.msg += 'Output follows:\n' + msg else: - self.msg = 'Thankyou for your contribution. Your attention to detail is appreciated.' + self.msg = 'Thank you for your contribution. Your attention to detail is appreciated.' self.msg_type = 'success' def send_verbatim(filename, mime_type='application/octet-stream'): @@ -680,8 +742,7 @@ try: # Configuration values site_name = 'Codewiz' - # set to None for read-only sites - # leave empty ('') to allow anonymous edits + # set to None for read-only sites, leave empty ('') to allow anonymous edits # otherwise, set to a URL that requires authentication privileged_url = 'https://www.codewiz.org/~bernie/wiki' @@ -693,7 +754,7 @@ try: datetime_fmt = '%a %d %b %Y %I:%M %p' allow_edit = True # Is it possible to edit pages? show_hosts = True # show hostnames? - nonexist_qm = False # show '?' for nonexistent? + nonexist_pfx = '' # prefix before nonexistent link (usually '?') debug_cgi = False # Set to True for CGI var dump form = cgi.FieldStorage()