From fd74bd563ed67730049d36aab8fce2c4a94e3ab8 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Wed, 3 Jun 2015 16:39:14 +0200 Subject: [PATCH] check_hobos: base_url may end with a / (#7453) --- wcs/ctl/check_hobos.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wcs/ctl/check_hobos.py b/wcs/ctl/check_hobos.py index a39eb28..0fac1c0 100644 --- a/wcs/ctl/check_hobos.py +++ b/wcs/ctl/check_hobos.py @@ -103,7 +103,10 @@ class CmdCheckHobos(Command): if not pub.cfg.get('misc'): pub.cfg['misc'] = {} pub.cfg['misc']['sitename'] = service.get('title').encode('utf-8') - pub.cfg['misc']['frontoffice-url'] = service.get('base_url').encode('utf-8') + frontoffice_url = service.get('base_url') + if frontoffice_url.endswith('/'): + frontoffice_url = frontoffice_url[:-1] + pub.cfg['misc']['frontoffice-url'] = frontoffice_url.encode('utf-8') pub.write_cfg() def update_profile(self, profile, pub): @@ -178,12 +181,12 @@ class CmdCheckHobos(Command): if not pub.cfg.get('sp'): pub.cfg['sp'] = {} spconfig = pub.cfg['sp'] - spconfig['saml2_base_url'] = str(service.get('base_url')) + '/saml' + spconfig['saml2_base_url'] = str(service.get('base_url')) + 'saml' spconfig['saml2_providerid'] = spconfig['saml2_base_url'] + '/metadata' MethodAdminDirectory().generate_rsa_keypair() for idp in idps: - metadata_url = '%s/idp/saml2/metadata' % idp['base_url'] + metadata_url = '%sidp/saml2/metadata' % idp['base_url'] try: rfd = urllib2.urlopen(metadata_url) except (urllib2.HTTPError, urllib2.URLError), e: @@ -214,7 +217,7 @@ class CmdCheckHobos(Command): def get_instance_path(self, service): parsed_url = urllib2.urlparse.urlsplit(service.get('base_url')) instance_path = parsed_url.netloc - if parsed_url.path: + if parsed_url.path and parsed_url.path != '/': instance_path = '%s+' % parsed_url.path.replace('/', '+') return instance_path -- 2.1.4