1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/749062450f1b/ Changeset: 749062450f1b User: dannon Date: 2014-06-09 16:37:10 Summary: Add correctly prefiltered admin_users_list to app.config and use it for remote auth. Affected #: 2 files diff -r df20b99bc7db3d3daab5b843b73b6890c85fd390 -r 749062450f1b531489524c12333a6d3e449d50c2 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -168,6 +168,7 @@ h, m, s = [ int( v ) for v in self.job_walltime.split( ':' ) ] self.job_walltime_delta = timedelta( 0, s, 0, 0, m, h ) self.admin_users = kwargs.get( "admin_users", "" ) + self.admin_users_list = [u.strip() for u in self.admin_users.split(',') if u] self.reset_password_length = int( kwargs.get('reset_password_length', '15') ) self.mailing_join_addr = kwargs.get('mailing_join_addr',"galaxy-announce-join@bx.psu.edu") self.error_email_to = kwargs.get( 'error_email_to', None ) diff -r df20b99bc7db3d3daab5b843b73b6890c85fd390 -r 749062450f1b531489524c12333a6d3e449d50c2 lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py +++ b/lib/galaxy/web/framework/__init__.py @@ -753,7 +753,7 @@ galaxy_session_requires_flush = True elif (galaxy_session.user.email != remote_user_email and self.app.config.allow_user_impersonation and - remote_user_email not in [ x.strip() for x in self.app.config.get( "admin_users", "" ).split( "," ) ]): + remote_user_email not in self.app.config.admin_users_list): # Session exists but is not associated with the correct # remote user, and the currently set remote_user is not a # potentially impersonating admin. Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.