X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=motion.py;h=0503b829722ea6831a5a7ac0fa5b071ea33cccaf;hb=e59274f6a108ec57931014e8fcb1319c63fa1f2d;hp=ee1c3a8a86abcff5ca30d5916584724c6799c8d6;hpb=05b95082933e27b499b132f1a29a6d41716e952b;p=motion.git diff --git a/motion.py b/motion.py index ee1c3a8..0503b82 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,16 +19,54 @@ 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()]) + +class default_settings(object): + COPYRIGHTSTART="2017" + COPYRIGHTNAME="WPIA" + COPYRIGHTLINK="https://wpia.club" + IMPRINTLINK="https://documents.wpia.club/imprint.html" + DATAPROTECTIONLINK="https://documents.wpia.club/data_privacy_policy_html_pages_en.html" + + # Load config +app.config.from_object('motion.default_settings') app.config.from_pyfile('config.py') -groups=["fellowship", "board"] -prefix={"fellowship": "f", "board": "m"} + +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") + +max_proxy=app.config.get("MAX_PROXY") @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] @@ -50,26 +90,67 @@ def lookup_user(): db.prepare("INSERT INTO voter(\"email\") VALUES($1)")(user) rv = db.prepare("SELECT id FROM voter WHERE email=$1")(user) g.voter = rv[0].get("id"); + rv = db.prepare("SELECT email FROM voter, proxy WHERE proxy.proxy_id = voter.id AND proxy.revoked IS NULL AND proxy.voter_id = $1 ")(g.voter) + if len(rv) != 0: + g.proxies_given = rv[0].get("email") + rv = db.prepare("SELECT email FROM voter, proxy WHERE proxy.voter_id = voter.id AND proxy.revoked IS NULL AND proxy.proxy_id = $1 ")(g.voter) + if len(rv) != 0: + sep = "" + g.proxies_received = "" + for x in range(0, len(rv)): + g.proxies_received += sep + rv[x].get("email") + sep =", " + g.user = user g.roles = {} 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 +@app.context_processor +def init_footer_variables(): + if int(app.config.get("COPYRIGHTSTART")) $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, may_proxyadmin=may_admin("proxyadmin")) def rel_redirect(loc): r = redirect(loc) @@ -148,36 +244,66 @@ 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: - return "Error, invalid length", 500 + if time not in times.per_host: + 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]; - s = db.prepare("SELECT MAX(\"identifier\") FROM \"motion\" WHERE \"type\"=$1 AND DATE(\"posed\")=DATE(CURRENT_TIMESTAMP)") - sr = s(cat) + 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[cat]+"."+t.strftime("%Y%m%d")+".001" + ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+".001" else: - ident=prefix[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\") VALUES($1, $2, CURRENT_TIMESTAMP + $3 * interval '1 days', $4, $5, $6)") - p(request.form.get("title", ""), request.form.get("content",""), time, g.voter, cat, ident) + 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(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")(motion); - 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 canceled is NULL")(request.form.get("reason", ""), g.voter, 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/") @@ -186,31 +312,72 @@ def show_motion(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.identifier=$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")(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, may_proxyadmin=may_admin("proxyadmin")) @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")(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 identifier = $1") - id = rv[0].get("id") - 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(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) + +@app.route("/proxy") +def proxy(): + if not may_admin("proxyadmin"): + return "Forbidden", 403 + return render_template('proxy.html', voters=get_voters(), proxies=get_all_proxies(), may_proxyadmin=may_admin("proxyadmin")) + +@app.route("/proxy/add", methods=['POST']) +def add_proxy(): + if not may_admin("proxyadmin"): + return "Forbidden", 403 + voter=request.form.get("voter", "") + proxy=request.form.get("proxy", "") + if voter == proxy : + return "Error, voter equals proxy.", 400 + rv = get_db().prepare("SELECT id FROM voter WHERE email=$1")(voter); + if len(rv) == 0: + return "Error, voter not found.", 400 + voterid = rv[0].get("id") + rv = get_db().prepare("SELECT id FROM voter WHERE email=$1")(proxy); + if len(rv) == 0: + return "Error, proxy not found.", 400 + proxyid = rv[0].get("id") + rv = get_db().prepare("SELECT id FROM proxy WHERE voter_id=$1 AND revoked is NULL")(voterid); + if len(rv) != 0: + return "Error, proxy allready given.", 400 + rv = get_db().prepare("SELECT COUNT(id) as c FROM proxy WHERE proxy_id=$1 AND revoked is NULL GROUP BY proxy_id")(proxyid); + if len(rv) != 0: + if rv[0].get("c") >= max_proxy: + return "Error, Max proxy for '" + proxy + "' reached.", 400 + rv = get_db().prepare("INSERT INTO proxy(voter_id, proxy_id, granted_by) VALUES ($1,$2,$3)")(voterid, proxyid, g.voter) + return rel_redirect("/proxy") + +@app.route("/proxy/revoke", methods=['POST']) +def revoke_proxy(): + if not may_admin("proxyadmin"): + return "Forbidden", 403 + id=request.form.get("id", "") + rv = get_db().prepare("UPDATE proxy SET revoked=CURRENT_TIMESTAMP, revoked_by=$1 WHERE id=$2")(g.voter, int(id)) + return rel_redirect("/proxy") + +@app.route("/proxy/revokeall", methods=['POST']) +def revoke_proxy_all(): + if not may_admin("proxyadmin"): + return "Forbidden", 403 + rv = get_db().prepare("UPDATE proxy SET revoked=CURRENT_TIMESTAMP, revoked_by=$1 WHERE revoked IS NULL")(g.voter) + return rel_redirect("/proxy") +