openstack/deb-python-pysaml2
Code Issues Proposed changes

Format of the map file changed a bit so some code pieces had to be updated

Browse Source
This commit is contained in:
Roland Hedberg
2010-03-11 10:14:00 +01:00
parent 74854558df
commit 83fcfe1bb0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/saml2/utils.py
View File

@@ -175,7 +175,8 @@ def make_instance(klass, spec):
def parse_attribute_map(filenames): def parse_attribute_map(filenames):
""" """
Expects a file with each line being composed of the oid for the attribute Expects a file with each line being composed of the oid for the attribute
exactly one space and then a user friendly name of the attribute exactly one space, a user friendly name of the attribute and then
the type specification of the name.
:param filename: List of filenames on mapfiles. :param filename: List of filenames on mapfiles.
:return: A 2-tuple, one dictionary with the oid as keys and the friendly :return: A 2-tuple, one dictionary with the oid as keys and the friendly
@@ -185,9 +186,9 @@ def parse_attribute_map(filenames):
backward = {} backward = {}
for filename in filenames: for filename in filenames:
for line in open(filename).readlines(): for line in open(filename).readlines():
(name, friendly_name) = line.strip().split(" ") (name, friendly_name, name_format) = line.strip().split()
forward[name] = friendly_name forward[(name, name_format)] = friendly_name
backward[friendly_name] = name backward[friendly_name] = (name, name_format)
return (forward, backward) return (forward, backward)
@@ -227,7 +228,7 @@ def identity_attribute(form, attribute, forward_map=None):
return attribute.friendly_name return attribute.friendly_name
elif forward_map: elif forward_map:
try: try:
return forward_map[attribute.name] return forward_map[(attribute.name, attribute.name_format)]
except KeyError: except KeyError:
return attribute.name return attribute.name
# default is name # default is name
@@ -430,15 +431,14 @@ def _attrval(val):
def ava_to_attributes(ava, bmap): def ava_to_attributes(ava, bmap):
attrs = [] attrs = []
for key, val in ava.items(): for friendly_name, val in ava.items():
dic = {} dic = {}
attrval = _attrval(val) attrval = _attrval(val)
if attrval: if attrval:
dic["attribute_value"] = attrval dic["attribute_value"] = attrval
dic["friendly_name"] = key dic["friendly_name"] = friendly_name
dic["name"] = bmap[key] (dic["name"], dic["name_format"]) = bmap[friendly_name]
dic["name_format"] = NAME_FORMAT_URI
attrs.append(attribute_factory(**dic)) attrs.append(attribute_factory(**dic))
return attrs return attrs