X-Git-Url: https://git.llucax.com/software/blitiri.git/blobdiff_plain/e3c7d198b1679ff33fc1e4fc800aa61f22a5ab31..70a0afa4c3907cd348f4c5699897dfe992150567:/blitiri.cgi
diff --git a/blitiri.cgi b/blitiri.cgi
index 15c820e..347d27a 100755
--- a/blitiri.cgi
+++ b/blitiri.cgi
@@ -14,10 +14,22 @@
# Directory where entries are stored
data_path = "/tmp/blog/data"
+# Are comments allowed? (if False, comments_path option is not used)
+enable_comments = False
+
+# Directory where comments are stored (must be writeable by the web server)
+comments_path = "/tmp/blog/comments"
+
# Path where templates are stored. Use an empty string for the built-in
# default templates. If they're not found, the built-in ones will be used.
templates_path = "/tmp/blog/templates"
+# Path where the cache is stored (must be writeable by the web server);
+# set to None to disable. When enabled, you must take care of cleaning it up
+# every once in a while.
+#cache_path = "/tmp/blog/cache"
+cache_path = None
+
# URL to the blog, including the name. Can be a full URL or just the path.
blog_url = "/blog/blitiri.cgi"
@@ -34,6 +46,34 @@ author = "Hartmut Kegan"
# Article encoding
encoding = "utf8"
+# Captcha class
+class Captcha (object):
+ def __init__(self, article):
+ self.article = article
+ words = article.title.split()
+ self.nword = hash(article.title) % len(words) % 5
+ self.answer = words[self.nword]
+ self.help = 'gotcha, damn spam bot!'
+
+ def get_puzzle(self):
+ nword = self.nword + 1
+ if nword == 1:
+ n = '1st'
+ elif nword == 2:
+ n = '2nd'
+ elif nword == 3:
+ n = '3rd'
+ else:
+ n = str(nword) + 'th'
+ return "enter the %s word of the article's title" % n
+ puzzle = property(fget = get_puzzle)
+
+ def validate(self, form_data):
+ if form_data.captcha.lower() == self.answer.lower():
+ return True
+ return False
+
+
#
# End of configuration
# DO *NOT* EDIT ANYTHING PAST HERE
@@ -42,6 +82,8 @@ encoding = "utf8"
import sys
import os
+import errno
+import shutil
import time
import datetime
import calendar
@@ -49,6 +91,7 @@ import zlib
import urllib
import cgi
from docutils.core import publish_parts
+from docutils.utils import SystemMessage
# Before importing the config, add our cwd to the Python path
sys.path.append(os.getcwd())
@@ -114,7 +157,9 @@ default_article_header = """
%(umonth)02d-\
%(uday)02d\
%(uhour)02d:%(uminute)02d)
-
+ -
+ with %(comments)s
+ comment(s)
" - raw = raw[raw.index('\n'):] - - settings = { - 'input_encoding': encoding, - 'output_encoding': 'utf8', - } - parts = publish_parts(self.raw_content, - settings_overrides = settings, - writer_name = "html") - return parts['body'].encode('utf8') + return rst_to_html(self.raw_content) def to_vars(self): return { - 'arttitle': self.title, - 'author': self.author, + 'arttitle': sanitize(self.title), + 'author': sanitize(self.author), 'date': self.created.isoformat(' '), 'uuid': self.uuid, 'tags': self.get_tags_links(), + 'comments': len(self.comments), 'created': self.created.isoformat(' '), 'ciso': self.created.isoformat(), @@ -396,11 +893,11 @@ class Article (object): tags.sort() for t in tags: l.append('%s' % \ - (blog_url, urllib.quote(t), t) ) + (blog_url, urllib.quote(t), sanitize(t) )) return ', '.join(l) -class DB (object): +class ArticleDB (object): def __init__(self, dbpath): self.dbpath = dbpath self.articles = [] @@ -440,11 +937,9 @@ class DB (object): except: continue - a = Article(l[0]) - a.created = datetime.datetime.fromtimestamp( - float(l[1]) ) - a.updated = datetime.datetime.fromtimestamp( - float(l[2])) + a = Article(l[0], + datetime.datetime.fromtimestamp(float(l[1])), + datetime.datetime.fromtimestamp(float(l[2]))) self.uuids[a.uuid] = a self.actyears.add(a.created.year) self.actmonths.add((a.created.year, a.created.month)) @@ -484,15 +979,35 @@ class DB (object): # Main # - -def render_html(articles, db, actyear = None): +def render_comments(article, template, form_data): + print '' + for c in article.comments: + if c is None: + continue + print template.get_comment_header(c) + print c.to_html() + print template.get_comment_footer(c) + if not form_data: + form_data = CommentFormData() + form_data.action = blog_url + '/comment/' + article.uuid + '#comment' + captcha = Captcha(article) + print template.get_comment_form(article, form_data, captcha.puzzle) + +def render_html(articles, db, actyear = None, show_comments = False, + redirect = None, form_data = None): + if redirect: + print 'Status: 303 See Other\r\n', + print 'Location: %s\r\n' % redirect, + print 'Content-type: text/html; charset=utf-8\r\n', + print '\r\n', template = Templates(templates_path, db, actyear) - print 'Content-type: text/html; charset=utf-8\n' print template.get_main_header() for a in articles: print template.get_article_header(a) print a.to_html() print template.get_article_footer(a) + if show_comments: + render_comments(a, template, form_data) print template.get_main_footer() def render_artlist(articles, db, actyear = None): @@ -572,7 +1087,9 @@ def handle_cgi(): atom = False style = False post = False + post_preview = False artlist = False + comment = False if os.environ.has_key('PATH_INFO'): path_info = os.environ['PATH_INFO'] @@ -580,9 +1097,11 @@ def handle_cgi(): atom = path_info == '/atom' tag = path_info.startswith('/tag/') post = path_info.startswith('/post/') + post_preview = path_info.startswith('/preview/post/') artlist = path_info.startswith('/list') - if not style and not atom and not post and not tag \ - and not artlist: + comment = path_info.startswith('/comment/') and enable_comments + if not style and not atom and not post and not post_preview \ + and not tag and not comment and not artlist: date = path_info.split('/')[1:] try: if len(date) > 1 and date[0]: @@ -596,13 +1115,30 @@ def handle_cgi(): elif post: uuid = path_info.replace('/post/', '') uuid = uuid.replace('/', '') + elif post_preview: + art_path = path_info.replace('/preview/post/', '') + art_path = urllib.unquote_plus(art_path) + art_path = os.path.join(data_path, art_path) + art_path = os.path.realpath(art_path) + common = os.path.commonprefix([data_path, art_path]) + if common != data_path: # something nasty happened + post_preview = False + art_path = art_path[len(data_path)+1:] elif tag: t = path_info.replace('/tag/', '') t = t.replace('/', '') t = urllib.unquote_plus(t) tags = set((t,)) + elif comment: + uuid = path_info.replace('/comment/', '') + uuid = uuid.replace('#comment', '') + uuid = uuid.replace('/', '') + author = form.getfirst('comformauthor', '') + link = form.getfirst('comformlink', '') + captcha = form.getfirst('comformcaptcha', '') + body = form.getfirst('comformbody', '') - db = DB(data_path + '/db') + db = ArticleDB(os.path.join(data_path, 'db')) if atom: articles = db.get_articles(tags = tags) articles.sort(reverse = True) @@ -610,11 +1146,61 @@ def handle_cgi(): elif style: render_style() elif post: - render_html( [db.get_article(uuid)], db, year ) + render_html( [db.get_article(uuid)], db, year, enable_comments ) + elif post_preview: + article = Article(art_path, datetime.datetime.now(), + datetime.datetime.now()) + render_html( [article], db, year, enable_comments ) elif artlist: articles = db.get_articles() articles.sort(cmp = Article.title_cmp) render_artlist(articles, db) + elif comment: + form_data = CommentFormData(author.strip().replace('\n', ' '), + link.strip().replace('\n', ' '), captcha, + body.replace('\r', '')) + article = db.get_article(uuid) + captcha = Captcha(article) + redirect = False + valid = True + if not form_data.author: + form_data.author_error = 'please, enter your name' + valid = False + if form_data.link: + link = valid_link(form_data.link) + if link: + form_data.link = link + else: + form_data.link_error = 'please, enter a ' \ + 'valid link' + valid = False + if not captcha.validate(form_data): + form_data.captcha_error = captcha.help + valid = False + if not form_data.body: + form_data.body_error = 'please, write a comment' + valid = False + else: + error = validate_rst(form_data.body, secure=False) + if error is not None: + (line, desc, ctx) = error + at = '' + if line: + at = ' at line %d' % line + form_data.body_error = 'error%s: %s' \ + % (at, desc) + valid = False + if valid: + c = article.add_comment(form_data.author, + form_data.body, form_data.link) + c.save() + cdb = CommentDB(article) + cdb.comments = article.comments + cdb.save() + redirect = blog_url + '/post/' + uuid + '#comment-' \ + + str(c.number) + render_html( [article], db, year, enable_comments, redirect, + form_data ) else: articles = db.get_articles(year, month, day, tags) articles.sort(reverse = True) @@ -638,22 +1224,33 @@ def handle_cmd(): print "Error: article (%s) must be inside data_path (%s)" % \ (art_path, data_path) return 1 - art_path = art_path[len(data_path):] + art_path = art_path[len(data_path)+1:] - if not os.path.isfile(data_path + '/db'): - open(data_path + '/db', 'w').write('') - db = DB(data_path + '/db') + db_filename = os.path.join(data_path, 'db') + if not os.path.isfile(db_filename): + open(db_filename, 'w').write('') + db = ArticleDB(db_filename) if cmd == 'add': - article = Article(art_path) + article = Article(art_path, datetime.datetime.now(), + datetime.datetime.now()) for a in db.articles: if a == article: print 'Error: article already exists' return 1 db.articles.append(article) - article.created = datetime.datetime.now() - article.updated = datetime.datetime.now() db.save() + if enable_comments: + comment_dir = os.path.join(comments_path, article.uuid) + try: + os.mkdir(comment_dir, 0775) + except OSError, e: + if e.errno != errno.EEXIST: + print "Error: can't create comments " \ + "directory %s (%s)" \ + % (comment_dir, e) + # otherwise is probably a removed and re-added + # article elif cmd == 'rm': article = Article(art_path) for a in db.articles: @@ -662,8 +1259,12 @@ def handle_cmd(): else: print "Error: no such article" return 1 + if enable_comments: + r = raw_input('Remove comments [y/N]? ') db.articles.remove(a) db.save() + if enable_comments and r.lower() == 'y': + shutil.rmtree(os.path.join(comments_path, a.uuid)) elif cmd == 'update': article = Article(art_path) for a in db.articles: @@ -682,7 +1283,10 @@ def handle_cmd(): if os.environ.has_key('GATEWAY_INTERFACE'): + i = datetime.datetime.now() handle_cgi() + f = datetime.datetime.now() + print '' % (f-i) else: sys.exit(handle_cmd())
Comment #%(number)d
+by %(linked_author)s + on %(year)04d-%(month)02d-%(day)02d %(hour)02d:%(minute)02d + +