Author: adc
Date: Fri Jul 4 22:01:09 2014
New Revision: 1607950
URL: http://svn.apache.org/r1607950
Log:
Minor cleanup
Added:
labs/panopticon/pan-site/bin/panopticon.apache2.wsgi
- copied, changed from r1607888,
labs/panopticon/pan-site/bin/panopticon.wsgi
labs/panopticon/pan-site/bin/panopticon.uwsgi.wsgi
- copied, changed from r1607888,
labs/panopticon/pan-site/bin/panopticon.wsgi
Removed:
labs/panopticon/pan-site/bin/panopticon.wsgi
Modified:
labs/panopticon/pan-site/src/asf/panopticon/__init__.py
labs/panopticon/pan-site/tests/data/panopticon-flask.properties
labs/panopticon/pan-site/uwsgi.ini
Copied: labs/panopticon/pan-site/bin/panopticon.apache2.wsgi (from r1607888,
labs/panopticon/pan-site/bin/panopticon.wsgi)
URL:
http://svn.apache.org/viewvc/labs/panopticon/pan-site/bin/panopticon.apache2.wsgi?p2=labs/panopticon/pan-site/bin/panopticon.apache2.wsgi&p1=labs/panopticon/pan-site/bin/panopticon.wsgi&r1=1607888&r2=1607950&rev=1607950&view=diff
==============================================================================
--- labs/panopticon/pan-site/bin/panopticon.wsgi (original)
+++ labs/panopticon/pan-site/bin/panopticon.apache2.wsgi Fri Jul 4 22:01:09
2014
@@ -20,8 +20,8 @@
"""
WSGI script to access panopticon web site.
"""
-from asf.panopticon import app
def application(environ, start_response):
+ from asf.panopticon import app
return app.wsgi_app(environ, start_response)
Copied: labs/panopticon/pan-site/bin/panopticon.uwsgi.wsgi (from r1607888,
labs/panopticon/pan-site/bin/panopticon.wsgi)
URL:
http://svn.apache.org/viewvc/labs/panopticon/pan-site/bin/panopticon.uwsgi.wsgi?p2=labs/panopticon/pan-site/bin/panopticon.uwsgi.wsgi&p1=labs/panopticon/pan-site/bin/panopticon.wsgi&r1=1607888&r2=1607950&rev=1607950&view=diff
==============================================================================
(empty)
Modified: labs/panopticon/pan-site/src/asf/panopticon/__init__.py
URL:
http://svn.apache.org/viewvc/labs/panopticon/pan-site/src/asf/panopticon/__init__.py?rev=1607950&r1=1607949&r2=1607950&view=diff
==============================================================================
--- labs/panopticon/pan-site/src/asf/panopticon/__init__.py (original)
+++ labs/panopticon/pan-site/src/asf/panopticon/__init__.py Fri Jul 4 22:01:09
2014
@@ -18,7 +18,7 @@
#
from logging import getLogger
-from flask import Flask, render_template, request, redirect, flash,
current_app, g, abort, session, jsonify, make_response, Response
+import flask
from flask.ext.principal import identity_changed, Identity, Principal,
identity_loaded
from flask.ext import principal
@@ -26,18 +26,15 @@ from asf.data import ldap
from asf.person import Person, PersonError
-app = Flask(__name__)
+app = flask.Flask(__name__)
app.config.from_envvar('PANOPTICON_FLASK_CONFIG')
-# TODO set this via an external configuration
-app.secret_key =
'\xd0\xe8\x13\x08\xfd\xa3\x97*\x161FY\x9d\xdd\xbb\xff\xacWF\xd4}\t\x03\xf2'
-
log = getLogger(__name__)
@app.route('/')
def hello_world():
- return render_template('index.html')
+ return flask.render_template('index.html')
@app.route('/api/users/<username>')
@@ -45,9 +42,9 @@ def user_info(username):
try:
person = Person(username)
except PersonError:
- return make_response(Response('No Such User %s' % username,
status=404))
+ return flask.make_response(flask.Response('No Such User %s' %
username, status=404))
- return jsonify({
+ return flask.jsonify({
'username': person.username,
'fullname': person.fullname,
'email': person.email,
@@ -58,29 +55,29 @@ def user_info(username):
@app.before_request
def before_request():
- g.login_allowed = current_app.debug or request.scheme == 'https'
+ flask.g.login_allowed = flask.current_app.debug or flask.request.scheme ==
'https'
@app.route('/login', methods=['POST'])
def login():
- if not g.login_allowed:
- abort(403)
+ if not flask.g.login_allowed:
+ flask.abort(403)
- username = request.form.get('username')
- password = request.form.get('password')
+ username = flask.request.form.get('username')
+ password = flask.request.form.get('password')
if ldap.check_user_password(username, password):
identity_changed.send(app, identity=Identity(username))
- flash(u'Signed in as ' + username, 'success')
+ flask.flash(u'Signed in as ' + username, 'success')
else:
- flash(u'Invalid username or password', 'danger')
- return redirect(request.referrer)
+ flask.flash(u'Invalid username or password', 'danger')
+ return flask.redirect(flask.request.referrer)
@app.route('/logout')
def logout():
identity_changed.send(app, identity=None)
- flash(u'You have been signed out', 'success')
- return redirect(request.referrer)
+ flask.flash(u'You have been signed out', 'success')
+ return flask.redirect(flask.request.referrer)
is_authenticated = principal.Permission(principal.RoleNeed('authenticated'))
@@ -90,9 +87,9 @@ login_required = is_authenticated.requir
def session_identity_loader():
- if 'identity.id' in session and 'identity.auth_type' in session:
- identity = Identity(session['identity.id'],
- session['identity.auth_type'])
+ if 'identity.id' in flask.session and 'identity.auth_type' in
flask.session:
+ identity = Identity(flask.session['identity.id'],
+ flask.session['identity.auth_type'])
return identity
else:
return principal.AnonymousIdentity()
@@ -100,12 +97,12 @@ def session_identity_loader():
def session_identity_saver(identity):
if identity is None or not identity.is_authenticated:
- session.pop('identity.id', None)
- session.pop('identity.auth_type', None)
+ flask.session.pop('identity.id', None)
+ flask.session.pop('identity.auth_type', None)
else:
- session['identity.id'] = identity.id
- session['identity.auth_type'] = identity.auth_type
- session.modified = True
+ flask.session['identity.id'] = identity.id
+ flask.session['identity.auth_type'] = identity.auth_type
+ flask.session.modified = True
principals = Principal(app, use_sessions=False)
@@ -129,18 +126,18 @@ def on_identity_loaded(sender, identity)
@app.errorhandler(404)
def not_found_handler(error):
- return render_template('not_found.html'), 404
+ return flask.render_template('not_found.html'), 404
@app.errorhandler(500)
def error_handler(error):
- return render_template('error.html'), 500
+ return flask.render_template('error.html'), 500
@app.errorhandler(401)
@app.errorhandler(403)
def forbidden_handler(error):
- return render_template('forbidden.html'), 403
+ return flask.render_template('forbidden.html'), 403
if __name__ == '__main__':
Modified: labs/panopticon/pan-site/tests/data/panopticon-flask.properties
URL:
http://svn.apache.org/viewvc/labs/panopticon/pan-site/tests/data/panopticon-flask.properties?rev=1607950&r1=1607949&r2=1607950&view=diff
==============================================================================
--- labs/panopticon/pan-site/tests/data/panopticon-flask.properties (original)
+++ labs/panopticon/pan-site/tests/data/panopticon-flask.properties Fri Jul 4
22:01:09 2014
@@ -0,0 +1,3 @@
+DEBUG=True
+SECRET_KEY='\xd0\xe8\x13\x08\xfd\xa3\x97*\x161FY\x9d\xdd\xbb\xff\xacWF\xd4}\t\x03\xf2'
+SESSION_COOKIE_NAME='_ps'
\ No newline at end of file
Modified: labs/panopticon/pan-site/uwsgi.ini
URL:
http://svn.apache.org/viewvc/labs/panopticon/pan-site/uwsgi.ini?rev=1607950&r1=1607949&r2=1607950&view=diff
==============================================================================
--- labs/panopticon/pan-site/uwsgi.ini (original)
+++ labs/panopticon/pan-site/uwsgi.ini Fri Jul 4 22:01:09 2014
@@ -1,7 +1,7 @@
[uwsgi]
http = 127.0.0.1:8080
env = PANOPTICON_FLASK_CONFIG=../../../tests/data/panopticon-flask.properties
-wsgi-file = ./bin/panopticon.wsgi
+wsgi-file = ./bin/panopticon.uwsgi.wsgi
callable = app
pythonpath = src
processes = 4
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@labs.apache.org
For additional commands, e-mail: commits-h...@labs.apache.org
