X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=motion.py;h=e2f3f15ab28854e27e927f7260615ed3e696b0d7;hb=0fd4642dc5ec910ad59a91f08015f79527bd3487;hp=ef98529fb19150a29245b13b522a1c68ff843ef0;hpb=301d8033d5489c65bde7df0f32013983647ff0da;p=motion.git diff --git a/motion.py b/motion.py index ef98529..e2f3f15 100644 --- a/motion.py +++ b/motion.py @@ -2,10 +2,12 @@ from flask import g from flask import Flask from flask import render_template, redirect from flask import request +from functools import wraps import postgresql import filters from flaskext.markdown import Markdown from markdown.extensions import Extension +from datetime import date, time, datetime def get_db(): db = getattr(g, '_database', None) @@ -63,7 +65,6 @@ def lookup_user(): user = env.get("USER") roles = env.get("ROLES") - if user is None: return "Server misconfigured", 500 roles = roles.split(" ") @@ -112,6 +113,8 @@ def init_db(): ver = db.prepare("SELECT version FROM schema_version")()[0][0]; print("Database Schema version: ", ver) except postgresql.exceptions.UndefinedTableError: + g._database = None + db = get_db() ver = 0 if ver < 1: @@ -123,8 +126,8 @@ def init_db(): with app.open_resource('sql/from_1.sql', mode='r') as f: db.execute(f.read()) ct={} - for g in [group for group in prefix[app.config.get("DEFAULT_HOST")]]: - ct[g] = {"dt": "", "c": 0} + for group in [group for group in prefix[app.config.get("DEFAULT_HOST")]]: + ct[group] = {"dt": "", "c": 0} p = db.prepare("UPDATE \"motion\" SET \"identifier\"=$1 WHERE \"id\"=$2") for row in db.prepare("SELECT id, \"type\", \"posed\" FROM \"motion\" ORDER BY \"id\" ASC"): @@ -172,7 +175,7 @@ def main(): else: prev = -1 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")) + categories=get_allowed_cats("create"), singlemotion=False) def rel_redirect(loc): r = redirect(loc) @@ -186,7 +189,16 @@ def put_motion(): return "Forbidden", 403 time = int(request.form.get("days", "3")); if time not in times.per_host: - return "Error, invalid length", 500 + return "Error, invalid length", 400 + title=request.form.get("title", "") + title=title.strip() + if title =='': + return "Error, missing title", 400 + content=request.form.get("content", "") + content=content.strip() + if content =='': + return "Error, missing content", 400 + db = get_db() with db.xact(): t = db.prepare("SELECT CURRENT_TIMESTAMP")()[0][0]; @@ -198,25 +210,46 @@ def put_motion(): else: 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) + p(title, content, time, g.voter, cat, ident, request.host) return rel_redirect("/") def motion_edited(motion): return rel_redirect("/?start=" + str(motion) + "#motion-" + str(motion)) +def validate_motion_access(privilege): + def decorator(f): + def decorated_function(motion): + db = get_db() + with db.xact(): + rv = db.prepare("SELECT id, type, deadline < CURRENT_TIMESTAMP AS expired, canceled FROM motion WHERE identifier=$1 AND host=$2")(motion, request.host); + if len(rv) == 0: + return "Error, Not found", 404 + id = rv[0].get("id") + if not may(privilege, rv[0].get("type")): + return "Forbidden", 403 + if rv[0].get("canceled") is not None: + return "Error, motion was canceled", 403 + if rv[0].get("expired"): + return "Error, out of time", 403 + return f(motion, id) + decorated_function.__name__ = f.__name__ + return decorated_function + return decorator + @app.route("/motion//cancel", methods=['POST']) -def cancel_motion(motion): - rv = get_db().prepare("SELECT id, type FROM motion WHERE identifier=$1 AND host=$2")(motion, request.host); - if len(rv) == 0: - return "Error, Not found", 404 - id = rv[0].get("id") - if not may("cancel", rv[0].get("type")): - return "Forbidden", 403 +@validate_motion_access('cancel') +def cancel_motion(motion, id): if request.form.get("reason", "none") == "none": return "Error, form requires reason", 500 rv = get_db().prepare("UPDATE motion SET canceled=CURRENT_TIMESTAMP, cancelation_reason=$1, canceled_by=$2 WHERE identifier=$3 AND host=$4 AND canceled is NULL")(request.form.get("reason", ""), g.voter, motion, request.host) return motion_edited(id) +@app.route("/motion//finish", methods=['POST']) +@validate_motion_access('finish') +def finish_motion(motion, id): + rv = get_db().prepare("UPDATE motion SET deadline=CURRENT_TIMESTAMP WHERE identifier=$1 AND host=$2 AND canceled is NULL")(motion, request.host) + return motion_edited(id) + @app.route("/motion/") def show_motion(motion): p = get_db().prepare("SELECT motion.*, poser.email AS poser, canceler.email AS canceler, (motion.deadline > CURRENT_TIMESTAMP AND canceled is NULL) AS running, vote.result FROM motion "\ @@ -225,29 +258,22 @@ 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")); - return render_template('single_motion.html', motion=rv[0], may_vote=may("vote", rv[0].get("type")), may_cancel=may("cancel", rv[0].get("type")), votes=votes) + return render_template('single_motion.html', motion=rv[0], may_vote=may("vote", rv[0].get("type")), may_cancel=may("cancel", rv[0].get("type")), may_finish=may("finish", rv[0].get("type")), votes=votes, singlemotion=True) @app.route("/motion//vote", methods=['POST']) -def vote(motion): +@validate_motion_access('vote') +def vote(motion, id): v = request.form.get("vote", "abstain") db = get_db() - with db.xact(): - rv = db.prepare("SELECT id, type FROM motion WHERE identifier=$1 AND host=$2")(motion, request.host); - if len(rv) == 0: - return "Error, Not found", 404 - if not may("vote", rv[0].get("type")): - return "Forbidden", 403 - p = db.prepare("SELECT deadline > CURRENT_TIMESTAMP FROM motion WHERE identifier = $1 AND host=$2") - id = rv[0].get("id") - if not p(motion, request.host)[0][0]: - return "Error, motion deadline has passed", 500 - p = db.prepare("SELECT * FROM vote WHERE motion_id = $1 AND voter_id = $2") - rv = p(id, g.voter) - if len(rv) == 0: - db.prepare("INSERT INTO vote(motion_id, voter_id, result) VALUES($1,$2,$3)")(id, g.voter, v) - else: - db.prepare("UPDATE vote SET result=$3, entered=CURRENT_TIMESTAMP WHERE motion_id=$1 AND voter_id = $2")(id, g.voter, v) + p = db.prepare("SELECT * FROM vote WHERE motion_id = $1 AND voter_id = $2") + rv = p(id, g.voter) + if len(rv) == 0: + db.prepare("INSERT INTO vote(motion_id, voter_id, result) VALUES($1,$2,$3)")(id, g.voter, v) + else: + db.prepare("UPDATE vote SET result=$3, entered=CURRENT_TIMESTAMP WHERE motion_id=$1 AND voter_id = $2")(id, g.voter, v) return motion_edited(id)