X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=motion.py;h=a5ceb72e3501a4a02bf6a12d281d8964d1aab451;hb=1653400a1d07f3433e1f8e10f484de9f88593c3f;hp=0503b829722ea6831a5a7ac0fa5b071ea33cccaf;hpb=e59274f6a108ec57931014e8fcb1319c63fa1f2d;p=motion.git diff --git a/motion.py b/motion.py index 0503b82..a5ceb72 100644 --- a/motion.py +++ b/motion.py @@ -3,11 +3,15 @@ from flask import Flask from flask import render_template, redirect from flask import request from functools import wraps +from flask_babel import Babel, gettext import postgresql import filters from flaskext.markdown import Markdown from markdown.extensions import Extension from datetime import date, time, datetime +from flask_language import Language, current_language +import gettext +import click def get_db(): db = getattr(g, '_database', None) @@ -18,6 +22,9 @@ def get_db(): app = Flask(__name__) app.register_blueprint(filters.blueprint) +babel = Babel(app) +lang = Language(app) +gettext.install('motion') class EscapeHtml(Extension): def extendMarkdown(self, md, md_globals): @@ -32,6 +39,7 @@ class default_settings(object): COPYRIGHTLINK="https://wpia.club" IMPRINTLINK="https://documents.wpia.club/imprint.html" DATAPROTECTIONLINK="https://documents.wpia.club/data_privacy_policy_html_pages_en.html" + MAX_PROXY=2 # Load config @@ -55,6 +63,24 @@ debuguser = ConfigProxy("DEBUGUSER") max_proxy=app.config.get("MAX_PROXY") +@babel.localeselector +def get_locale(): + return str(current_language) + +@lang.allowed_languages +def get_allowed_languages(): + return app.config['LANGUAGES'].keys() + +@lang.default_language +def get_default_language(): + return 'en' + +def get_languages(): + return app.config['LANGUAGES'] + +# Manually add vote options to the translation strings. They are used as keys in loops. +TRANSLATION_STRINGS={_('yes'), _('no'), _('abstain')} + @app.before_request def lookup_user(): global prefix @@ -77,23 +103,24 @@ def lookup_user(): roles = env.get("ROLES") if user is None: - return "Server misconfigured", 500 + return _('Server misconfigured'), 500 roles = roles.split(" ") if user == "": - return "Access denied", 403; + return _('Access denied'), 403; db = get_db() with db.xact(): - rv = db.prepare("SELECT id FROM voter WHERE email=$1")(user) + rv = db.prepare("SELECT id FROM voter WHERE email=$1 AND host=$2")(user, request.host) if len(rv) == 0: - db.prepare("INSERT INTO voter(\"email\") VALUES($1)")(user) - rv = db.prepare("SELECT id FROM voter WHERE email=$1")(user) + db.prepare("INSERT INTO voter(\"email\", \"host\") VALUES($1, $2)")(user, request.host) + rv = db.prepare("SELECT id FROM voter WHERE email=$1 AND host=$2")(user, request.host) 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) + g.proxies_given = "" + rv = db.prepare("SELECT email, voter_id 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) + rv = db.prepare("SELECT email, voter_id 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 = "" @@ -144,11 +171,15 @@ def may_admin(action): return action in g.roles def get_voters(): - rv = get_db().prepare("SELECT email FROM voter") + rv = get_db().prepare("SELECT email FROM voter WHERE host=$1")(request.host) return rv def get_all_proxies(): - rv = get_db().prepare("SELECT p.id as id, v1.email as voter_email, v1.id as voterid, v2.email as proxy_email, v2.id as proxyid FROM voter AS v1, voter AS v2, proxy AS p WHERE v2.id = p.proxy_id AND v1.id = p.voter_id AND p.revoked is NULL ORDER BY voter_email, proxy_email") + rv = get_db().prepare("SELECT p.id as id, v1.email as voter_email, v1.id as voterid, "\ + + "v2.email as proxy_email, v2.id as proxyid "\ + + "FROM voter AS v1, voter AS v2, proxy AS p "\ + + "WHERE v2.id = p.proxy_id AND v1.id = p.voter_id AND p.revoked is NULL "\ + + "AND v1.host=$1 AND v2.host=$1 ORDER BY voter_email, proxy_email")(request.host) return rv @app.teardown_appcontext @@ -205,6 +236,29 @@ def init_db(): db.execute(f.read()) db.prepare("UPDATE \"schema_version\" SET \"version\"=4")() + if ver < 5: + with app.open_resource('sql/from_4.sql', mode='r') as f: + db.execute(f.read()) + db.prepare("UPDATE \"schema_version\" SET \"version\"=5")() + + if ver < 6: + with app.open_resource('sql/from_5.sql', mode='r') as f: + db.execute(f.read()) + rv=db.prepare("INSERT INTO voter (email, host) (SELECT vt.email, m.host FROM motion AS m, voter AS vt, vote as v "\ + + "WHERE (m.id=v.motion_id AND v.voter_id = vt.id) OR (m.id=v.motion_id AND v.proxy_id = vt.id) "\ + + "GROUP BY m.host, vt.email ORDER BY m.host, vt.email)")() + rv=db.prepare("UPDATE vote SET voter_id = "\ + + "(SELECT v_new.id FROM motion AS m, voter AS v_new, voter as v_old "\ + + "WHERE v_new.email = v_old.email AND v_old.id = vote.voter_id AND "\ + + "vote.motion_id = m.id AND m.host = v_new.host AND v_old.host is NULL)")() + rv=db.prepare("UPDATE vote SET proxy_id = "\ + + "(SELECT v_new.id FROM motion AS m, voter AS v_new, voter as v_old "\ + + "WHERE v_new.email = v_old.email AND v_old.id = vote.proxy_id AND "\ + + "vote.motion_id = m.id AND m.host = v_new.host AND v_old.host is NULL)")() + db.prepare("DELETE FROM voter WHERE host IS Null")() + db.prepare("ALTER TABLE \"voter\" ALTER COLUMN \"host\" SET NOT NULL")() + db.prepare("UPDATE \"schema_version\" SET \"version\"=6")() + init_db() @@ -231,7 +285,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"), singlemotion=False, may_proxyadmin=may_admin("proxyadmin")) + categories=get_allowed_cats("create"), singlemotion=False, may_proxyadmin=may_admin("proxyadmin"), languages=get_languages()) def rel_redirect(loc): r = redirect(loc) @@ -242,18 +296,18 @@ def rel_redirect(loc): def put_motion(): cat=request.form.get("category", "") if cat not in get_allowed_cats("create"): - return "Forbidden", 403 + return _('Forbidden'), 403 time = int(request.form.get("days", "3")); if time not in times.per_host: - return "Error, invalid length", 400 + return _('Error, invalid length'), 400 title=request.form.get("title", "") title=title.strip() if title =='': - return "Error, missing title", 400 + return _('Error, missing title'), 400 content=request.form.get("content", "") content=content.strip() if content =='': - return "Error, missing content", 400 + return _('Error, missing content'), 400 db = get_db() with db.xact(): @@ -270,7 +324,7 @@ def put_motion(): return rel_redirect("/") def motion_edited(motion): - return rel_redirect("/?start=" + str(motion) + "#motion-" + str(motion)) + return rel_redirect("/motion/" + motion) def validate_motion_access(privilege): def decorator(f): @@ -279,32 +333,41 @@ def validate_motion_access(privilege): 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 + return _('Error, Not found'), 404 id = rv[0].get("id") if not may(privilege, rv[0].get("type")): - return "Forbidden", 403 + return _('Forbidden'), 403 if rv[0].get("canceled") is not None: - return "Error, motion was canceled", 403 + return _('Error, motion was canceled'), 403 if rv[0].get("expired"): - return "Error, out of time", 403 + return _('Error, out of time'), 403 return f(motion, id) decorated_function.__name__ = f.__name__ return decorated_function return decorator +def validate_motion_access_vote(privilege): + simple_decorator = validate_motion_access(privilege) + def decorator(f): + def decorated_function(motion, voter): + return simple_decorator(lambda motion, id : f(motion, voter, id))(motion) + 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 + 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) + return motion_edited(motion) @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) + return motion_edited(motion) @app.route("/motion/") def show_motion(motion): @@ -313,63 +376,83 @@ def show_motion(motion): + "LEFT JOIN voter poser ON poser.id = motion.posed_by "\ + "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")), may_finish=may("finish", rv[0].get("type")), votes=votes, singlemotion=True, may_proxyadmin=may_admin("proxyadmin")) + resultmotion = p(motion, g.voter, request.host) + if len(resultmotion) == 0: + return _('Error, Not found'), 404 + + p = get_db().prepare("SELECT voter.email FROM vote INNER JOIN voter ON vote.proxy_id = voter.id WHERE vote.motion_id=$1 AND vote.voter_id=$2 AND vote.proxy_id <> vote.voter_id") + resultproxyname = p(resultmotion[0][0], g.voter) + + p = get_db().prepare("SELECT v.result, proxy.voter_id, voter.email, CASE WHEN proxy.proxy_id = v.proxy_id THEN NULL ELSE voter.email END AS owneremail FROM proxy LEFT JOIN "\ + + "(SELECT vote.voter_id, vote.result, vote.proxy_id FROM vote "\ + + "WHERE vote.motion_id=$1) AS v ON proxy.voter_id = v.voter_id "\ + + "LEFT JOIN voter ON proxy.voter_id = voter.id "\ + + "WHERE proxy.proxy_id=$2 AND proxy.revoked IS NULL") + resultproxyvote = p(resultmotion[0][0], g.voter) -@app.route("/motion//vote", methods=['POST']) -@validate_motion_access('vote') -def vote(motion, id): + votes = None + if may("audit", resultmotion[0].get("type")) and not resultmotion[0].get("running") and not resultmotion[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")(resultmotion[0].get("id")); + votes = get_db().prepare("SELECT vote.result, voter.email, CASE voter.email WHEN proxy.email THEN NULL ELSE proxy.email END as proxyemail FROM vote INNER JOIN voter ON voter.id = vote.voter_id INNER JOIN voter as proxy ON proxy.id = vote.proxy_id WHERE vote.motion_id=$1")(resultmotion[0].get("id")); + return render_template('single_motion.html', motion=resultmotion[0], may_vote=may("vote", resultmotion[0].get("type")), may_cancel=may("cancel", resultmotion[0].get("type")), may_finish=may("finish", resultmotion[0].get("type")), votes=votes, proxyvote=resultproxyvote, proxyname=resultproxyname, languages=get_languages()) + +@app.route("/motion//vote/", methods=['POST']) +@validate_motion_access_vote('vote') +def vote(motion, voter, id): v = request.form.get("vote", "abstain") + voterid=int(voter) db = get_db() + + # test if voter is proxy + if (voterid != g.voter): + rv = db.prepare("SELECT voter_id FROM proxy WHERE proxy.revoked IS NULL AND proxy.proxy_id = $1 AND proxy.voter_id = $2")(g.voter, voterid); + if len(rv) == 0: + return _('Error, proxy not found.'), 400 + p = db.prepare("SELECT * FROM vote WHERE motion_id = $1 AND voter_id = $2") - rv = p(id, g.voter) + rv = p(id, voterid) if len(rv) == 0: - db.prepare("INSERT INTO vote(motion_id, voter_id, result) VALUES($1,$2,$3)")(id, g.voter, v) + db.prepare("INSERT INTO vote(motion_id, voter_id, result, proxy_id) VALUES($1,$2,$3,$4)")(id, voterid, v, g.voter) 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) + db.prepare("UPDATE vote SET result=$3, entered=CURRENT_TIMESTAMP, proxy_id=$4 WHERE motion_id=$1 AND voter_id = $2")(id, voterid, v, g.voter) + return motion_edited(motion) @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")) + return _('Forbidden'), 403 + return render_template('proxy.html', voters=get_voters(), proxies=get_all_proxies(), may_proxyadmin=may_admin("proxyadmin"), languages=get_languages()) @app.route("/proxy/add", methods=['POST']) def add_proxy(): if not may_admin("proxyadmin"): - return "Forbidden", 403 + 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); + return _('Error, voter equals proxy.'), 400 + rv = get_db().prepare("SELECT id FROM voter WHERE email=$1 AND host=$2")(voter, request.host); if len(rv) == 0: - return "Error, voter not found.", 400 + return _('Error, voter not found.'), 400 voterid = rv[0].get("id") - rv = get_db().prepare("SELECT id FROM voter WHERE email=$1")(proxy); + rv = get_db().prepare("SELECT id, host FROM voter WHERE email=$1 AND host=$2")(proxy, request.host); if len(rv) == 0: - return "Error, proxy not found.", 400 + 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 + 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 + if rv[0].get("c") is None or rv[0].get("c") >= max_proxy: + return _("Error, Max proxy for '%s' reached.") % (proxy), 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 + 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") @@ -377,7 +460,24 @@ def revoke_proxy(): @app.route("/proxy/revokeall", methods=['POST']) def revoke_proxy_all(): if not may_admin("proxyadmin"): - return "Forbidden", 403 + 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") +@app.route("/language/") +def set_language(language): + lang.change_language(language) + return rel_redirect("/") + +@app.cli.command("create-user") +@click.argument("email") +@click.argument("host") +def create_user(email, host): + db = get_db() + with db.xact(): + rv = db.prepare("SELECT id FROM voter WHERE lower(email)=lower($1) AND host=$2")(email, host) + messagetext=_("User '%s' already exists on %s.") % (email, host) + if len(rv) == 0: + db.prepare("INSERT INTO voter(\"email\", \"host\") VALUES($1, $2)")(email, host) + messagetext=_("User '%s' inserted to %s.") % (email, host) + click.echo(messagetext)