108536490: Implement LoginManager for the admin app.

Also added csrf error handler, will make the session unauthorized if the csrf token is invalid.
This commit is contained in:
Rebecca Law
2015-11-30 11:21:51 +00:00
parent 48b7a7dc37
commit 6f61906fd4
6 changed files with 87 additions and 59 deletions

View File

@@ -1,12 +1,13 @@
import os
from flask import Flask
from flask import Flask, session
from flask._compat import string_types
from flask.ext import assets
from flask.ext.sqlalchemy import SQLAlchemy
from flask_login import LoginManager
from flask_wtf import CsrfProtect
from webassets.filter import get_filter
from werkzeug.exceptions import abort
from config import configs
@@ -22,8 +23,10 @@ def create_app(config_name):
application.config.from_object(configs[config_name])
db.init_app(application)
init_app(application)
csrf.init_app(application)
init_csrf(application)
login_manager.init_app(application)
login_manager.login_view = 'main.sign_in.render_sign_in'
from app.main import main as main_blueprint
application.register_blueprint(main_blueprint)
@@ -31,6 +34,25 @@ def create_app(config_name):
return application
def init_csrf(application):
csrf.init_app(application)
@csrf.error_handler
def csrf_handler(reason):
if 'user_id' not in session:
application.logger.info(
u'csrf.session_expired: Redirecting user to log in page'
)
return application.login_manager.unauthorized()
application.logger.info(
u'csrf.invalid_token: Aborting request, user_id: {user_id}',
extra={'user_id': session['user_id']})
abort(400, reason)
def init_app(app):
for key, value in app.config.items():
if key in os.environ:

View File

@@ -1,5 +1,5 @@
from app import db
from app.models import Users
from app.models import User
from app.main.encryption import encrypt
@@ -10,12 +10,12 @@ def insert_user(user):
def get_user_by_id(id):
return Users.query.filter_by(id=id).first()
return User.query.filter_by(id=id).first()
def get_all_users():
return Users.query.all()
return User.query.all()
def get_user_by_email(email_address):
return Users.query.filter_by(email_address=email_address).first()
return User.query.filter_by(email_address=email_address).first()

View File

@@ -3,13 +3,19 @@ from datetime import datetime
from flask import render_template, redirect, jsonify
from flask_login import login_user
from app import login_manager
from app.main import main
from app.main.forms import LoginForm
from app.main.dao import users_dao
from app.models import Users
from app.models import User
from app.main.encryption import encrypt
@login_manager.user_loader
def load_user(user_id):
return users_dao.get_user_by_id(user_id)
@main.route("/sign-in", methods=(['GET']))
def render_sign_in():
return render_template('signin.html', form=LoginForm())
@@ -40,12 +46,12 @@ def render_create_user():
def create_user_for_test():
form = LoginForm()
if form.validate_on_submit():
user = Users(email_address=form.email_address.data,
name=form.email_address.data,
password=form.password.data,
created_at=datetime.now(),
mobile_number='+447651234534',
role_id=1)
user = User(email_address=form.email_address.data,
name=form.email_address.data,
password=form.password.data,
created_at=datetime.now(),
mobile_number='+447651234534',
role_id=1)
users_dao.insert_user(user)
return redirect('/sign-in')

View File

@@ -12,7 +12,7 @@ class Roles(db.Model):
role = db.Column(db.String, nullable=False, unique=True)
class Users(db.Model):
class User(db.Model):
__tablename__ = 'users'
id = db.Column(db.Integer, primary_key=True)
@@ -63,7 +63,7 @@ class Users(db.Model):
@staticmethod
def load_user(user_id):
user = Users.query.filter_by(id=user_id).first()
user = User.query.filter_by(id=user_id).first()
if user.is_active():
return user