openstack/deb-python-pysaml2
Code Issues Proposed changes

Allow name_format for requested attributes to be set in the configuration.

Browse Source
This commit is contained in:
Roland Hedberg
2015-09-08 07:34:45 +02:00
parent 2be0571a5f
commit 3ddbb1a128
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/saml2/config.py
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env python
from saml2.saml import NAME_FORMAT_URI
__author__ = 'rolandh'
@@ -93,6 +94,7 @@ SP_ARGS = [
"ecp",
"name_id_format",
"logout_requests_signed",
"requested_attribute_name_format"
]
AA_IDP_ARGS = [
@@ -236,6 +238,7 @@ class Config(object):
self.extensions = {}
self.attribute = []
self.attribute_profile = []
self.requested_attribute_name_format = NAME_FORMAT_URI
def setattr(self, context, attr, val):
if context == "":

27
src/saml2/metadata.py
View File

@@ -239,15 +239,19 @@ def do_key_descriptor(cert=None, enc_cert=None, use="both"):
return kd_list
def do_requested_attribute(attributes, acs, is_required="false"):
def do_requested_attribute(attributes, acs, is_required="false",
name_format=NAME_FORMAT_URI):
lista = []
for attr in attributes:
attr = from_local_name(acs, attr, NAME_FORMAT_URI)
attr = from_local_name(acs, attr, name_format)
args = {}
for key in attr.keyswv():
args[key] = getattr(attr, key)
if isinstance(attr, six.string_types):
args["name"] = attr
else:
for key in attr.keyswv():
args[key] = getattr(attr, key)
args["is_required"] = is_required
args["name_format"] = NAME_FORMAT_URI
args["name_format"] = name_format
lista.append(md.RequestedAttribute(**args))
return lista
@@ -465,14 +469,21 @@ def do_attribute_consuming_service(conf, spsso):
requested_attributes = []
acs = conf.attribute_converters
req = conf.getattr("required_attributes", "sp")
req_attr_name_format = conf.getattr("requested_attribute_name_format", "sp")
if req_attr_name_format is None:
req_attr_name_format = conf.requested_attribute_name_format
if req:
requested_attributes.extend(do_requested_attribute(req, acs,
is_required="true"))
requested_attributes.extend(
do_requested_attribute(req, acs, is_required="true",
name_format=req_attr_name_format))
opt = conf.getattr("optional_attributes", "sp")
if opt:
requested_attributes.extend(do_requested_attribute(opt, acs))
requested_attributes.extend(
do_requested_attribute(opt, acs, name_format=req_attr_name_format))
try:
if conf.description: