commit/galaxy-central: natefoo: Merged in dannon/galaxy-central-prmaker/stable (pull request #469)
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7748a83f3361/ Changeset: 7748a83f3361 Branch: stable User: natefoo Date: 2014-08-19 17:26:23 Summary: Merged in dannon/galaxy-central-prmaker/stable (pull request #469) [STABLE] For _ensure_valid_session with use_remote_user set, when galaxy_session.user.email != remote_user_email invalidate the session UNLESS allowing user impersonation and the remote user is an admin. Affected #: 1 file diff -r 7f754e6110313cb35cfe96c6653509a5b39214f5 -r 7748a83f33617f450b23557420c753754e54ee4d lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py +++ b/lib/galaxy/web/framework/__init__.py @@ -758,9 +758,9 @@ # No user, associate galaxy_session.user = self.get_or_create_remote_user( remote_user_email ) 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 self.app.config.admin_users_list): + elif ((galaxy_session.user.email != remote_user_email) and + ((not self.app.config.allow_user_impersonation) or + (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.
participants (1)
-
commits-noreply@bitbucket.org