0001-check_hobos-base_url-may-end-with-a-7453.patch
wcs/ctl/check_hobos.py | ||
---|---|---|
103 | 103 |
if not pub.cfg.get('misc'): |
104 | 104 |
pub.cfg['misc'] = {} |
105 | 105 |
pub.cfg['misc']['sitename'] = service.get('title').encode('utf-8') |
106 |
pub.cfg['misc']['frontoffice-url'] = service.get('base_url').encode('utf-8') |
|
106 |
frontoffice_url = service.get('base_url') |
|
107 |
if frontoffice_url.endswith('/'): |
|
108 |
frontoffice_url = frontoffice_url[:-1] |
|
109 |
pub.cfg['misc']['frontoffice-url'] = frontoffice_url.encode('utf-8') |
|
107 | 110 |
pub.write_cfg() |
108 | 111 | |
109 | 112 |
def update_profile(self, profile, pub): |
... | ... | |
178 | 181 |
if not pub.cfg.get('sp'): |
179 | 182 |
pub.cfg['sp'] = {} |
180 | 183 |
spconfig = pub.cfg['sp'] |
181 |
spconfig['saml2_base_url'] = str(service.get('base_url')) + '/saml' |
|
184 |
if service.get('base_url').endswith('/'): |
|
185 |
spconfig['saml2_base_url'] = str(service.get('base_url')) + 'saml' |
|
186 |
else: |
|
187 |
spconfig['saml2_base_url'] = str(service.get('base_url')) + '/saml' |
|
182 | 188 |
spconfig['saml2_providerid'] = spconfig['saml2_base_url'] + '/metadata' |
183 | 189 |
MethodAdminDirectory().generate_rsa_keypair() |
184 | 190 | |
185 | 191 |
for idp in idps: |
186 |
metadata_url = '%s/idp/saml2/metadata' % idp['base_url'] |
|
192 |
if idp['base_url'].endswith('/'): |
|
193 |
metadata_url = '%sidp/saml2/metadata' % idp['base_url'] |
|
194 |
else: |
|
195 |
metadata_url = '%s/idp/saml2/metadata' % idp['base_url'] |
|
187 | 196 |
try: |
188 | 197 |
rfd = urllib2.urlopen(metadata_url) |
189 | 198 |
except (urllib2.HTTPError, urllib2.URLError), e: |
... | ... | |
214 | 223 |
def get_instance_path(self, service): |
215 | 224 |
parsed_url = urllib2.urlparse.urlsplit(service.get('base_url')) |
216 | 225 |
instance_path = parsed_url.netloc |
217 |
if parsed_url.path: |
|
226 |
if parsed_url.path and parsed_url.path != '/':
|
|
218 | 227 |
instance_path = '%s+' % parsed_url.path.replace('/', '+') |
219 | 228 |
return instance_path |
220 | 229 | |
221 |
- |