summaryrefslogtreecommitdiff
path: root/src/saml2/attribute_resolver.py
diff options
context:
space:
mode:
authorRoland Hedberg <roland.hedberg@adm.umu.se>2013-02-09 18:57:26 +0100
committerRoland Hedberg <roland.hedberg@adm.umu.se>2013-02-09 18:57:26 +0100
commitf295e06ab790c5454c164255328ebba4a0c4f2da (patch)
treef7b29dd6acb2515cd0afbec4a33a82bc812c2b37 /src/saml2/attribute_resolver.py
parent71246a38292f2f598163ce4b69a3c298f95d04c2 (diff)
downloadpysaml2-f295e06ab790c5454c164255328ebba4a0c4f2da.tar.gz
Rewrote to use NameID instances every where where I previously used just the text part of the instance.
Diffstat (limited to 'src/saml2/attribute_resolver.py')
-rw-r--r--src/saml2/attribute_resolver.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/saml2/attribute_resolver.py b/src/saml2/attribute_resolver.py
index 06dbf125..dab809ce 100644
--- a/src/saml2/attribute_resolver.py
+++ b/src/saml2/attribute_resolver.py
@@ -35,16 +35,13 @@ class AttributeResolver(object):
self.saml2client = saml2client
self.metadata = saml2client.config.metadata
- def extend(self, subject_id, issuer, vo_members, name_id_format=None,
- sp_name_qualifier=None, real_id=None):
+ def extend(self, name_id, issuer, vo_members):
"""
- :param subject_id: The identifier by which the subject is know
+ :param name_id: The identifier by which the subject is know
among all the participents of the VO
:param issuer: Who am I the poses the query
:param vo_members: The entity IDs of the IdP who I'm going to ask
for extra attributes
- :param name_id_format: Used to make the IdPs aware of what's going
- on here
:return: A dictionary with all the collected information about the
subject
"""
@@ -53,17 +50,13 @@ class AttributeResolver(object):
for ass in self.metadata.attribute_consuming_service(member):
for attr_serv in ass.attribute_service:
logger.info(
- "Send attribute request to %s" % attr_serv.location)
+ "Send attribute request to %s" % attr_serv.location)
if attr_serv.binding != BINDING_SOAP:
continue
# attribute query assumes SOAP binding
session_info = self.saml2client.attribute_query(
- subject_id,
- attr_serv.location,
- issuer_id=issuer,
- sp_name_qualifier=sp_name_qualifier,
- nameid_format=name_id_format,
- real_id=real_id)
+ name_id, attr_serv.location, issuer_id=issuer,
+)
if session_info:
result.append(session_info)
return result