X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=motion.py;h=06cde68fcac8834943c8aa5a6540651a0661934e;hb=de04e2bd443678277e50de3cda5f0cdc4ff5451c;hp=741eb302d0d37f6cebc8f859ed8fe5d655260527;hpb=411519c22621b586a6dbb9ec6bc2e5e1bc020897;p=motion.git diff --git a/motion.py b/motion.py index 741eb30..06cde68 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 - -times=[3,5,14] +from flaskext.markdown import Markdown +from markdown.extensions import Extension +from datetime import date, time, datetime def get_db(): db = getattr(g, '_database', None) @@ -17,15 +19,43 @@ 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') -groups=["fellowship", "board"] + +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) + +prefix = ConfigProxy("GROUP_PREFIX") +times = ConfigProxy("DURATION") +debuguser = ConfigProxy("DEBUGUSER") @app.before_request def lookup_user(): + global prefix + env = request.environ user = None + my_debuguser = debuguser.per_host + if my_debuguser is not None: + parts = my_debuguser.split("/", 1) + user = parts[0] + roles = parts[1] + if "USER_ROLES" in env: parts = env.get("USER_ROLES").split("/", 1) user = parts[0] @@ -54,13 +84,14 @@ def lookup_user(): for r in roles: a = r.split(":", 1) - val = a[1] - if a[0] not in g.roles: - g.roles[a[0]] = [] - if val == "*": - g.roles[a[0]] = groups - else: - g.roles[a[0]].append(val) + if len(r)!=0: + val = a[1] + if a[0] not in g.roles: + g.roles[a[0]] = [] + if val == "*": + g.roles[a[0]] = [group for group in prefix.per_host] + else: + g.roles[a[0]].append(val) return None def get_allowed_cats(action): @@ -83,9 +114,39 @@ def init_db(): print("Database Schema version: ", ver) except postgresql.exceptions.UndefinedTableError: ver = 0 + if ver < 1: with app.open_resource('sql/schema.sql', mode='r') as f: db.execute(f.read()) + return + + if ver < 2: + 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} + + 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"): + dt=row[2].strftime("%Y%m%d") + if ct[row[1]]["dt"] != dt: + ct[row[1]]["dt"] = dt + ct[row[1]]["c"] = 0 + ct[row[1]]["c"] = ct[row[1]]["c"] + 1 + name=prefix[app.config.get("DEFAULT_HOST")][row[1]]+"."+dt+"."+("%03d" % ct[row[1]]["c"]) + p(name, row[0]) + db.prepare("ALTER TABLE \"motion\" ALTER COLUMN \"identifier\" SET NOT NULL")() + db.prepare("UPDATE \"schema_version\" SET \"version\"=2")() + db.prepare("CREATE UNIQUE INDEX motion_ident ON motion (identifier)")() + + if ver < 3: + with app.open_resource('sql/from_2.sql', mode='r') as f: + db.execute(f.read()) + db.prepare("UPDATE \"motion\" SET \"host\"=$1")(app.config.get("DEFAULT_HOST")) + db.prepare("ALTER TABLE \"motion\" ALTER COLUMN \"host\" SET NOT NULL")() + db.prepare("UPDATE \"schema_version\" SET \"version\"=3")() + init_db() @@ -101,18 +162,18 @@ def main(): + "LEFT JOIN voter canceler ON canceler.id = motion.canceled_by " prev=None if start == -1: - p = get_db().prepare(q + "ORDER BY motion.id DESC LIMIT 11") - rv = p() + p = get_db().prepare(q + "WHERE motion.host = $1 ORDER BY motion.id DESC LIMIT 11") + rv = p(request.host) else: - p = get_db().prepare(q + "WHERE motion.id <= $1 ORDER BY motion.id DESC LIMIT 11") - rv = p(start) - rs = get_db().prepare("SELECT id FROM motion WHERE motion.id > $1 ORDER BY id ASC LIMIT 10")(start) + p = get_db().prepare(q + "WHERE motion.host = $1 AND motion.id <= $2 ORDER BY motion.id DESC LIMIT 11") + rv = p(request.host, start) + rs = get_db().prepare("SELECT id FROM motion WHERE motion.host = $1 AND motion.id > $2 ORDER BY id ASC LIMIT 10")(request.host, start) if len(rs) == 10: 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, prev=prev, - categories=get_allowed_cats("create")) + 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"), singlemotion=False) def rel_redirect(loc): r = redirect(loc) @@ -125,57 +186,83 @@ 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: + if time not in times.per_host: return "Error, invalid length", 500 - p = get_db().prepare("INSERT INTO motion(\"name\", \"content\", \"deadline\", \"posed_by\", \"type\") VALUES($1, $2, CURRENT_TIMESTAMP + $3 * interval '1 days', $4, $5)") - p(request.form.get("title", ""), request.form.get("content",""), time, g.voter, cat) + db = get_db() + with db.xact(): + t = db.prepare("SELECT CURRENT_TIMESTAMP")()[0][0]; + s = db.prepare("SELECT MAX(\"identifier\") FROM \"motion\" WHERE \"type\"=$1 AND \"host\"=$2 AND DATE(\"posed\")=DATE(CURRENT_TIMESTAMP)") + sr = s(cat, request.host) + ident="" + if len(sr) == 0 or sr[0][0] is None: + ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+".001" + 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) return rel_redirect("/") def motion_edited(motion): return rel_redirect("/?start=" + str(motion) + "#motion-" + str(motion)) -@app.route("/motion//cancel", methods=['POST']) -def cancel_motion(motion): - rv = get_db().prepare("SELECT type FROM motion WHERE id=$1")(motion); - if len(rv) == 0: - return "Error, Not found", 404 - if not may("cancel", rv[0].get("type")): - return "Forbidden", 403 +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']) +@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 id=$3 AND canceled is NULL")(request.form.get("reason", ""), g.voter, motion) - return motion_edited(motion) + 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/") +@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 "\ + "LEFT JOIN vote on vote.motion_id=motion.id AND vote.voter_id=$2 "\ + "LEFT JOIN voter poser ON poser.id = motion.posed_by "\ + "LEFT JOIN voter canceler ON canceler.id = motion.canceled_by " - + "WHERE motion.id=$1") - rv = p(motion, g.voter) + + "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")(motion); - 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) + 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")), may_finish=may("finish", rv[0].get("type")), votes=votes, singlemotion=True) -@app.route("/motion//vote", methods=['POST']) -def vote(motion): +@app.route("/motion//vote", methods=['POST']) +@validate_motion_access('vote') +def vote(motion, id): v = request.form.get("vote", "abstain") db = get_db() - with db.xact(): - rv = db.prepare("SELECT type FROM motion WHERE id=$1")(motion); - 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 id = $1") - if not p(motion)[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(motion, g.voter) - if len(rv) == 0: - db.prepare("INSERT INTO vote(motion_id, voter_id, result) VALUES($1,$2,$3)")(motion, g.voter, v) - else: - db.prepare("UPDATE vote SET result=$3, entered=CURRENT_TIMESTAMP WHERE motion_id=$1 AND voter_id = $2")(motion, g.voter, v) - return motion_edited(motion) + 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)