[signups, better wiki markup
raph.levien@gmail.com**20061227231956] {
hunk ./barghest.py 9
+uname_re_str = r'^[a-zA-Z0-9][a-zA-Z0-9\.\-_]{,19}$'
+
hunk ./barghest.py 35
+	self.urlbase = ''
hunk ./barghest.py 67
-	    self.db = MySQLdb.connect("localhost", "root", "", "junk")
+	    self.db = MySQLdb.connect(getattr(self, 'dbhost', 'localhost'),
+				      getattr(self, 'dbuname', 'root'),
+				      getattr(self, 'dbpass', ''),
+				      getattr(self, 'dbdbname', 'junk'))
hunk ./barghest.py 107
+# Convert a blob to a Unicode string
+def uniblob(s):
+    return unicode(s.tostring(), 'utf-8')
+
hunk ./barghest.py 127
+def randhex(n):
+    randstr = file('/dev/urandom', 'rb').read(n)
+    return ''.join(['%x' % (ord(x) & 15) for x in randstr])
+
hunk ./barghest.py 151
+	       'A.user {text-decoration: none; color: #040}',
+	       'A.new:hover {text-decoration: underline}',
hunk ./barghest.py 164
+def navbar(ctx, items = []):
+    items.append(wikilink(ctx, '', True))
+    items.append(wikilink(ctx, 'RecentChanges', True))
+    ctx.write('<p>[ ' + ' | '.join(items) + ' ]</p>')
+
hunk ./barghest.py 171
+    if auth_user(ctx) != 'f':
+	navbar(ctx)
+    else:
+	ctx.write(
+	    ['<p>Log in below, or go straight to the <a href="wiki/">wiki</a>.</p>',
+	     '<form id="theform" method="POST" action="loginsub.html" accept-charset="UTF-8">',
+	     '<div style="background-color: #bce; border: #008 1px solid; padding: 8px; width: 250px">'
+	     '<p style="margin: 2px">Username:<br />',
+	     '<input id="first" name="u" size="20" type="text" />',
+	     '</p>',
+	     '<p style="margin: 2px">Password:<br />',
+	     '<input name="pass" size="20" type="password" />',
+	     '</p>',
+	     '<p style="margin: 2px">',
+	     '<input type="submit" value="Login" />',
+	     '</p>',
+	     '</div></form>',
+	     '<script type="text/javascript">document.theform.first.focus()</script>',
+	     '<p>If you don\'t have an account and want one, please <a href="signup.html">sign up</a>.</p>'])
+
+def serve_signup(ctx, extra = None):
+    stdpage(ctx, 'Sign up for a new account')
hunk ./barghest.py 194
-	['<p>Log in below, or go straight to the <a href="wiki/">wiki</a>.</p>',
-	 '<form method="POST" action="loginsub.html" accept-charset="UTF-8">',
-	 '<p>',
-	 '<input name="u" size="20" type="text" />',
+	['<p>Sign up for a new account here.</p>',
+	 '<form id="theform" method="POST" action="signupsub.html" accept-charset="UTF-8">'])
+    if extra != None:
+	ctx.write(extra)
+    ctx.write(
+	['<p>Username (up to 20 characters, alphanumeric and <tt>_.-</tt>):<br />',
+	 '<input id="first" name="u" size="20" type="text" />',
hunk ./barghest.py 202
-	 '<p>',
+	 '<p>Password:<br />',
hunk ./barghest.py 205
+	 '<p>Real name:<br />',
+	 '<input name="realname" size="60" type="text" />',
+	 '</p>',
+	 '<p>After you sign up, you\'ll get your own wiki page where you can link your homepage, describe yourself, and so on.</p>',
hunk ./barghest.py 210
-	 '<input type="submit" value="Submit" />',
+	 '<input type="submit" value="Signup" />',
hunk ./barghest.py 212
-	 '</form>'])
-    
+	 '</form>',
+	 '<script type="text/javascript">document.theform.first.focus()</script>'])
+
hunk ./barghest.py 218
-    sql = """SELECT * FROM foo"""
hunk ./barghest.py 235
+    navbar(ctx)
+
+def serve_signupsub(ctx):
+    uname = ctx.query['u']
+    if not re.match(uname_re_str, uname):
+	serve_signup(ctx, '<p><span style="color: #c00">Invalid username.</span> The username must be no longer than 20 characters, begin with an alphanumeric, and consist of alphanumerics, period, underscore, or dash. In other words, it must match the regular expression syntax: <tt>' + uname_re_str + '</tt></p>')
+    c = ctx.cursor()
+    c.execute("select realname from users where uname = %s", uname)
+    response = c.fetchone()
+    if response:
+	realname = uniblob(response[0])
+	serve_signup(ctx, '<p><span style="color: #c00">User already exists.</span> The username <tt>' + uname + '</tt> already belongs to ' + htmlquote(realname) + '.</p>')
+    passwd = ctx.query['pass']
+    if len(passwd) < 4:
+	serve_signup(ctx, '<p><span style="color: #c00">Password too short.</span> The password must be at least 4 characters.</p>')
+    realname = ctx.query['realname'].strip()
+    if len(realname) < 1:
+	serve_signup(ctx, '<p><span style="color: #c00">Give your real name.</span> You must put include your name.</p>')
+    entropy = randhex(52)
+    cookie = entropy[:40]
+    salt = entropy[40:]
+    hash = sha.sha(salt + passwd.encode('utf-8')).hexdigest()
+    c.execute("insert into users (uname, salt, hash, status, cookie, realname, ctime) values (%s, %s, %s, 'y', %s, %s, now())",
+		(uname, salt, hash, cookie, realname.encode('utf-8')))
+    ctx.header('Set-Cookie',  'id=' + uname + ':' + cookie)
+    stdpage(ctx, 'Signup successful')
+    ctx.write("<p>Congratulations! You have created the account <tt>" + uname +
+	      "</tt>. Next, you'll probably want to edit the wiki page for your account: " +
+	      userlink(ctx, uname) + ".</p>")
+    navbar(ctx)
hunk ./barghest.py 275
+def userlink(ctx, uname):
+    c = ctx.cursor()
+    c.execute('select realname from users where uname = %s', uname)
+    response = c.fetchone()
+    if response:
+	realname = uniblob(response[0])
+	return '<a class="user" href="' + ctx.urlbase + 'user/' + uname + '">' + htmlquote(realname) + '</a>'
+    else:
+	return '[deleted account ' + uname + ']'
+
hunk ./barghest.py 312
-	data = unicode(response[0].tostring(), 'utf-8')
+	data = uniblob(response[0])
hunk ./barghest.py 319
+def wikihref(ctx, page):
+    if re.match('user/', page):
+	pref = ''
+    else:
+	pref = 'wiki/'
+    return ctx.urlbase + pref + urlquoteplus(page)
+
hunk ./barghest.py 327
-    url_re = re.compile(r'^[a-z\+]*://')
-    if url_re.match(str):
-	return '<a href="' + urlquoteplus(str) + '">' + htmlquote(str) + '</a>'
+    url_re = re.compile(r'^([a-z\+]*://\S+)(\s(.+))?')
+    m = url_re.match(str)
+    if m:
+	if m.group(3):
+	    text = m.group(3)
+	else:
+	    text = m.group(1)
+	return '<a href="' + m.group(1) + '">' + htmlquote(text) + '</a>'
+    if re.match('user/', str):
+	return userlink(ctx, str[5:])
hunk ./barghest.py 342
-	str = './'
-	textstr = 'the home page'
+	textstr = 'wiki home page'
hunk ./barghest.py 345
-    return pref + 'href="' + urlquoteplus(str) + '">' + textstr + '</a>'
+    return pref + 'href="' + wikihref(ctx, str) + '">' + textstr + '</a>'
hunk ./barghest.py 350
+class ListState:
+    def __init__(self):
+	self.inlist = False
+    def set(self, inlist, result):
+	if inlist and not self.inlist:
+	    result.append('<ul>')
+	elif not inlist and self.inlist:
+	    result.append('</ul>')
+	self.inlist = inlist
+
hunk ./barghest.py 361
-    par_re = re.compile(r'\r?\n\r?\n')
+    par_re = re.compile(r'(?:\r?\n){2,}')
hunk ./barghest.py 363
-    special_re = re.compile(r'[#_\*<>&\[\\]|\[\[')
-    repls = {'_': '<i>', '*': '<b>', '<': '&lt;', '>': '&gt;', '&': '&amp;'}
+    rule_re = re.compile(r'\s*\-{4,}\s*$')
+    bullet_re = re.compile(r'\s*\*\s+')
+    head_re = re.compile(r'\s*(=+)\s*')
+    special_re = re.compile(r'[<>&\\]|(?<!\S)([#_\*]|\[\[?)(?=\S)')
+    repls = {'<': '&lt;', '>': '&gt;', '&': '&amp;'}
+    emphs = {'_': 'i', '*' : 'b'}
+    embeds = {'[': (']', wikilink), '[[': (']]', wikilink), '#': ('#', wikigh)}
hunk ./barghest.py 371
+    liststate = ListState()
hunk ./barghest.py 373
-	rpar = ['<p>']
+	if len(par) == 0: continue
+	if rule_re.match(par):
+	    liststate.set(False, result)
+	    result.append('<hr />')
+	    continue
+	stack = []
+	bullet_m = bullet_re.match(par)
+	head_m = head_re.match(par)
+	if bullet_m:
+	    liststate.set(True, result)
+	    rpar = ['<li>']
+	    pos = bullet_m.end()
+	elif head_m:
+	    liststate.set(False, result)
+	    delim = head_m.group(1)
+	    rpar = ['<h%d>' % len(delim)]
+	    stack.append((delim, ''))
+	    pos = head_m.end()
+	else:
+	    liststate.set(False, result)
+	    rpar = ['<p>']
+	    pos = 0
hunk ./barghest.py 399
-	    pos = 0
hunk ./barghest.py 402
+		if len(stack):
+		    # Handle closing tags
+		    pos2 = line.find(stack[-1][0], pos)
+		    if pos2 >= 0 and (not m or pos2 <= m.start()):
+			rline += line[pos:pos2] + stack[-1][1]
+			pos = pos2 + len(stack[-1][0])
+			del stack[-1]
+			continue
hunk ./barghest.py 416
-			# I don't like this inline toggling BS
-			if repls[g][:2] == '</':
-			    repls[g] = '<' + repls[g][2:] 
-			elif repls[g][:1] == '<':
-			    repls[g] = '</' + repls[g][1:]
hunk ./barghest.py 417
-		    elif g == '[':
-			endpos = line.find(']', mend)
-			if endpos >= 0:
-			    rline += wikilink(ctx, line[m.end():endpos])
-			    pos = endpos + 1
-			else:
-			    rline += g
-			    pos = mend
-		    elif g == '#':
-			endpos = line.find('#', mend)
+		    elif emphs.has_key(g):
+			rline += '<' + emphs[g] + '>'
+			stack.append((g, '</' + emphs[g] + '>'))
+			pos = mend
+		    elif g in embeds:
+			wikiclose, embedfn = embeds[g]
+			endpos = line.find(wikiclose, mend)
+			# todo: search successive lines
hunk ./barghest.py 426
-			    rline += wikigh(ctx, line[m.end():endpos])
-			    pos = endpos + 1
-			else:
-			    rline += g
-			    pos = mend
+			    rline += embedfn(ctx, line[m.end():endpos])
+			    pos = endpos + len(wikiclose)
hunk ./barghest.py 432
-			else:
-			    rline += g
-			    pos = mend
-		    else:
-			# This shouldn't happen, but if it does, just pass
-			# the string verbatim.
+		    if pos < mend:
+			# Nothing matched above, pass verbatim.
hunk ./barghest.py 441
-	rpar.append('</p>')
+	    pos = 0
+	if stack:
+	    stack.reverse()
+	    rpar.append(''.join([htmlclose for wikiclose, htmlclose in stack]))
+	rpar.append('</' + rpar[0][1:])
hunk ./barghest.py 447
+    liststate.set(False, result)
hunk ./barghest.py 458
+    navbar(ctx)
hunk ./barghest.py 470
-    ctx.write(['<form method="POST" action="' + htmlquote(page) +
+    ctx.write(['<form id="theform" method="POST" action="' + wikihref(ctx, page) +
hunk ./barghest.py 473
-	       '<p><textarea name="data" cols="80" rows="24">'])
+	       '<p><textarea id="first" name="data" cols="80" rows="24">'])
hunk ./barghest.py 480
-	       '</form>'])
+	       '</form>',
+	       '<script type="text/javascript">document.theform.first.focus()</script>'])
hunk ./barghest.py 500
-	    ctx.write('<li>' + datestr[11:] + ' ' + wikilink(ctx, page, exists = True) + ' . . . ' + htmlquote(name) + '</li>')
+	    ctx.write('<li>' + datestr[11:] + ' ' + wikilink(ctx, page, exists = True) + ' . . . ' + userlink(ctx, name) + '</li>')
hunk ./barghest.py 503
-
-def serve_wiki(ctx):
-    if len(ctx.path_l) == 1:
-	page = urllib.unquote_plus(ctx.path_l[0])
-    else:
-	page = ''
-
-    if page == 'RecentChanges':
-	return serve_wiki_recent(ctx)
+    navbar(ctx)
hunk ./barghest.py 505
+def serve_wiki_page(ctx, page, extra = None):
hunk ./barghest.py 520
+	if extra != None: ctx.write(extra)
hunk ./barghest.py 523
-	ctx.write('<p>Last edited ' + mtime.isoformat(' ') + ' by ' + htmlquote(uname) + '</p>')
+	ctx.write('<p>Last edited ' + mtime.isoformat(' ') + ' by ' + userlink(ctx, uname) + '</p>')
hunk ./barghest.py 525
+	if extra != None: ctx.write(extra)
hunk ./barghest.py 528
-    ctx.write('<p><a href="./' + urlquoteplus(page) + '?a=edit">Edit</a></p>')
+    items = []
+    if auth_user(ctx) == 'y':
+	items.append('<a href="' + wikihref(ctx, page) + '?a=edit">Edit</a>')
+    navbar(ctx, items)
+
+def serve_wiki(ctx):
+    if len(ctx.path_l) == 1:
+	page = urllib.unquote_plus(ctx.path_l[0])
+    else:
+	page = ''
+
+    if page == 'RecentChanges':
+	return serve_wiki_recent(ctx)
+
+    serve_wiki_page(ctx, page)
+
+def serve_user(ctx):
+    if len(ctx.path_l) == 1 and re.match(uname_re_str, ctx.path_l[0]):
+	uname = ctx.path_l[0]
+	c = ctx.cursor()
+	c.execute('select realname from users where uname = %s', uname)
+	response = c.fetchone()
+	if response:
+	    realname = uniblob(response[0])
+	    extra = ['<p>Information for ' + htmlquote(realname) +
+			    ' (username <tt>' + uname + '</tt>).</p>']
+	    c.execute('select what, mtime from log where uname = %s order by seqno desc limit 1', uname)
+	    response = c.fetchone()
+	    if response:
+		page, mtime = response
+		page = unicode(page, 'utf-8')
+		extra.append('<p>Last page edited: ' + wikilink(ctx, page) +
+			     ' on ' + mtime.isoformat(' ') + '.</p>')
+	    extra.append('<hr />')
+	    serve_wiki_page(ctx, 'user/' + uname, extra)
+	    return
+    serve_404(ctx)
+	
hunk ./barghest.py 569
+servtab['signup.html'] = serve_signup
+servtab['signupsub.html'] = serve_signupsub
hunk ./barghest.py 572
+servtab['user'] = serve_user
hunk ./barghest.py 574
-ctx = ctx_from_cgi()
-dispatch = servtab
-while type(dispatch) == type({}):
-    first = ctx.path_l[0]
-    if dispatch.has_key(first):
-	del ctx.path_l[0]
-	dispatch = dispatch[first]
-    else:
-	dispatch = serve_404
+def runcgi():
+    ctx = ctx_from_cgi()
+    run(ctx)
+
+def run(ctx):
+    dispatch = servtab
+    while type(dispatch) == type({}):
+	first = ctx.path_l[0]
+	if dispatch.has_key(first):
+	    del ctx.path_l[0]
+	    dispatch = dispatch[first]
+	else:
+	    dispatch = serve_404
hunk ./barghest.py 588
-dispatch(ctx)
-ctx.flush()
+    dispatch(ctx)
+    ctx.flush()
hunk ./barghest.py 591
+if __name__ == '__main__':
+    run(cgi)
}