X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=78998b0a50e4feb3a90b8c1ee81d834e5b3a6020;hb=692cedd65f1e8a493ac7dce8698b5ad32bd83df3;hp=b3f50ba6d99e3e11f8816d2b7bf1cd77c778518f;hpb=1dfbd755dae26562b182d81f8818c5c3dcc6694b;p=cavote.git diff --git a/main.py b/main.py index b3f50ba..78998b0 100755 --- a/main.py +++ b/main.py @@ -4,15 +4,25 @@ 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" +PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']} app = Flask(__name__) app.config.from_object(__name__) @@ -51,7 +61,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 +71,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 +112,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 @@ -188,27 +224,37 @@ def admin_user_add(): abort(401) if request.method == 'POST': if request.form['email']: - # :TODO:maethor:120528: Check fields - password = "toto" # :TODO:maethor:120528: Generate password - admin = 0 - if 'admin' in request.form.keys(): - admin = 1 - g.db.execute('insert into users (email, name, organization, password, is_admin) values (?, ?, ?, ?, ?)', - [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]) - g.db.commit() - # :TODO:maethor:120528: Send mail - flash(u'Le nouvel utilisateur a été créé avec succès', 'success') - return redirect(url_for('admin_users')) + if query_db('select * from users where email=?', [request.form['email']], one=True) is None: + if request.form['username']: + if query_db('select * from users where name=?', [request.form['username']], one=True) is None: + # :TODO:maethor:120528: Check fields + password = "toto" # :TODO:maethor:120528: Generate password + admin = 0 + if 'admin' in request.form.keys(): + admin = 1 + 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: + groups = request.form.getlist('groups') + groups.append('1') + for group in groups: + 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]) + g.db.commit() + # :TODO:maethor:120528: Send mail + flash(u'Le nouvel utilisateur a été créé avec succès', 'success') + return redirect(url_for('admin_users')) + else: + flash(u'Une erreur s\'est produite.', 'error') + else: + flash(u'Le nom ' + request.form['username'] + u' est déjà pris ! Veuillez en choisir un autre.', 'error') + else: + flash(u"Vous devez spécifier un nom d'utilisateur.", 'error') else: - flash(u'Une erreur s\'est produite.', 'error') + flash(u'Il existe déjà un compte pour cette adresse e-mail : ' + request.form['email'], 'error') else: flash(u"Vous devez spécifier une adresse email.", 'error') groups = query_db('select * from groups where system=0') @@ -256,15 +302,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 +331,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 +384,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): @@ -350,35 +424,43 @@ def admin_vote_add(): abort(401) if request.method == 'POST': if request.form['title']: - date_begin = date.today() - date_end = date.today() + timedelta(days=int(request.form['days'])) - transparent = 0 - public = 0 - multiplechoice = 0 - if 'transparent' in request.form.keys(): - transparent = 1 - if 'public' in request.form.keys(): - public = 1 - if 'multiplechoice' in request.form.keys(): - multiplechoice = 1 - group = query_db('select id from groups where name = ?', [request.form['group']], one=True) - if group is None: - group[id] = 1 - g.db.execute('insert into votes (title, description, category, date_begin, date_end, is_transparent, is_public, is_multiplechoice, id_group, id_author) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', - [request.form['title'], request.form['description'], request.form['category'], date_begin, date_end, transparent, public, multiplechoice, group['id'], session['user']['id']]) - g.db.commit() - vote = query_db('select * from votes where title = ? and date_begin = ? order by id desc', - [request.form['title'], date_begin], one=True) # :DEBUG:maethor:120528: Bug possible car le titre n'est pas unique - if vote is None: - flash(u'Une erreur est survenue !', 'error') - return redirect(url_for('home')) + if query_db('select * from votes where title = ?', [request.form['title']], one=True) is None: + date_begin = date.today() + date_end = date.today() + timedelta(days=int(request.form['days'])) + transparent = 0 + public = 0 + multiplechoice = 0 + if 'transparent' in request.form.keys(): + transparent = 1 + if 'public' in request.form.keys(): + public = 1 + if 'multiplechoice' in request.form.keys(): + multiplechoice = 1 + group = query_db('select id from groups where name = ?', [request.form['group']], one=True) + if group is None: + group[id] = 1 + g.db.execute('insert into votes (title, description, category, date_begin, date_end, is_transparent, is_public, is_multiplechoice, id_group, id_author) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', + [request.form['title'], request.form['description'], request.form['category'], date_begin, date_end, transparent, public, multiplechoice, group['id'], session['user']['id']]) + g.db.commit() + vote = query_db('select * from votes where title = ? and date_begin = ? order by id desc', + [request.form['title'], date_begin], one=True) + if vote is None: + flash(u'Une erreur est survenue !', 'error') + return redirect(url_for('home')) + else: + if request.form['pattern'] in PATTERNS.keys(): + pattern = PATTERNS[request.form['pattern']] + for choice in pattern: + g.db.execute('insert into choices (name, id_vote) values (?, ?)', [choice, vote['id']]) + g.db.commit() + flash(u"Le vote a été créé", 'info') + return redirect(url_for('admin_vote_edit', voteid=vote['id'])) else: - flash(u"Le vote a été créé", 'info') - return redirect(url_for('admin_vote_edit', voteid=vote['id'])) + flash(u'Le titre que vous avez choisi est déjà pris.', 'error') else: flash(u'Vous devez spécifier un titre.', 'error') groups = query_db('select * from groups') - return render_template('admin_vote_new.html', groups=groups) + return render_template('admin_vote_new.html', groups=groups, patterns=PATTERNS) @app.route('/admin/votes/edit/', methods=['GET', 'POST']) def admin_vote_edit(voteid): @@ -397,10 +479,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 - isopen = 1 - 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]) + 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') + 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") @@ -435,9 +526,6 @@ def admin_vote_editchoice(voteid, choiceid): if request.method == 'POST': g.db.execute('update choices set name=? where id = ? and id_vote = ?', [request.form['title'], choiceid, voteid]) g.db.commit() - elif request.method == 'DELETE': # :COMMENT:maethor:120528: I can't find how to use it from template - g.db.execute('delete from choices where id = ? and id_vote = ?', [choiceid, voteid]) - g.db.commt() return redirect(url_for('admin_vote_edit', voteid=voteid)) @app.route('/admin/votes/deletechoice//') @@ -449,6 +537,11 @@ def admin_vote_deletechoice(voteid, choiceid): abort(404) g.db.execute('delete from choices where id = ? and id_vote = ?', [choiceid, voteid]) g.db.commit() + choices = query_db('select id_vote, count(*) as nb from choices where id_vote = ? group by id_vote', [voteid], one=True) + if choices is None or choices['nb'] < 2: + g.db.execute('update votes set is_open=0 where id = ?', [voteid]) + g.db.commit() + flash(u'Attention ! Il y a moins de deux choix. Le vote a été fermé.', 'error') return redirect(url_for('admin_vote_edit', voteid=voteid)) @app.route('/admin/votes/addattachment/', methods=['POST'])