Merge branch 'readme' into 'master'

[motion.git] / motion.py

diff --git a/motion.py b/motion.py
index eb04effb9844d7734e69549b93532a265110b391..df5db15b57e335e16a3cd4da5c0e6fc3edef779a 100644 (file)
--- a/motion.py
+++ b/motion.py
@@ -4,6 +4,8 @@ from flask import render_template, redirect
 from flask import request
 import postgresql
 import filters
+from flaskext.markdown import Markdown
+from markdown.extensions import Extension
 
 def get_db():
     db = getattr(g, '_database', None)
@@ -15,14 +17,30 @@ def get_db():
 app = Flask(__name__)
 app.register_blueprint(filters.blueprint)
 
+class EscapeHtml(Extension):
+    def extendMarkdown(self, md, md_globals):
+        del md.preprocessors['html_block']
+        del md.inlinePatterns['html']
+
+md = Markdown(app, extensions=[EscapeHtml()])
+
 # Load config
 app.config.from_pyfile('config.py')
 
-prefix=app.config.get("GROUP_PREFIX")
 
-times=app.config.get("DURATION")
+class ConfigProxy:
+    def __init__(self, name):
+        self.name = name
+    @property
+    def per_host(self):
+        dict = app.config.get(self.name)
+        if dict is None:
+            return None
+        return dict.get(request.host)
 
-debuguser=app.config.get("DEBUGUSER")
+prefix = ConfigProxy("GROUP_PREFIX")
+times = ConfigProxy("DURATION")
+debuguser = ConfigProxy("DEBUGUSER")
 
 @app.before_request
 def lookup_user():
@@ -30,8 +48,9 @@ def lookup_user():
 
     env = request.environ
     user = None
-    if debuguser is not None:
-        parts =debuguser[request.host].split("/", 1)
+    my_debuguser = debuguser.per_host
+    if my_debuguser is not None:
+        parts = my_debuguser.split("/", 1)
         user = parts[0]
         roles = parts[1]
 
@@ -69,7 +88,7 @@ def lookup_user():
             if a[0] not in g.roles:
                 g.roles[a[0]] = []
             if val == "*":
-                g.roles[a[0]] = [group for group in prefix[request.host]]
+                g.roles[a[0]] = [group for group in prefix.per_host]
             else:
                 g.roles[a[0]].append(val)
     return None
@@ -152,7 +171,7 @@ def main():
             prev = rs[9][0]
         else:
             prev = -1
-    return render_template('index.html', motions=rv[:10], more=rv[10]["id"] if len(rv) == 11 else None, times=times[request.host], prev=prev,
+    return render_template('index.html', motions=rv[:10], more=rv[10]["id"] if len(rv) == 11 else None, times=times.per_host, prev=prev,
                            categories=get_allowed_cats("create"))
 
 def rel_redirect(loc):
@@ -166,7 +185,7 @@ def put_motion():
     if cat not in get_allowed_cats("create"):
         return "Forbidden", 403
     time = int(request.form.get("days", "3"));
-    if time not in times[request.host]:
+    if time not in times.per_host:
         return "Error, invalid length", 500
     db = get_db()
     with db.xact():
@@ -175,9 +194,9 @@ def put_motion():
         sr = s(cat, request.host)
         ident=""
         if len(sr) == 0 or sr[0][0] is None:
-            ident=prefix[request.host][cat]+"."+t.strftime("%Y%m%d")+".001"
+            ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+".001"
         else:
-            ident=prefix[request.host][cat]+"."+t.strftime("%Y%m%d")+"."+("%03d" % (int(sr[0][0].split(".")[2])+1))
+            ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+"."+("%03d" % (int(sr[0][0].split(".")[2])+1))
         p = db.prepare("INSERT INTO motion(\"name\", \"content\", \"deadline\", \"posed_by\", \"type\", \"identifier\", \"host\") VALUES($1, $2, CURRENT_TIMESTAMP + $3 * interval '1 days', $4, $5, $6, $7)")
         p(request.form.get("title", ""), request.form.get("content",""), time, g.voter, cat, ident, request.host)
     return rel_redirect("/")
@@ -206,6 +225,8 @@ def show_motion(motion):
                          + "LEFT JOIN voter canceler ON canceler.id = motion.canceled_by "
                          + "WHERE motion.identifier=$1 AND motion.host=$3")
     rv = p(motion, g.voter, request.host)
+    if len(rv) == 0:
+        return "Error, Not found", 404
     votes = None
     if may("audit", rv[0].get("type")) and not rv[0].get("running") and not rv[0].get("canceled"):
         votes = get_db().prepare("SELECT vote.result, voter.email FROM vote INNER JOIN voter ON voter.id = vote.voter_id WHERE vote.motion_id=$1")(rv[0].get("id"));