openstack/deb-python-pysaml2
Code Issues Proposed changes

Merge branch 'master' of github.com:rohe/pysaml2

Browse Source
This commit is contained in:
Roland Hedberg
2014-11-13 09:42:25 +01:00
parent 3ec5e13e31 e079a536a0
commit 622eb6c541
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saml2/attribute_converter.py
View File

@@ -286,7 +286,7 @@ class AttributeConverter(object):
[(value.lower(), key) for key, value in self._to.items()])
if self._to is None and self.fro is not None:
self._to = dict(
[(value.lower, key) for key, value in self._fro.items()])
[(value.lower(), key) for key, value in self._fro.items()])
def from_dict(self, mapdict):
""" Import the attribute map from a dictionary

12
src/saml2/metadata.py
View File

@@ -312,7 +312,7 @@ def do_uiinfo(_uiinfo):
except KeyError:
pass
else:
raise SAMLError("Configuration error: ui_info logo")
raise SAMLError("Configuration error: ui_info keywords")
inst.append(keyw)
elif isinstance(val, dict):
keyw = mdui.Keywords()
@@ -323,7 +323,7 @@ def do_uiinfo(_uiinfo):
pass
inst.append(keyw)
else:
raise SAMLError("Configuration Error: ui_info logo")
raise SAMLError("Configuration Error: ui_info keywords")
except KeyError:
pass
@@ -416,7 +416,7 @@ def do_endpoints(conf, endpoints):
if isinstance(args, basestring): # Assume it's the location
args = {"location": args,
"binding": DEFAULT_BINDING[endpoint]}
elif isinstance(args, tuple):
elif isinstance(args, tuple) or isinstance(args, list):
if len(args) == 2: # (location, binding)
args = {"location": args[0], "binding": args[1]}
elif len(args) == 3: # (location, binding, index)
@@ -530,6 +530,12 @@ def do_spsso_descriptor(conf, cert=None):
for val in vals:
spsso.extensions.add_extension_element(val)
ui_info = conf.getattr("ui_info", "sp")
if ui_info:
if spsso.extensions is None:
spsso.extensions = md.Extensions()
spsso.extensions.add_extension_element(do_uiinfo(ui_info))
if cert:
encryption_type = conf.encryption_type
spsso.key_descriptor = do_key_descriptor(cert, encryption_type)