X-Git-Url: https://code.wpia.club/?p=motion.git;a=blobdiff_plain;f=motion.py;h=8eaa3501214926263fa271255c2fdf90633a1c38;hp=f6ddf1344004ee30bd5bbb40d096eadcd33cea90;hb=f3cf764d5e9ab3f2fa1327dc5db02de90fd91434;hpb=d7504b91c032774c7db1aeb07d116cceb4cd93f7 diff --git a/motion.py b/motion.py index f6ddf13..8eaa350 100644 --- a/motion.py +++ b/motion.py @@ -2,10 +2,16 @@ from flask import g 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) @@ -16,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): @@ -24,14 +33,53 @@ class EscapeHtml(Extension): 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" + MAX_PROXY=2 + + # Load config +app.config.from_object('motion.default_settings') 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) + +prefix = ConfigProxy("GROUP_PREFIX") +times = ConfigProxy("DURATION") +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() -debuguser=app.config.get("DEBUGUSER") +@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(): @@ -39,8 +87,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] @@ -53,13 +102,12 @@ def lookup_user(): user = env.get("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(): @@ -68,6 +116,18 @@ 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"); + 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, 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 = "" + for x in range(0, len(rv)): + g.proxies_received += sep + rv[x].get("email") + sep =", " + g.user = user g.roles = {} @@ -78,17 +138,46 @@ 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 +@app.context_processor +def init_footer_variables(): + if int(app.config.get("COPYRIGHTSTART"))/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 + 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(motion) @app.route("/motion/") def show_motion(motion): @@ -214,30 +354,107 @@ 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) - 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) + resultmotion = p(motion, g.voter, request.host) + if len(resultmotion) == 0: + return _('Error, Not found'), 404 -@app.route("/motion//vote", methods=['POST']) -def vote(motion): + 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) + + 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")), 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() - with db.xact(): - rv = db.prepare("SELECT id, type FROM motion WHERE identifier=$1 AND host=$2")(motion, request.host); + + # 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, 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) + return _('Error, proxy not found.'), 400 + + p = db.prepare("SELECT * FROM vote WHERE motion_id = $1 AND voter_id = $2") + rv = p(id, voterid) + if len(rv) == 0: + 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, 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"), languages=get_languages()) + +@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") 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 + 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") + +@app.route("/language/") +def set_language(language): + lang.change_language(language) + return rel_redirect("/") + +@app.cli.command("create-user") +@click.argument("email") +def create_user(email): + db = get_db() + with db.xact(): + rv = db.prepare("SELECT id FROM voter WHERE lower(email)=lower($1)")(email) + messagetext=_("User '%s' already exists.") % (email) 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) + db.prepare("INSERT INTO voter(\"email\") VALUES($1)")(email) + messagetext=_("User '%s' inserted.") % (email) + click.echo(messagetext)