openstack/deb-python-pysaml2
Code Issues Proposed changes

Updated test cases

Browse Source 
As explained in
https://github.com/rohe/pysaml2/pull/423#issuecomment-308053607 , ava
cannot contain an 'surName' key, it should be named 'sn'
This commit is contained in:
Ioannis Kakavas
2017-06-13 12:04:51 +03:00
parent c24b47ceba
commit 695e2f0a98
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/test_50_server.py
View File

@@ -96,7 +96,7 @@ class TestServer1():
self.client = client.Saml2Client(conf) self.client = client.Saml2Client(conf)
self.name_id = self.server.ident.transient_nameid( self.name_id = self.server.ident.transient_nameid(
"urn:mace:example.com:saml:roland:sp", "id12") "urn:mace:example.com:saml:roland:sp", "id12")
self.ava = {"givenName": ["Derek"], "surName": ["Jeter"], self.ava = {"givenName": ["Derek"], "sn": ["Jeter"],
"mail": ["derek@nyy.mlb.com"], "title": "The man"} "mail": ["derek@nyy.mlb.com"], "title": "The man"}
def teardown_class(self): def teardown_class(self):
@@ -110,7 +110,7 @@ class TestServer1():
assert ava ==\ assert ava ==\
{'mail': ['derek@nyy.mlb.com'], 'givenName': ['Derek'], {'mail': ['derek@nyy.mlb.com'], 'givenName': ['Derek'],
'surName': ['Jeter'], 'title': ['The man']} 'sn': ['Jeter'], 'title': ['The man']}
def verify_encrypted_assertion(self, assertion, decr_text): def verify_encrypted_assertion(self, assertion, decr_text):
@@ -145,7 +145,7 @@ class TestServer1():
format=saml.NAMEID_FORMAT_TRANSIENT)), format=saml.NAMEID_FORMAT_TRANSIENT)),
attribute_statement=do_attribute_statement( attribute_statement=do_attribute_statement(
{ {
("", "", "surName"): ("Jeter", ""), ("", "", "sn"): ("Jeter", ""),
("", "", "givenName"): ("Derek", ""), ("", "", "givenName"): ("Derek", ""),
} }
), ),
@@ -164,12 +164,12 @@ class TestServer1():
attr1 = attribute_statement.attribute[1] attr1 = attribute_statement.attribute[1]
if attr0.attribute_value[0].text == "Derek": if attr0.attribute_value[0].text == "Derek":
assert attr0.friendly_name == "givenName" assert attr0.friendly_name == "givenName"
assert attr1.friendly_name == "surName" assert attr1.friendly_name == "sn"
assert attr1.attribute_value[0].text == "Jeter" assert attr1.attribute_value[0].text == "Jeter"
else: else:
assert attr1.friendly_name == "givenName" assert attr1.friendly_name == "givenName"
assert attr1.attribute_value[0].text == "Derek" assert attr1.attribute_value[0].text == "Derek"
assert attr0.friendly_name == "surName" assert attr0.friendly_name == "sn"
assert attr0.attribute_value[0].text == "Jeter" assert attr0.attribute_value[0].text == "Jeter"
# #
subject = assertion.subject subject = assertion.subject
@@ -187,7 +187,7 @@ class TestServer1():
name_id=saml.NAMEID_FORMAT_TRANSIENT), name_id=saml.NAMEID_FORMAT_TRANSIENT),
attribute_statement=do_attribute_statement( attribute_statement=do_attribute_statement(
{ {
("", "", "surName"): ("Jeter", ""), ("", "", "sn"): ("Jeter", ""),
("", "", "givenName"): ("Derek", ""), ("", "", "givenName"): ("Derek", ""),
} }
), ),
@@ -277,7 +277,7 @@ class TestServer1():
resp = self.server.create_authn_response( resp = self.server.create_authn_response(
{ {
"eduPersonEntitlement": "Short stop", "eduPersonEntitlement": "Short stop",
"surName": "Jeter", "sn": "Jeter",
"givenName": "Derek", "givenName": "Derek",
"mail": "derek.jeter@nyy.mlb.com", "mail": "derek.jeter@nyy.mlb.com",
"title": "The man" "title": "The man"
@@ -394,7 +394,7 @@ class TestServer1():
conf.load_file("server_conf") conf.load_file("server_conf")
self.client = client.Saml2Client(conf) self.client = client.Saml2Client(conf)
ava = {"givenName": ["Derek"], "surName": ["Jeter"], ava = {"givenName": ["Derek"], "sn": ["Jeter"],
"mail": ["derek@nyy.mlb.com"], "title": "The man"} "mail": ["derek@nyy.mlb.com"], "title": "The man"}
npolicy = samlp.NameIDPolicy(format=saml.NAMEID_FORMAT_TRANSIENT, npolicy = samlp.NameIDPolicy(format=saml.NAMEID_FORMAT_TRANSIENT,
@@ -425,7 +425,7 @@ class TestServer1():
def test_signed_response(self): def test_signed_response(self):
name_id = self.server.ident.transient_nameid( name_id = self.server.ident.transient_nameid(
"urn:mace:example.com:saml:roland:sp", "id12") "urn:mace:example.com:saml:roland:sp", "id12")
ava = {"givenName": ["Derek"], "surName": ["Jeter"], ava = {"givenName": ["Derek"], "sn": ["Jeter"],
"mail": ["derek@nyy.mlb.com"], "title": "The man"} "mail": ["derek@nyy.mlb.com"], "title": "The man"}
signed_resp = self.server.create_authn_response( signed_resp = self.server.create_authn_response(
@@ -1139,7 +1139,7 @@ class TestServer1():
"not_on_or_after": soon, "not_on_or_after": soon,
"user": { "user": {
"givenName": "Leo", "givenName": "Leo",
"surName": "Laport", "sn": "Laport",
} }
} }
self.client.users.add_information_about_person(sinfo) self.client.users.add_information_about_person(sinfo)
@@ -1163,7 +1163,7 @@ class TestServer1():
"not_on_or_after": soon, "not_on_or_after": soon,
"user": { "user": {
"givenName": "Leo", "givenName": "Leo",
"surName": "Laport", "sn": "Laport",
} }
} }
@@ -1188,7 +1188,7 @@ class TestServer1():
#------------------------------------------------------------------------ #------------------------------------------------------------------------
IDENTITY = {"eduPersonAffiliation": ["staff", "member"], IDENTITY = {"eduPersonAffiliation": ["staff", "member"],
"surName": ["Jeter"], "givenName": ["Derek"], "sn": ["Jeter"], "givenName": ["Derek"],
"mail": ["foo@gmail.com"], "title": "The man"} "mail": ["foo@gmail.com"], "title": "The man"}
@@ -1234,7 +1234,7 @@ def _logout_request(conf_file):
"not_on_or_after": soon, "not_on_or_after": soon,
"user": { "user": {
"givenName": "Leo", "givenName": "Leo",
"surName": "Laport", "sn": "Laport",
} }
} }
sp.users.add_information_about_person(sinfo) sp.users.add_information_about_person(sinfo)

22
tests/test_51_client.py
View File

@@ -366,7 +366,7 @@ class TestClient:
def test_response_1(self): def test_response_1(self):
IDP = "urn:mace:example.com:saml:roland:idp" IDP = "urn:mace:example.com:saml:roland:idp"
ava = {"givenName": ["Derek"], "surName": ["Jeter"], ava = {"givenName": ["Derek"], "sn": ["Jeter"],
"mail": ["derek@nyy.mlb.com"], "title": ["The man"]} "mail": ["derek@nyy.mlb.com"], "title": ["The man"]}
nameid_policy = samlp.NameIDPolicy(allow_create="false", nameid_policy = samlp.NameIDPolicy(allow_create="false",
@@ -414,7 +414,7 @@ class TestClient:
# --- authenticate another person # --- authenticate another person
ava = {"givenName": ["Alfonson"], "surName": ["Soriano"], ava = {"givenName": ["Alfonson"], "sn": ["Soriano"],
"mail": ["alfonson@chc.mlb.com"], "title": ["outfielder"]} "mail": ["alfonson@chc.mlb.com"], "title": ["outfielder"]}
resp_str = "%s" % self.server.create_authn_response( resp_str = "%s" % self.server.create_authn_response(
@@ -732,7 +732,7 @@ class TestClient:
def setup_verify_authn_response(self): def setup_verify_authn_response(self):
idp = "urn:mace:example.com:saml:roland:idp" idp = "urn:mace:example.com:saml:roland:idp"
ava = {"givenName": ["Derek"], "surName": ["Jeter"], ava = {"givenName": ["Derek"], "sn": ["Jeter"],
"mail": ["derek@nyy.mlb.com"], "title": ["The man"]} "mail": ["derek@nyy.mlb.com"], "title": ["The man"]}
ava_verify = {'mail': ['derek@nyy.mlb.com'], 'givenName': ['Derek'], ava_verify = {'mail': ['derek@nyy.mlb.com'], 'givenName': ['Derek'],
'sn': ['Jeter'], 'title': ["The man"]} 'sn': ['Jeter'], 'title': ["The man"]}
@@ -781,7 +781,7 @@ class TestClient:
format=saml.NAMEID_FORMAT_TRANSIENT)), format=saml.NAMEID_FORMAT_TRANSIENT)),
attribute_statement=do_attribute_statement( attribute_statement=do_attribute_statement(
{ {
("", "", "surName"): ("Jeter", ""), ("", "", "sn"): ("Jeter", ""),
("", "", "givenName"): ("Derek", ""), ("", "", "givenName"): ("Derek", ""),
} }
), ),
@@ -845,7 +845,7 @@ class TestClient:
nameid_policy = samlp.NameIDPolicy(allow_create="false", nameid_policy = samlp.NameIDPolicy(allow_create="false",
format=saml.NAMEID_FORMAT_PERSISTENT) format=saml.NAMEID_FORMAT_PERSISTENT)
asser = Assertion({"givenName": "Derek", "surName": "Jeter"}) asser = Assertion({"givenName": "Derek", "sn": "Jeter"})
farg = add_path( farg = add_path(
{}, {},
['assertion', 'subject', 'subject_confirmation', 'method', ['assertion', 'subject', 'subject_confirmation', 'method',
@@ -916,7 +916,7 @@ class TestClient:
nameid_policy = samlp.NameIDPolicy(allow_create="false", nameid_policy = samlp.NameIDPolicy(allow_create="false",
format=saml.NAMEID_FORMAT_PERSISTENT) format=saml.NAMEID_FORMAT_PERSISTENT)
asser = Assertion({"givenName": "Derek", "surName": "Jeter"}) asser = Assertion({"givenName": "Derek", "sn": "Jeter"})
subject_confirmation_specs = { subject_confirmation_specs = {
'recipient': "http://lingon.catalogix.se:8087/", 'recipient': "http://lingon.catalogix.se:8087/",
@@ -1047,7 +1047,7 @@ class TestClient:
name_id=name_id, name_id=name_id,
farg=farg['assertion']) farg=farg['assertion'])
asser_2 = Assertion({"surName": "Jeter"}) asser_2 = Assertion({"sn": "Jeter"})
assertion_2 = asser_2.construct( assertion_2 = asser_2.construct(
self.client.config.entityid, self.client.config.entityid,
@@ -1333,7 +1333,7 @@ class TestClient:
"not_on_or_after": in_a_while(minutes=15), "not_on_or_after": in_a_while(minutes=15),
"ava": { "ava": {
"givenName": "Anders", "givenName": "Anders",
"surName": "Andersson", "sn": "Andersson",
"mail": "anders.andersson@example.com" "mail": "anders.andersson@example.com"
} }
} }
@@ -1370,7 +1370,7 @@ class TestClient:
"not_on_or_after": in_a_while(minutes=15), "not_on_or_after": in_a_while(minutes=15),
"ava": { "ava": {
"givenName": "Anders", "givenName": "Anders",
"surName": "Andersson", "sn": "Andersson",
"mail": "anders.andersson@example.com" "mail": "anders.andersson@example.com"
}, },
"session_index": SessionIndex("_foo") "session_index": SessionIndex("_foo")
@@ -1400,7 +1400,7 @@ class TestClient:
"not_on_or_after": a_while_ago(minutes=15), "not_on_or_after": a_while_ago(minutes=15),
"ava": { "ava": {
"givenName": "Anders", "givenName": "Anders",
"surName": "Andersson", "sn": "Andersson",
"mail": "anders.andersson@example.com" "mail": "anders.andersson@example.com"
}, },
"session_index": SessionIndex("_foo") "session_index": SessionIndex("_foo")
@@ -1493,7 +1493,7 @@ class TestClientWithDummy():
"not_on_or_after": in_a_while(minutes=15), "not_on_or_after": in_a_while(minutes=15),
"ava": { "ava": {
"givenName": "Anders", "givenName": "Anders",
"surName": "Andersson", "sn": "Andersson",
"mail": "anders.andersson@example.com" "mail": "anders.andersson@example.com"
} }
} }