X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=a9aa019400d5e166e662668def9a1c8fd6ba7bec;hb=f223be8a781401fb22428712f25fe3531fe503be;hp=d7e1a5a9e0d28a466e8f40b5704df5d4ea77148f;hpb=ff74de7a49cc2bfa936503a4b37fc5c8a650a5fc;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index d7e1a5a..a9aa019 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3.0
# -*- coding: utf-8 -*-
#
# Copyright 1999, 2000 Martin Pool
@@ -31,7 +31,7 @@ from os import path, environ
word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
# 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)$", re.IGNORECASE)
+img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico)$", re.IGNORECASE)
url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})")
@@ -59,7 +59,7 @@ def get_hostname(addr):
try:
from socket import gethostbyaddr
return gethostbyaddr(addr)[0] + ' (' + addr + ')'
- except Exception, er:
+ except Exception as er:
return addr
def relative_url(pathname, privileged=False):
@@ -76,19 +76,19 @@ def permalink(s):
# Formatting stuff --------------------------------------------------
def emit_header(mime_type="text/html"):
- print "Content-type: " + mime_type + "; charset=utf-8\n"
+ print("Content-type: " + mime_type + "; charset=utf-8\n")
def send_guru(msg_text, msg_type):
if not msg_text: return
- print ''
+ print('')
if msg_type == 'error':
- print ' Software Failure. Press left mouse button to continue.\n'
- print msg_text
+ print(' Software Failure. Press left mouse button to continue.\n')
+ print(msg_text)
if msg_type == 'error':
- print ' Guru Meditation #DEADBEEF.ABADC0DE'
- print '
'
+ print('\n Guru Meditation #DEADBEEF.ABADC0DE')
+ print('
')
# FIXME: This little JS snippet is harder to pass than ACID 3.0
- print """
+ print("""
"""
+ """)
-def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
+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('')
+ print('')
site_name = globals().get('site_name', 'Unconfigured Site')
- print "%s: %s" % (site_name, text)
- print ' '
+ print("%s: %s" % (site_name, text))
+ print(' ')
if not name:
- print ' '
- for css in css_url:
- print ' ' % relative_url(css)
- print ''
+ 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() + '?edit=' + name))
+
+ if history_url is not None:
+ print(' ' \
+ % relative_url(history_url + '?a=rss'))
+
+ print('')
# Body
- if name and privileged_url is not None:
- print ''
+ if name and writable and privileged_url is not None:
+ print('')
else:
- print ''
+ print('')
title_done = True
send_guru(msg_text, msg_type)
# Navbar
- print ''
+ print('
')
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 ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
+ print('
' + text + ' ')
+ print(' | ' + link_tag('FrontPage', 'Home', 'navlink'))
+ print(' | ' + link_tag('FindPage', 'Find Page', 'navlink'))
if 'history_url' in globals():
- print ' |
Recent Changes'
+ print(' |
Recent Changes')
if name:
- print ' |
Page History'
+ print(' |
Page History')
if name:
- print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
+ 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'
+ print(' |
Immutable Page')
user = remote_user()
if user != 'AnonymousCoward':
- print ' |
logged in as ' + cgi.escape(user) + ''
+ print(' |
logged in as ' + cgi.escape(user) + '')
+
+ print('
')
- print '
'
+def send_httperror(status="403 Not Found", query=""):
+ print("Status: %s" % status)
+ send_title(None, msg_text=("%s: on query '%s'" % (status, query)))
+ send_footer(None)
def link_tag(params, text=None, ss_class=None, privileged=False):
if text is None:
@@ -196,13 +220,13 @@ def handle_fullsearch(needle):
hits.sort()
hits.reverse()
- print "")
print_search_stats(len(hits), len(all_pages))
@@ -212,28 +236,36 @@ def handle_titlesearch(needle):
needle_re = re.compile(needle, re.IGNORECASE)
all_pages = page_list()
- hits = filter(needle_re.search, all_pages)
+ hits = list(filter(needle_re.search, all_pages))
- print "")
print_search_stats(len(hits), len(all_pages))
def print_search_stats(hits, searched):
- print "%d hits out of %d pages searched.
" % (hits, searched)
+ print("%d hits out of %d pages searched.
" % (hits, searched))
def handle_raw(pagename):
+ if not file_re.match(pagename):
+ send_httperror("403 Forbidden", pagename)
+ return
+
Page(pagename).send_raw()
def handle_edit(pagename):
+ if not file_re.match(pagename):
+ send_httperror("403 Forbidden", pagename)
+ return
+
pg = Page(pagename)
if 'save' in form:
if form['file'].value:
- pg.save(form['file'].file.read())
+ pg.save(form['file'].file.read(), form['changelog'].value)
else:
- pg.save(form['savetext'].value.replace('\r\n', '\n'))
+ pg.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value)
pg.format()
elif 'cancel' in form:
pg.msg_text = 'Editing canceled'
@@ -246,24 +278,27 @@ def handle_edit(pagename):
pg.send_editor(text)
def make_index_key():
- links = map(lambda ch: '%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
+ links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz']
return ''+ ' | '.join(links) + '
'
def page_list(dir = None, re = word_re):
- return filter(re.match, os.listdir(dir or data_dir))
+ return sorted(filter(re.match, os.listdir(dir or data_dir)))
def send_footer(name, mod_string=None):
if globals().get('debug_cgi', False):
cgi.print_arguments()
cgi.print_form(form)
cgi.print_environ()
- print '')
class WikiFormatter:
"""Object that turns Wiki markup into HTML.
@@ -331,11 +366,15 @@ class WikiFormatter:
argv = [name]
if m.group(2):
argv.extend(m.group(2).split('|'))
- argv = map(str.strip, argv)
+ argv = list(map(str.strip, argv))
macro = globals().get('_macro_' + name)
if not macro:
- execfile("macros/" + name + ".py", globals())
+ try:
+ exec(open("macros/" + name + ".py").read(), globals())
+ except IOError as er:
+ if er.errno == errno.ENOENT:
+ pass
macro = globals().get('_macro_' + name)
if macro:
return macro(argv)
@@ -345,12 +384,11 @@ class WikiFormatter:
def _hurl_repl(self, word):
m = link_re.match(word)
name = m.group(1)
- if m.group(2) is None:
+ descr = m.group(2)
+ if descr is None:
descr = name
elif img_re.match(m.group(2)):
descr = '
'
- else:
- descr = m.group(2)
return link_tag(name, descr, 'wikilink')
@@ -455,14 +493,14 @@ class WikiFormatter:
return res
def replace(self, match):
- for type, hit in match.groupdict().items():
+ for type, hit in list(match.groupdict().items()):
if hit:
return getattr(self, '_' + type + '_repl')(hit)
else:
- raise "Can't handle match " + `match`
+ raise "Can't handle match " + repr(match)
def print_html(self):
- print ''
+ print('
')
# For each line, we scan through looking for magic
# strings, outputting verbatim any intervening text
@@ -481,19 +519,19 @@ class WikiFormatter:
+ r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
# Inline HTML
- + r"|(?P<(/|)(br|hr|div|form|iframe|input|span))"
+ + r"|(?P<(/|)(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])[^>]*>)"
+ r"|(?P[<>&])"
- # Auto links
- + r"|(?P
\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY
- + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" # LEGACY
- + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" # LEGACY
- + r"|(?P[-\w._+]+\@[\w.-]+)" # LEGACY
+ # 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(http|https|ftp|mailto)\:[^\s'\"]+\S)"
+ + r"|(?P[-\w._+]+\@[\w.-]+)"
# Lists, divs, spans
+ r"|(?P^\s+[\*#] +)"
+ r"|(?P\{\{\{|\s*\}\}\})"
- + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" #TODO
+ + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})"
# Tables
+ r"|(?P^\s*\|\|(=|)\s*)"
@@ -509,7 +547,7 @@ class WikiFormatter:
indent_re = re.compile(r"^\s*")
tr_re = re.compile(r"^\s*\|\|")
eol_re = re.compile(r"\r?\n")
- for self.line in eol_re.split(self.raw.expandtabs()):
+ for self.line in eol_re.split(str(self.raw).expandtabs()):
# Skip ACLs
if self.in_header:
if self.line.startswith('#'):
@@ -517,23 +555,23 @@ class WikiFormatter:
self.in_header = False
if self.in_pre:
- print re.sub(pre_re, self.replace, self.line)
+ print(re.sub(pre_re, self.replace, self.line))
else:
if self.in_table and not tr_re.match(self.line):
self.in_table = False
- print ''
+ print('
')
if blank_re.match(self.line):
- print '
'
+ print('
')
else:
indent = indent_re.match(self.line)
- print self._indent_to(len(indent.group(0)))
- print re.sub(scan_re, self.replace, self.line)
+ print(self._indent_to(len(indent.group(0))), end=' ')
+ print(re.sub(scan_re, self.replace, self.line))
- if self.in_pre: print ''
- if self.in_table: print '
'
- print self._undent()
- print '
'
+ if self.in_pre: print('')
+ if self.in_table: print('')
+ print(self._undent())
+ print('
')
class Page:
def __init__(self, page_name):
@@ -549,13 +587,13 @@ class Page:
return path.join(data_dir, self.page_name)
def _tmp_filename(self):
- return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
+ return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + repr(os.getpid()) + '#'))
def exists(self):
try:
os.stat(self._filename())
return True
- except OSError, er:
+ except OSError as er:
if er.errno == errno.ENOENT:
return False
raise er
@@ -570,7 +608,7 @@ class Page:
def get_raw_body(self):
try:
return open(self._filename(), 'rb').read()
- except IOError, er:
+ except IOError as er:
if er.errno == errno.ENOENT:
return '' # just doesn't exist, use default
if er.errno == errno.EISDIR:
@@ -606,8 +644,8 @@ class Page:
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:
+ except IOError as er:
+ if er.errno != errno.ENOENT and er.errno != errno.EISDIR:
raise er
return self.attrs
@@ -624,7 +662,7 @@ class Page:
if user == remote_user() or user == "All":
return action in perms.split(',')
return False
- except Exception, er:
+ except Exception as er:
if acl:
self.msg_text = 'Illegal acl line: ' + acl
return default
@@ -642,23 +680,22 @@ class Page:
send_guru("Read access denied by ACLs", "notice")
def format(self):
- page_name = None
- if self.can_write():
- page_name = self.page_name
-
- #css foo.css bar.css
- global css_url
- css_url = self.get_attr("css", "").split() + css_url
-
- send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
+ #css foo.css
+ value = self.get_attr("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(page_name, self._last_modified())
+ send_footer(self.page_name, self._last_modified())
def _last_modified(self):
try:
from time import localtime, strftime
modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
- except OSError, er:
+ except OSError as er:
if er.errno != errno.ENOENT:
raise er
return None
@@ -674,34 +711,41 @@ class Page:
if 'file' in form:
file = form['file'].value
- print ('Editing ' + self.page_name
+ 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 ""
+ print("
")
WikiFormatter(preview).print_html()
- print "
"
+ print("
")
send_footer(self.page_name)
def send_raw(self, mimetype='text/plain'):
if self.can_read():
body = self.get_raw_body()
emit_header(mimetype)
- print body
+ print(body)
else:
send_title(None, msg_text='Read access denied by ACLs', msg_type='notice')
@@ -723,11 +767,11 @@ class Page:
# Bad Bill! POSIX rename ought to replace. :-(
try:
os.remove(name)
- except OSError, er:
+ except OSError as er:
if er.errno != errno.ENOENT: raise er
os.rename(tmp_filename, name)
- def save(self, newdata):
+ def save(self, newdata, changelog):
if not self.can_write():
self.msg_text = 'Write access denied by ACLs'
self.msg_type = 'error'
@@ -740,7 +784,8 @@ class Page:
cmd = ( post_edit_hook
+ " '" + data_dir + '/' + self.page_name
+ "' '" + remote_user()
- + "' '" + remote_host() + "'"
+ + "' '" + remote_host()
+ + "' '" + changelog + "'"
)
out = os.popen(cmd)
output = out.read()
@@ -756,7 +801,7 @@ class Page:
# Main ---------------------------------------------------------------
try:
- execfile("geekigeeki.conf.py")
+ exec(open("geekigeeki.conf.py").read())
form = cgi.FieldStorage()
for cmd in form:
@@ -787,9 +832,7 @@ try:
else:
Page(query).format()
else:
- print "Status: 404 Not Found"
- send_title(None, msg_text='Can\'t work out query: ' + query)
- send_footer(None)
+ send_httperror("403 Forbidden", query)
except Exception:
import traceback
msg_text = traceback.format_exc()