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

Handle changing http protocols in the tool shed registry's password_manager_for_url() function.

Browse Source
This commit is contained in:
Greg Von Kuster
2014-04-28 15:58:48 -04:00
parent df9e5e018a
commit 9e994c5efc
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/tool_shed_registry.py
+9 -4
View File
@@ -2,6 +2,7 @@ import logging
import sys
import urllib2
from galaxy.util.odict import odict
from tool_shed.util import common_util
from tool_shed.util import xml_util
log = logging.getLogger( __name__ )
@@ -39,13 +40,17 @@ class Registry( object ):
def password_manager_for_url( self, url ):
"""
If the tool shed is using external auth, the client to the tool shed must authenticate to that as well. This provides access to the
urllib2.HTTPPasswordMgrWithdefaultRealm() object for the url passed in.
If the tool shed is using external auth, the client to the tool shed must authenticate to that
as well. This provides access to the urllib2.HTTPPasswordMgrWithdefaultRealm() object for the
url passed in.
Following more what galaxy.demo_sequencer.controllers.common does might be more appropriate at some stage...
Following more what galaxy.demo_sequencer.controllers.common does might be more appropriate at
some stage...
"""
url_sans_protocol = common_util.remove_protocol_from_tool_shed_url( url )
for shed_name, shed_url in self.tool_sheds.items():
if shed_url.find( url ) >= 0:
shed_url_sans_protocol = common_util.remove_protocol_from_tool_shed_url( shed_url )
if shed_url_sans_protocol.find( url_sans_protocol ) >= 0:
return self.tool_sheds_auth[ shed_name ]
log.debug( "Invalid url '%s' received by tool shed registry's password_manager_for_url method." % str( url ) )
return None