X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=3ac3664959a7752828f3a200e8e208516922644d;hb=0f93afde08f333a6615145615f424db26240b512;hp=956e438727ff40728c8a4e69278057d242fce453;hpb=3c19321cfaca486ce5a3b7c68a58e9c1dfceefa2;p=cavote.git diff --git a/main.py b/main.py index 956e438..3ac3664 100755 --- a/main.py +++ b/main.py @@ -3,6 +3,7 @@ from flask import Flask, request, session, g, redirect, url_for, abort, \ render_template, flash +from flaskext.openid import OpenID import sqlite3 from datetime import date, time, timedelta, datetime import time @@ -14,17 +15,11 @@ 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.config.from_object(__name__) +app = Flask(__name__) app.config.from_object(__name__) + +oid = OpenID(app) def connect_db(): return sqlite3.connect(app.config['DATABASE']) @@ -57,8 +52,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 +72,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,11 +92,15 @@ 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') @@ -97,6 +109,16 @@ def login(): 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(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() @@ -116,7 +138,7 @@ 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) @@ -124,7 +146,7 @@ def password_lost(): "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()), + "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.", @@ -145,12 +167,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'])) @@ -171,8 +191,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) @@ -193,7 +213,12 @@ 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: @@ -231,13 +256,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: @@ -254,7 +282,7 @@ def admin_user_add(): "From: %s" % EMAIL, "To: %s" % user['email'], "Subject: [Cavote] Welcome", - "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()), + "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'], @@ -297,8 +325,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') @@ -381,7 +409,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': @@ -432,7 +460,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()): @@ -498,7 +526,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']) @@ -591,6 +619,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'):