openstack/deb-python-pysaml2
Code Issues Proposed changes

Editorial

Browse Source
This commit is contained in:
Roland Hedberg
2014-04-02 13:31:26 +02:00
parent 6a38f5ecee
commit f451569602
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/server_conf.py
View File

@@ -2,8 +2,8 @@ from pathutils import full_path
from pathutils import xmlsec_path from pathutils import xmlsec_path
CONFIG = { CONFIG = {
"entityid" : "urn:mace:example.com:saml:roland:sp", "entityid": "urn:mace:example.com:saml:roland:sp",
"name" : "urn:mace:example.com:saml:roland:sp", "name": "urn:mace:example.com:saml:roland:sp",
"description": "My own SP", "description": "My own SP",
"service": { "service": {
"sp": { "sp": {
@@ -25,14 +25,14 @@ CONFIG = {
"local": [full_path("idp.xml"), full_path("vo_metadata.xml")], "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
}, },
"virtual_organization": { "virtual_organization": {
"urn:mace:example.com:it:tek":{ "urn:mace:example.com:it:tek": {
"nameid_format": "urn:oid:1.3.6.1.4.1.1466.115.121.1.15-NameID", "nameid_format": "urn:oid:1.3.6.1.4.1.1466.115.121.1.15-NameID",
"common_identifier": "umuselin", "common_identifier": "umuselin",
} }
}, },
"subject_data": "subject_data.db", "subject_data": "subject_data.db",
"accepted_time_diff": 60, "accepted_time_diff": 60,
"attribute_map_dir" : full_path("attributemaps"), "attribute_map_dir": full_path("attributemaps"),
"valid_for": 6, "valid_for": 6,
"organization": { "organization": {
"name": ("AB Exempel", "se"), "name": ("AB Exempel", "se"),
@@ -40,12 +40,13 @@ CONFIG = {
"url": "http://www.example.org", "url": "http://www.example.org",
}, },
"contact_person": [{ "contact_person": [{
"given_name": "Roland", "given_name": "Roland",
"sur_name": "Hedberg", "sur_name": "Hedberg",
"telephone_number": "+46 70 100 0000", "telephone_number": "+46 70 100 0000",
"email_address": ["tech@eample.com", "tech@example.org"], "email_address": ["tech@eample.com",
"contact_type": "technical" "tech@example.org"],
}, "contact_type": "technical"
},
], ],
"logger": { "logger": {
"rotating": { "rotating": {

15
tests/test_20_assertion.py
View File

@@ -1,3 +1,4 @@
# coding=utf-8
from saml2.authn_context import pword from saml2.authn_context import pword
from saml2.mdie import to_dict from saml2.mdie import to_dict
from saml2 import md, assertion from saml2 import md, assertion
@@ -75,7 +76,6 @@ def test_filter_on_attributes_1():
assert ava.keys() == ["serialNumber"] assert ava.keys() == ["serialNumber"]
assert ava["serialNumber"] == ["12345"] assert ava["serialNumber"] == ["12345"]
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
def test_lifetime_1(): def test_lifetime_1():
@@ -255,6 +255,7 @@ def test_filter_attribute_value_assertions_2(AVA):
assert _eq(ava.keys(), ["givenName"]) assert _eq(ava.keys(), ["givenName"])
assert ava["givenName"] == ["Roland"] assert ava["givenName"] == ["Roland"]
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
@@ -290,7 +291,9 @@ def test_assertion_1(AVA):
def test_assertion_2(): def test_assertion_2():
AVA = {'mail': u'roland.hedberg@adm.umu.se', AVA = {'mail': u'roland.hedberg@adm.umu.se',
'eduPersonTargetedID': 'http://lingon.ladok.umu.se:8090/idp!http://lingon.ladok.umu.se:8088/sp!95e9ae91dbe62d35198fbbd5e1fb0976', 'eduPersonTargetedID': 'http://lingon.ladok.umu'
'.se:8090/idp!http://lingon.ladok.umu'
'.se:8088/sp!95e9ae91dbe62d35198fbbd5e1fb0976',
'displayName': u'Roland Hedberg', 'displayName': u'Roland Hedberg',
'uid': 'http://roland.hedberg.myopenid.com/'} 'uid': 'http://roland.hedberg.myopenid.com/'}
@@ -453,6 +456,7 @@ def test_filter_values_req_opt_2():
raises(MissingValue, "filter_on_attributes(ava, r, o)") raises(MissingValue, "filter_on_attributes(ava, r, o)")
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -485,6 +489,7 @@ def test_filter_values_req_opt_4():
assert _eq(ava.keys(), ['givenName', 'sn']) assert _eq(ava.keys(), ['givenName', 'sn'])
assert ava == {'givenName': ['Roland'], 'sn': ['Hedberg']} assert ava == {'givenName': ['Roland'], 'sn': ['Hedberg']}
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -706,7 +711,7 @@ ACD = pword.AuthenticationContextDeclaration(authn_method=authn_method)
def test_assertion_with_noop_attribute_conv(): def test_assertion_with_noop_attribute_conv():
ava = {"urn:oid:2.5.4.4": "Roland", "urn:oid:2.5.4.42": "Hedberg" } ava = {"urn:oid:2.5.4.4": "Roland", "urn:oid:2.5.4.42": "Hedberg"}
ast = Assertion(ava) ast = Assertion(ava)
policy = Policy({ policy = Policy({
"default": { "default": {
@@ -719,7 +724,7 @@ def test_assertion_with_noop_attribute_conv():
issuer = Issuer(text="entityid", format=NAMEID_FORMAT_ENTITY) issuer = Issuer(text="entityid", format=NAMEID_FORMAT_ENTITY)
msg = ast.construct("sp_entity_id", "in_response_to", "consumer_url", msg = ast.construct("sp_entity_id", "in_response_to", "consumer_url",
name_id, [AttributeConverterNOOP(NAME_FORMAT_URI)], name_id, [AttributeConverterNOOP(NAME_FORMAT_URI)],
policy, issuer=issuer, authn_decl=ACD , policy, issuer=issuer, authn_decl=ACD,
authn_auth="authn_authn") authn_auth="authn_authn")
print msg print msg
@@ -767,7 +772,7 @@ def test_assertion_with_zero_attributes():
issuer = Issuer(text="entityid", format=NAMEID_FORMAT_ENTITY) issuer = Issuer(text="entityid", format=NAMEID_FORMAT_ENTITY)
msg = ast.construct("sp_entity_id", "in_response_to", "consumer_url", msg = ast.construct("sp_entity_id", "in_response_to", "consumer_url",
name_id, [AttributeConverterNOOP(NAME_FORMAT_URI)], name_id, [AttributeConverterNOOP(NAME_FORMAT_URI)],
policy, issuer=issuer, authn_decl=ACD , policy, issuer=issuer, authn_decl=ACD,
authn_auth="authn_authn") authn_auth="authn_authn")
print msg print msg