diff --git a/app/__init__.py b/app/__init__.py index 7cec40b67c59dbefbaec06d791cd50c8ea9e1df0..9514ef80e607539a31735975eabcf7c168ccd6f7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -12,6 +12,10 @@ from flask_bootstrap import Bootstrap import random import os import json +import sys + +sys.path.append(vars.rabbitmq_agents_loc) +import rc_util def create_app(config_name): app = Flask(__name__, static_folder='static') # initialization of the flask app @@ -36,7 +40,7 @@ def create_app(config_name): @app.route('/', methods=['GET', 'POST']) # initial route to display the reg page def index(): - invalid_eppa = ["staff"] + invalid_eppa = ["staff", "affiliate"] if 'uid' not in session: session['uid']=str(uuid.uuid4()) @@ -46,9 +50,8 @@ def create_app(config_name): session['return_url'] = request.args.get('redir', vars.default_referrer) - -# if session['user'].get('eppa') not in invalid_eppa: -# return render_template('errors/blocked.html', title='shibboleth error') + if(any(item in session['user'].get('eppa') for item in invalid_eppa)): + return render_template('errors/shibboleth.html', title='shibboleth error') if rc_util.check_state(session['user'].get('username')) == "blocked": return render_template('errors/blocked.html')