2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2ea487b70602/ Changeset: 2ea487b70602 User: dannon Date: 2015-01-26 13:54:29+00:00 Summary: Log when using virtualenv at Galaxy startup. Affected #: 1 file diff -r 36a5b25e0d33efdaaa0a6abb96468f648ee206f5 -r 2ea487b70602bd94f442243e27f00fca92693c33 run.sh --- a/run.sh +++ b/run.sh @@ -6,6 +6,7 @@ # should run this instance in. if [ -d .venv ]; then + printf "Activating virtualenv at %s/.venv\n" $(pwd) . .venv/bin/activate fi https://bitbucket.org/galaxy/galaxy-central/commits/39f3f0586c48/ Changeset: 39f3f0586c48 User: dannon Date: 2015-01-26 13:58:29+00:00 Summary: Allow admin users to change user information (like email addresses) when using remote_auth; otherwise should a user email address change you had to manually edit the database. Affected #: 1 file diff -r 2ea487b70602bd94f442243e27f00fca92693c33 -r 39f3f0586c48f81452e3a7a6af1f5e97c4ef8ed0 lib/galaxy/web/framework/middleware/remoteuser.py --- a/lib/galaxy/web/framework/middleware/remoteuser.py +++ b/lib/galaxy/web/framework/middleware/remoteuser.py @@ -64,7 +64,7 @@ # If the secret header is enabled, we expect upstream to send along some key # in HTTP_GX_SECRET, so we'll need to compare that here to the correct value - # + # # This is not an ideal location for this function. The reason being # that because this check is done BEFORE the REMOTE_USER check, it is # possible to attack the GX_SECRET key without having correct @@ -79,8 +79,8 @@ title = "Access to Galaxy is denied" message = """ Galaxy is configured to authenticate users via an external - method (such as HTTP authentication in Apache), but an - incorrect shared secret key was provided by the + method (such as HTTP authentication in Apache), but an + incorrect shared secret key was provided by the upstream (proxy) server.</p><p>Please contact your local Galaxy administrator. The variable <code>remote_user_secret</code> and @@ -88,7 +88,7 @@ access Galaxy. """ return self.error( start_response, title, message ) - + if not environ.get(self.remote_user_header, '(null)').startswith('(null)'): if not environ[ self.remote_user_header ].count( '@' ): if self.maildomain is not None: @@ -114,6 +114,8 @@ pass # admins can create users elif path_info.startswith( '/user/logout' ) and environ[ self.remote_user_header ] in self.admin_users: pass # Admin users may be impersonating, allow logout. + elif path_info.startswith( '/user/manage_user_info' ) and environ[ self.remote_user_header ] in self.admin_users: + pass # Admin users need to be able to change user information elif path_info.startswith( '/user/api_keys' ): pass # api keys can be managed when remote_user is in use elif path_info.startswith( '/user/edit_username' ): 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.