from contextlib import closing
import locale
locale.setlocale(locale.LC_ALL, '')
+import hashlib
DATABASE = '/tmp/cavote.db'
SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
# Login / Logout
def valid_login(username, password):
- return query_db('select * from users where email = ? and password = ?', [username, password], one=True)
+ 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']['id'] = user['id']
- #session['user']['name'] = user['name']
- #session['user']['email'] = user['email']
- #session['user']['organization'] = user['organization']
- #if user['is_admin'] == 1:
- # session['user']['is_admin'] = True
+ del session['user']['password']
+ del session['user']['key']
def disconnect_user():
session.pop('user', None)
+def crypt(passwd):
+ return hashlib.sha1(passwd).hexdigest()
+
@app.route('/login', methods=['GET', 'POST'])
def login():
if request.method == 'POST':
def user(userid):
if int(userid) != session.get('user').get('id'):
abort(401)
- return render_template('user.html')
+ groups = query_db('select * from roles join user_role on id=id_role where id_user = ?', userid)
+ return render_template('user.html', groups=groups)
@app.route('/user/settings/<userid>', methods=['GET', 'POST'])
def user_edit(userid):
if int(userid) != session.get('user').get('id'):
abort(401)
if request.method == 'POST':
- 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.commit()
- disconnect_user() # :TODO:maethor:120528: Maybe useless, but this is simple way to refresh session :D
- flash(u'Votre profil a été mis à jour !', 'success')
- return redirect(url_for('login'))
+ 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.commit()
+ disconnect_user() # :TODO:maethor:120528: Maybe useless, but this is simple way to refresh session :D
+ user = query_db('select * from users where id=?', [userid], one=True)
+ if user is None:
+ flash(u'Une erreur s\'est produite.', 'error')
+ return redirect(url_for('login'))
+ connect_user(user)
+ flash(u'Votre profil a été mis à jour !', 'success')
+ else:
+ flash(u'Le nom ' + request.form['name'] + u' est déjà pris ! Veuillez en choisir un autre.', 'error')
+ else:
+ flash(u'Il existe déjà un compte pour cette adresse e-mail : ' + request.form['email'], 'error')
return render_template('user_edit.html')
@app.route('/user/password/<userid>', methods=['GET', 'POST'])
abort(401)
if request.method == 'POST':
if request.form['password'] == request.form['password2']:
- # :TODO:maethor:120528: Chiffrer le mot de passe !
- g.db.execute('update users set password = ? where id = ?', [request.form['password'], session['user']['id']])
+ g.db.execute('update users set password = ? where id = ?', [crypt(request.form['password']), session['user']['id']])
g.db.commit()
flash(u'Votre mot de passe a été mis à jour.', 'success')
else:
def admin_users():
if not session.get('user').get('is_admin'):
abort(401)
- users = query_db('select * from users order by id desc')
+ tuples = query_db('select *, roles.name as rolename from (select *, id as userid, name as username from users join user_role on id=id_user order by id desc) join roles on id_role=roles.id')
+ users = dict()
+ for t in tuples:
+ if t['userid'] in users:
+ users[t['userid']]['roles'].append(t["rolename"])
+ else:
+ users[t['userid']] = dict()
+ users[t['userid']]['userid'] = t['userid']
+ users[t['userid']]['email'] = t['email']
+ users[t['userid']]['username'] = t['username']
+ users[t['userid']]['is_admin'] = t['is_admin']
+ users[t['userid']]['roles'] = [t['rolename']]
+
return render_template('admin_users.html', users=users)
@app.route('/admin/users/add', methods=['GET', 'POST'])
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()
- # :TODO:maethor:120528: Send mail
- flash(u'Le nouvel utilisateur a été créé avec succès', 'success')
- return redirect(url_for('home'))
+ user = query_db('select * from users where email = ?', [request.form["email"]], one=True)
+ if user:
+ for role in request.form.getlist('roles'):
+ # :TODO:maethor:120528: Check if this role exist
+ if query_db('select id from roles where id = ?', role, one=True) is None:
+ abort(401)
+ g.db.execute('insert into user_role values (?, ?)', [user['id'], role])
+ 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"Vous devez spécifier une adresse email.", 'error')
- return render_template('admin_user_new.html')
+ groups = query_db('select * from roles where system=0')
+ return render_template('admin_user_new.html', groups=groups)
#-------------
# Roles admin
dépôts / cavote.git / blobdiff