opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2180 from blankenberg/tool-login-required

Browse Source 
[16.04] Fix for redirecting a non-user when a tool has require_login=True.
This commit is contained in:
Nicola Soranzo
2016-04-18 11:50:23 +01:00
parent 1c38b9723c 92aff618cb
commit e1d937e430
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/tool_runner.py
+9 -5
View File
@@ -39,16 +39,18 @@ class ToolRunner( BaseUIController ):
@web.expose
def index( self, trans, tool_id=None, from_noframe=None, **kwd ):
def __tool_404__():
log.error( 'index called with tool id \'%s\' but no such tool exists', tool_id )
trans.log_event( 'Tool id \'%s\' does not exist' % tool_id )
trans.response.status = 404
return trans.show_error_message('Tool \'%s\' does not exist.' % ( escape(tool_id) ))
# tool id not available, redirect to main page
if tool_id is None:
return trans.response.send_redirect( url_for( controller='root', action='welcome' ) )
tool = self.__get_tool( tool_id )
# tool id is not matching, display an error
if not tool or not tool.allow_user_access( trans.user ):
log.error( 'index called with tool id \'%s\' but no such tool exists', tool_id )
trans.log_event( 'Tool id \'%s\' does not exist' % tool_id )
trans.response.status = 404
return trans.show_error_message('Tool \'%s\' does not exist.' % ( escape(tool_id) ))
if not tool:
return __tool_404__()
if tool.require_login and not trans.user:
redirect = url_for( controller='tool_runner', action='index', tool_id=tool_id, **kwd )
return trans.response.send_redirect( url_for( controller='user',
@@ -57,6 +59,8 @@ class ToolRunner( BaseUIController ):
status='info',
message='You must be logged in to use this tool.',
redirect=redirect ) )
if not tool.allow_user_access( trans.user ):
return __tool_404__()
if tool.tool_type == 'default':
return trans.response.send_redirect( url_for( controller='root', tool_id=tool_id ) )