openstack/deb-python-pysaml2
Code Issues Proposed changes

Pulled out all name_id related stuff into an own class

Browse Source
This commit is contained in:
Roland Hedberg
2010-03-26 15:16:08 +01:00
parent 8e23bd2b0a
commit c4cbb60e41
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/saml2/assertion.py
View File

@@ -136,9 +136,6 @@ def filter_attribute_value_assertions(ava, attribute_restrictions=None):
del ava[attr] del ava[attr]
return ava return ava
def temporary_identifier():
return args2dict(sid(), format=saml.NAMEID_FORMAT_TRANSIENT)
class Policy(object): class Policy(object):
""" handles restrictions on assertions """ """ handles restrictions on assertions """
@@ -184,6 +181,17 @@ class Policy(object):
return self._restrictions return self._restrictions
def get_nameid_format(self, sp_entity_id):
try:
form = self._restrictions[sp_entity_id]["nameid_format"]
except KeyError:
try:
form = self._restrictions["default"]["nameid_format"]
except KeyError:
form = saml.NAMEID_FORMAT_TRANSIENT
return form
def get_name_form(self, sp_entity_id): def get_name_form(self, sp_entity_id):
form = "" form = ""
@@ -299,15 +307,8 @@ class Assertion(dict):
def construct(self, sp_entity_id, in_response_to, name_id, attrconvs, def construct(self, sp_entity_id, in_response_to, name_id, attrconvs,
policy): policy):
print ">",attrconvs
print ">",policy.__dict__
print ">",policy.get_name_form(sp_entity_id)
attr_statement = from_local(attrconvs, self, attr_statement = from_local(attrconvs, self,
policy.get_name_form(sp_entity_id)) policy.get_name_form(sp_entity_id))
print ">>",attr_statement
# temporary identifier or ??
if not name_id:
name_id = temporary_identifier()
# start using now and for a hour # start using now and for a hour
conds = policy.conditions(sp_entity_id) conds = policy.conditions(sp_entity_id)