X-Git-Url: http://git.cyclocoop.org/?p=cavote.git;a=blobdiff_plain;f=main.py;h=da8431c5a56381e9a00a02632fe8cfee2abd8ff8;hp=6b391c3beb319fa00722c0786262fbd987e31e66;hb=5214a40c479b78efea032f35accf1b3669e6428d;hpb=9dccdd0b2023a045dc7d1cd53c2c7925e8fea7b1 diff --git a/main.py b/main.py index 6b391c3..da8431c 100755 --- a/main.py +++ b/main.py @@ -3,6 +3,8 @@ from flask import Flask, request, session, g, redirect, url_for, abort, \ render_template, flash +from flask_openid import OpenID +from flaskext.babel import Babel, gettext, ngettext import sqlite3 from datetime import date, time, timedelta, datetime import time @@ -14,18 +16,14 @@ 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" + '>' -VERSION = "cavote 0.1.0" -SMTP_SERVER = "10.33.33.30" -PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']} +from settings import * -app = Flask(__name__) +app = Flask(__name__) app.config.from_object(__name__) +oid = OpenID(app) +babel = Babel(app) + def connect_db(): return sqlite3.connect(app.config['DATABASE']) @@ -57,8 +55,17 @@ def init_db(): #---------------- # Login / Logout -def valid_login(username, password): - return query_db('select * from users where email = ? and password = ?', [username, crypt(password)], one=True) +def valid_login(email, password): + # get user key + user_key = query_db('select key from users where email = ?', (email,), + one=True) + if not user_key: + # no such user + return None + user_key = user_key['key'] + # try password + return query_db('select * from users where email = ? and password = ?', + [email, crypt(password, user_key)], one=True) def connect_user(user): session['user'] = user @@ -68,8 +75,12 @@ def connect_user(user): def disconnect_user(): session.pop('user', None) -def crypt(passwd): - return hashlib.sha1(passwd).hexdigest() +def crypt(passwd, user_key): + # the per-user salt should not be stored in the db + # storing the passwd... but this is better than nothing + per_user_salt = hashlib.sha1(user_key).hexdigest() + salt_passwd = '%s%s%s' % (app.config['PASSWD_SALT'], per_user_salt, passwd) + return hashlib.sha1(salt_passwd).hexdigest() def keygen(): return hashlib.sha1(os.urandom(24)).hexdigest() @@ -84,21 +95,39 @@ def get_userid(): return user.get('id') @app.route('/login', methods=['GET', 'POST']) +@oid.loginhandler def login(): if request.method == 'POST': user = valid_login(request.form['username'], request.form['password']) if user is None: - flash(u'Email ou mot de passe invalide.', 'error') + if request.form['openid']: + return oid.try_login(request.form['openid'], ask_for=['email', 'fullname', 'nickname']) + else: + flash(u'Email ou mot de passe invalide.', 'error') else: connect_user(user) flash(u'Vous êtes connecté. Bienvenue, %s !' % user['name'], 'success') + if request.args.get('continue'): + return redirect(request.args['continue']) return redirect(url_for('home')) return render_template('login.html') +@oid.after_login +def create_or_login(resp): + openid_url = resp.identity_url + user = query_db('select * from users where openid = ?', [openid_url], one=True) + if user is not None: + flash(gettext(u'Successfully signed in')) + connect_user(user) + return redirect(oid.get_next_url()) + return redirect(url_for('home')) + @app.route('/logout') def logout(): disconnect_user() flash(u'Vous avez été déconnecté.', 'info') + if request.args.get('continue') and not "admin" in request.args.get('continue'): + return redirect(request.args['continue']) return redirect(url_for('home')) #----------------- @@ -112,28 +141,28 @@ def password_lost(): if user is None: flash('Cet utilisateur n\'existe pas !', 'error') else: - key = keygen() + key = 'v%s' % keygen() # start with v: valid key g.db.execute('update users set key = ? where id = ?', [key, user['id']]) g.db.commit() link = request.url_root + 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()), + "Subject: [Cavote] %s" % gettext(u"Lost password"), + "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'), "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.", + gettext(u"It seems that you have lost your password."), + gettext(u"This link will log you without password."), + gettext(u"Don't forget to define a new one as soon a possible!"), + gettext(u"This link will only work one time."), "", link, "", - "If you think this mail is not for you, please ignore and delete it." + gettext(u"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.sendmail(EMAIL, [user['email']], BODY.encode('utf-8')) server.quit() flash(u"Un mail a été envoyé à " + user['email'], 'info') return render_template('password_lost.html') @@ -141,12 +170,10 @@ def password_lost(): @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 user['key'] == "invalid": + if user is None or user['key'][0] != "v": abort(404) else: connect_user(user) - 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['id'])) @@ -157,7 +184,7 @@ def login_key(userid, key): def user(userid): if int(userid) != get_userid(): abort(401) - groups = query_db('select * from groups join user_group on id=id_group where id_user = ?', userid) + groups = query_db('select * from groups join user_group on id=id_group where id_user = ?', (userid,)) return render_template('user.html', groups=groups) @app.route('/user/settings/', methods=['GET', 'POST']) @@ -167,8 +194,8 @@ def user_edit(userid): if request.method == 'POST': if query_db('select * from users where email=? and id!=?', [request.form['email'], userid], one=True) is None: if query_db('select * from users where name=? and id!=?', [request.form['name'], userid], one=True) is None: - g.db.execute('update users set email = ?, name = ?, organization = ? where id = ?', - [request.form['email'], request.form['name'], request.form['organization'], session['user']['id']]) + g.db.execute('update users set email = ?, openid = ?, name = ?, organization = ? where id = ?', + [request.form['email'], request.form['openid'], request.form['name'], request.form['organization'], session['user']['id']]) g.db.commit() disconnect_user() user = query_db('select * from users where id=?', [userid], one=True) @@ -189,7 +216,10 @@ def user_password(userid): abort(401) if request.method == 'POST': if request.form['password'] == request.form['password2']: - g.db.execute('update users set password = ? where id = ?', [crypt(request.form['password']), session['user']['id']]) + # new (invalid) key + key = 'i%s' % keygen() # start with i: invalid key + print "\n\nchange key for %s\n" % key # FIXME TMP + g.db.execute('update users set password = ?, key = ? where id = ?', [crypt(request.form['password'], key), key, session['user']['id']]) g.db.commit() flash(u'Votre mot de passe a été mis à jour.', 'success') else: @@ -227,13 +257,16 @@ def admin_user_add(): 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: - password = keygen() admin = 0 if 'admin' in request.form.keys(): admin = 1 - key = keygen() - g.db.execute('insert into users (email, name, organization, password, is_admin, key) values (?, ?, ?, ?, ?, ?)', - [request.form['email'], request.form['username'], request.form['organization'], password, admin, key]) + key = 'v%s' % keygen() + g.db.execute('insert into users (email, openid, name, organization, password, is_admin, key) values (?, ?, ?, ?, ?, ?, ?)', + [request.form['email'], + request.form['openid'], + request.form['username'], + request.form['organization'], + '', admin, key]) g.db.commit() user = query_db('select * from users where email = ?', [request.form["email"]], one=True) if user: @@ -249,20 +282,20 @@ def admin_user_add(): BODY = string.join(( "From: %s" % EMAIL, "To: %s" % user['email'], - "Subject: [Cavote] Welcome", - "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()), + "Subject: [Cavote] %s" % gettext(u"Welcome"), + "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'), "X-Mailer: %s" % VERSION, "", - "Hi %s!" % user['name'], - "Welcome on %s." % TITLE, - "Your account's adresse is : %s." % user['email'], + "%(text)s %(user)s!" % {"text": gettext(u"Hi"), "user": user['name']}, + "%(text2)s %(title)s." % {"text2": gettext(u"Welcome on"), "title": TITLE}, + "%(text3)s %(email)s." % {"text3": gettext(u"Your account address is"), "email": user['email']}, "", - "To log in for the first time and set your password, please follow this link :", + gettext(u"To log in for the first time and set your password, please follow this link :"), link, "" ), "\r\n") server = smtplib.SMTP(SMTP_SERVER) - server.sendmail(EMAIL, [user['email']], BODY) + server.sendmail(EMAIL, [user['email']], BODY.encode('utf-8')) server.quit() flash(u'Le nouvel utilisateur a été créé avec succès', 'success') return redirect(url_for('admin_users')) @@ -293,8 +326,8 @@ def admin_user_edit(iduser): admin = 0 if 'admin' in request.form.keys(): admin = 1 - g.db.execute('update users set email = ?, name = ?, organization = ?, is_admin = ? where id = ?', - [request.form['email'], request.form['name'], request.form['organization'], admin, iduser]) + g.db.execute('update users set email = ?, name = ?, organization = ?, openid= ?, is_admin = ? where id = ?', + [request.form['email'], request.form['name'], request.form['organization'], request.form['openid'], admin, iduser]) g.db.commit() groups = request.form.getlist('groups') groups.append('1') @@ -377,7 +410,7 @@ def votes(votes): basequery = 'select votes.*, max_votes from votes left 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' + 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 and is_hidden=0' if votes == 'all': votes = query_db(basequery + ' order by date_end') elif votes == 'archive': @@ -428,7 +461,7 @@ def has_voted(idvote, iduser=-1): @app.route('/vote/', methods=['GET', 'POST']) def vote(idvote): - vote = query_db('select votes.*, groups.name as groupname from votes join groups on groups.id=votes.id_group where votes.id=?', [idvote], one=True) + vote = query_db('select votes.*, groups.name as groupname, users.name as author from votes join groups on groups.id=votes.id_group join users on users.id=votes.id_author where votes.id=?', [idvote], one=True) if vote is None: abort(404) if can_see_vote(idvote, get_userid()): @@ -494,7 +527,7 @@ def vote_deletechoices(idvote, iduser): def admin_votes(): if not session.get('user').get('is_admin'): abort(401) - votes = query_db('select *, votes.id as voteid, groups.name as groupname from votes join groups on groups.id=votes.id_group order by id desc') + votes = query_db('select *, votes.id as voteid, groups.name as groupname from votes join groups on groups.id=votes.id_group where is_hidden=0 order by id desc') return render_template('admin_votes.html', votes=votes, today=date.today().strftime("%Y-%m-%d")) @app.route('/admin/votes/add', methods=['GET', 'POST']) @@ -565,21 +598,41 @@ def admin_vote_edit(voteid): 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 + previousvote = query_db('select id, is_open, id_group from votes where id = ?', [voteid], one=True) + if previousvote is None or previousvote['is_open'] == 0: + users_to_vote = query_db('select users.email, users.name from users join user_group on users.id=user_group.id_user where user_group.id_group = ?', [previousvote['id_group']]) + for user in users_to_vote: + link = request.url_root + url_for('vote', idvote=voteid) + BODY = string.join(( + "From: %s" % EMAIL, + "To: %s" % user['email'], + "Subject: [Cavote] %s" % gettext(u"A vote has been opened for your group"), + "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'), + "X-Mailer: %s" % VERSION, + "", + "%(text)s %(title)s" % {"text": gettext(u"A vote has been opened and you are in a group concerned by it :"), "title": request.form['title']}, + "", + gettext(u"This link will bring you to the form where you will be able to vote :"), + link, + "", + gettext(u"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.encode('utf-8')) + server.quit() 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 = ?, date_end = ? where id = ?', - [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, isterminated, date_end, voteid]) + g.db.execute('update votes set title = ?, description = ?, category = ?, is_transparent = ?, is_public = ?, is_open = ?, is_terminated = ?, date_end = ?, reminder_last_days = ? where id = ?', [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, isterminated, date_end, request.form['reminder'], 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") else: flash(u'Vous devez spécifier un titre.', 'error') - vote['duration'] = (datetime.strptime(vote['date_end'], "%Y-%m-%d") - - datetime.strptime(vote['date_begin'], "%Y-%m-%d")).days + vote['duration'] = (datetime.strptime(vote['date_end'], "%Y-%m-%d") - datetime.strptime(vote['date_begin'], "%Y-%m-%d")).days group = query_db('select name from groups where id = ?', [vote['id_group']], one=True) choices = query_db('select * from choices where id_vote = ?', [voteid]) attachments = query_db('select * from attachments where id_vote = ?', [voteid]) @@ -587,6 +640,17 @@ def admin_vote_edit(voteid): flash(u'La deadline du vote est expirée, vous devriez terminer le vote.') return render_template('admin_vote_edit.html', vote=vote, group=group, choices=choices, attachments=attachments) +@app.route('/admin/votes/delete/') +def admin_vote_del(idvote): + if not session.get('user').get('is_admin'): + abort(401) + vote = query_db('select * from votes where id = ?', [idvote], one=True) + if vote is None: + abort(404) + g.db.execute('update votes set is_hidden=1 where id = ?', [idvote]) + g.db.commit() + return redirect(url_for('admin_votes')) + @app.route('/admin/votes/addchoice/', methods=['POST']) def admin_vote_addchoice(voteid): if not session.get('user').get('is_admin'): @@ -653,4 +717,3 @@ def admin_vote_deleteattachment(voteid, attachmentid): if __name__ == '__main__': app.run() -