vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Style fixes

Browse source
This commit is contained in:
Joseph Schorr 2013-12-28 19:56:23 -05:00
parent 21ac1c9210
commit b598c7ec85
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
endpoints/common.py
View file

@ -2,7 +2,7 @@ import logging
import os import os
import base64 import base64
from flask import request, make_response, jsonify, abort, url_for, session from flask import request, abort, session
from flask.ext.login import login_user, UserMixin from flask.ext.login import login_user, UserMixin
from flask.ext.principal import identity_changed from flask.ext.principal import identity_changed
@ -55,7 +55,7 @@ def common_login(db_user):
def csrf_protect(): def csrf_protect():
if request.method != "GET" and request.method != "HEAD": if request.method != "GET" and request.method != "HEAD":
token = session.get('_csrf_token', None) token = session.get('_csrf_token', None)
found_token = request.args.get('_csrf_token', request.form.get('_csrf_token', None)) found_token = request.values.get('_csrf_token', None)
# TODO: add if not token here, once we are sure all sessions have a token. # TODO: add if not token here, once we are sure all sessions have a token.
if token != found_token: if token != found_token:
@ -63,8 +63,9 @@ def csrf_protect():
def generate_csrf_token(): def generate_csrf_token():
if '_csrf_token' not in session: if '_csrf_token' not in session:
session['_csrf_token'] = base64.b64encode(os.urandom(48)) session['_csrf_token'] = base64.b64encode(os.urandom(48))
return session['_csrf_token']
return session['_csrf_token']
app.jinja_env.globals['csrf_token'] = generate_csrf_token app.jinja_env.globals['csrf_token'] = generate_csrf_token

2
endpoints/web.py
View file

@ -20,7 +20,7 @@ logger = logging.getLogger(__name__)
def render_page_template(name): def render_page_template(name):
resp = make_response(render_template(name, route_data = get_route_data())) resp = make_response(render_template(name, route_data=get_route_data()))
resp.headers['X-FRAME-OPTIONS'] = 'DENY' resp.headers['X-FRAME-OPTIONS'] = 'DENY'
return resp return resp

2
static/js/app.js
View file

@ -724,7 +724,7 @@ quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'rest
otherwise({redirectTo: '/'}); otherwise({redirectTo: '/'});
}]). }]).
config(function(RestangularProvider) { config(function(RestangularProvider) {
RestangularProvider.setBaseUrl('/api/'); RestangularProvider.setBaseUrl('/api/');
}); });