X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=22d8c87ade3746d249100dbcac7f58916bea5941;hb=e3913800e8bccbdc364b7f54d28a8d8efcfa2e1b;hp=7870ee79e0dd9232ed081d94a4ec9de1d4084e38;hpb=0b580c50a8568e6927e1914d2408c296a9b30823;p=cavote.git diff --git a/main.py b/main.py index 7870ee7..22d8c87 100755 --- a/main.py +++ b/main.py @@ -4,15 +4,24 @@ from flask import Flask, request, session, g, redirect, url_for, abort, \ render_template, flash import sqlite3 -from datetime import date, timedelta +from datetime import date, time, timedelta +import time from contextlib import closing import locale locale.setlocale(locale.LC_ALL, '') +import os import hashlib +import smtplib +import string DATABASE = '/tmp/cavote.db' SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:' DEBUG = True +TITLE = u"Cavote FFDN" +EMAIL = '"' + TITLE + '"' + ' <' + u"cavote@ffdn.org" + '>' +BASEURL = "http://localhost:5000" +VERSION = "cavote 0.0.1" +SMTP_SERVER = "10.33.33.30" app = Flask(__name__) app.config.from_object(__name__) @@ -51,7 +60,7 @@ def valid_login(username, password): return query_db('select * from users where email = ? and password = ?', [username, crypt(password)], one=True) def connect_user(user): - session['user'] = user # :KLUDGE:maethor:120528: Stoquer toute la ligne de la table users dans la session, c'est un peu crade + session['user'] = user del session['user']['password'] del session['user']['key'] @@ -61,6 +70,9 @@ def disconnect_user(): def crypt(passwd): return hashlib.sha1(passwd).hexdigest() +def keygen(): + return hashlib.sha1(os.urandom(24)).hexdigest() + def get_userid(): user = session.get('user') if user is None: @@ -99,20 +111,43 @@ def password_lost(): if user is None: flash('Cet utilisateur n\'existe pas !', 'error') else: - # :TODO:maethor:120528: Generer la cle, la mettre dans la base de données et envoyer le mail + key = keygen() + g.db.execute('update users set key = ? where id = ?', [key, user['id']]) + g.db.commit() + link = BASEURL + url_for('login_key', userid=user['id'], key=key) + BODY = string.join(( + "From: %s" % EMAIL, + "To: %s" % user['email'], + "Subject: [Cavote] Password lost", + "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()), + "X-Mailer: %s" % VERSION, + "", + "You have lost your password.", + "This link will log you without password.", + "Don't forget to define a new one as soon a possible!", + "This link will only work one time.", + "", + link, + "", + "If you think this mail is not for you, please ignore and delete it." + ), "\r\n") + server = smtplib.SMTP(SMTP_SERVER) + server.sendmail(EMAIL, [user['email']], BODY) + server.quit() flash(u"Un mail a été envoyé à " + user['email'], 'info') return render_template('password_lost.html') @app.route('/login//') def login_key(userid, key): user = query_db('select * from users where id = ? and key = ?', [userid, key], one=True) - if user is None or key == "invalid": + if user is None or user['key'] == "invalid": abort(404) else: connect_user(user) - # :TODO:maethor:120528: Remplacer la clé pour qu'elle ne puisse plus être utilisée (invalid) + g.db.execute('update users set key = "invalid" where id = ?', [user['id']]) + g.db.commit() flash(u"Veuillez mettre à jour votre mot de passe", 'info') - return redirect(url_for('user_password'), userid=user['userid']) + return redirect(url_for('user_password', userid=user['id'])) #--------------- # User settings @@ -193,13 +228,12 @@ def admin_user_add(): admin = 0 if 'admin' in request.form.keys(): admin = 1 - g.db.execute('insert into users (email, name, organization, password, is_admin) values (?, ?, ?, ?, ?)', + g.db.execute('insert into users (email, name, organization, password, is_admin, key) values (?, ?, ?, ?, ?, "invalid")', [request.form['email'], request.form['username'], request.form['organization'], password, admin]) g.db.commit() user = query_db('select * from users where email = ?', [request.form["email"]], one=True) if user: for group in request.form.getlist('groups'): - # :TODO:maethor:120528: Check if this group exist if query_db('select id from groups where id = ?', group, one=True) is None: abort(401) g.db.execute('insert into user_group values (?, ?)', [user['id'], group]) @@ -256,15 +290,27 @@ def admin_group_del(idgroup): def votes(votes): today = date.today() active_button = votes - basequery = 'select *, votes.id as voteid, groups.name as groupname from votes join groups on groups.id = id_group where is_open=1' + max_votes ='select id_group, count(*) as max_votes from user_group group by id_group' + basequery = 'select votes.*, max_votes from votes join (' + max_votes + ') as max_votes on votes.id_group = max_votes.id_group' + nb_votes = 'select id_vote, count(*) as nb_votes from (select id_user, id_vote from user_choice join choices on id_choice = choices.id group by id_user, id_vote) group by id_vote' + basequery = 'select * from (' + basequery + ') left join (' + nb_votes + ') on id = id_vote' + basequery = 'select *, votes.id as voteid, groups.name as groupname from (' + basequery + ') as votes join groups on groups.id = id_group where is_open=1' if votes == 'all': votes = query_db(basequery + ' order by id desc') elif votes == 'archive': - votes = query_db(basequery + ' and date_end < (?) order by id desc', [today]) + votes = query_db(basequery + ' and is_terminated=1 order by id desc') elif votes == 'current': - votes = query_db(basequery + ' and date_end >= (?) order by id desc', [today]) + votes = query_db(basequery + ' and is_terminated=0 order by id desc') + elif votes == 'waiting': + basequery = 'select votes.* from user_group join (' + basequery + ') as votes on votes.id_group = user_group.id_group where user_group.id_user = ?' + already_voted = 'select id_vote from user_choice join choices on user_choice.id_choice = choices.id where id_user = ?' + votes = query_db(basequery + ' and votes.id not in (' + already_voted + ') and is_terminated=0', [get_userid(), get_userid()]) else: abort(404) + for vote in votes: + if not vote.get('nb_votes'): + vote['nb_votes'] = 0 + vote['percent'] = int((float(vote['nb_votes']) / float(vote['max_votes'])) * 100) return render_template('votes.html', votes=votes, active_button=active_button) #------ @@ -273,18 +319,23 @@ def votes(votes): def can_see_vote(idvote, iduser=-1): vote = query_db('select * from votes where id=?', [idvote], one=True) if vote is None: - abort(404) + return False if not vote['is_public']: user = query_db('select * from users where id=?', [iduser], one=True) - if user is None: # :TODO:maethor:120604: Check others things (groups) + if query_db('select * from user_group where id_user = ? and id_group = ?', [iduser, vote['id']], one=True) is None: return False return True def can_vote(idvote, iduser=-1): - if iduser > 0: - if can_see_vote(idvote, iduser): - if not has_voted(idvote, iduser): - return True # :TODO:maethor:120529: Check others things (groups) + vote = query_db('select * from votes where id=?', [idvote], one=True) + if vote is None: + return False + if not vote['is_finished']: + if iduser > 0: + if can_see_vote(idvote, iduser): + if not has_voted(idvote, iduser): + if query_db('select * from user_group where id_user = ? and id_group = ?', [iduser, vote['id']], one=True): + return True return False def has_voted(idvote, iduser=-1): @@ -321,9 +372,20 @@ def vote(idvote): users[t['userid']]['choices'] = [t['choiceid']] choices = query_db('select choices.name, choices.id, choices.name, choices.id_vote, count(id_choice) as nb from choices left join user_choice on id_choice = choices.id where id_vote = ? group by id_choice, name, id_vote order by id', [idvote]) attachments = query_db('select * from attachments where id_vote=?', [idvote]) + tmp = query_db('select id_group, count(*) as nb from user_group where id_group = ? group by id_group', [vote['id_group']], one=True) + if tmp is None: + vote['percent'] = 0 + else: + vote['max_votes'] = tmp['nb'] + tmp = query_db('select id_vote, count(*) as nb from (select id_user, id_vote from user_choice join choices on id_choice = choices.id group by id_user, id_vote) where id_vote = ? group by id_vote', [idvote], one=True) + if tmp is None: + vote['percent'] = 0 + else: + vote['nb_votes'] = tmp['nb'] + vote['percent'] = int((float(vote['nb_votes']) / float(vote['max_votes'])) * 100) return render_template('vote.html', vote=vote, attachments=attachments, choices=choices, users=users.values(), can_vote=can_vote(idvote, get_userid())) - flash('Vous n\'avez pas le droit de voir ce vote, désolé.') - return(url_for('home')) + flash(u'Vous n\'avez pas le droit de voir ce vote, désolé.') + return redirect(url_for('home')) @app.route('/vote/deletechoices//') def vote_deletechoices(idvote, iduser): @@ -400,14 +462,19 @@ def admin_vote_edit(voteid): if 'public' in request.form.keys(): public = 1 isopen = 0 - if request.form['status'] == 'Ouvert': # :TODO:maethor:120529: Check if there is at least 2 choices before + isterminated = 0 + if request.form['status'] == 'Ouvert': choices = query_db('select id_vote, count(*) as nb from choices where id_vote = ? group by id_vote', [voteid], one=True) if choices is not None and choices['nb'] >= 2: isopen = 1 else: flash(u'Vous devez proposer au moins deux choix pour ouvrir le vote.', 'error') - g.db.execute('update votes set title = ?, description = ?, category = ?, is_transparent = ?, is_public = ?, is_open = ? where id = ?', - [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, voteid]) + elif request.form['status'] == u'Terminé': + isterminated = 1 + if vote['is_open']: + isopen = 1 + g.db.execute('update votes set title = ?, description = ?, category = ?, is_transparent = ?, is_public = ?, is_open = ?, is_terminated = ? where id = ?', + [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, isterminated, voteid]) g.db.commit() vote = query_db('select * from votes where id = ?', [voteid], one=True) flash(u"Le vote a bien été mis à jour.", "success")