Skip to content

Commit 01616e7

Browse files
c00kiemon5terc00kiemon5ter
committed
Update tests with the new signature of make_temp
Signed-off-by: Ivan Kanakarakis <[email protected]>
1 parent e38869e commit 01616e7

File tree

2 files changed

+36
-52
lines changed

2 files changed

+36
-52
lines changed

‎tests/test_40_sigver.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -798,13 +798,13 @@ def test_xbox():
798798
encrypted_assertion = EncryptedAssertion()
799799
encrypted_assertion.add_extension_element(_ass0)
800800

801-
_, pre = make_temp(
801+
tmp = make_temp(
802802
str(pre_encryption_part()).encode('utf-8'), decode=False
803803
)
804804
enctext = sec.crypto.encrypt(
805805
str(encrypted_assertion),
806806
conf.cert_file,
807-
pre,
807+
tmp.name,
808808
"des-192",
809809
'/*[local-name()="EncryptedAssertion"]/*[local-name()="Assertion"]',
810810
)
@@ -860,13 +860,13 @@ def test_xbox_non_ascii_ava():
860860
encrypted_assertion = EncryptedAssertion()
861861
encrypted_assertion.add_extension_element(_ass0)
862862

863-
_, pre = make_temp(
863+
tmp = make_temp(
864864
str(pre_encryption_part()).encode('utf-8'), decode=False
865865
)
866866
enctext = sec.crypto.encrypt(
867867
str(encrypted_assertion),
868868
conf.cert_file,
869-
pre,
869+
tmp.name,
870870
"des-192",
871871
'/*[local-name()="EncryptedAssertion"]/*[local-name()="Assertion"]',
872872
)

‎tests/test_50_server.py

Lines changed: 32 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -563,9 +563,8 @@ def test_encrypted_signed_response_1(self):
563563

564564
assert valid
565565

566-
_, key_file = make_temp(cert_key_str, decode=False)
567-
568-
decr_text = self.server.sec.decrypt(signed_resp, key_file)
566+
key_fd = make_temp(cert_key_str, decode=False)
567+
decr_text = self.server.sec.decrypt(signed_resp, key_fd.name)
569568

570569
resp = samlp.response_from_string(decr_text)
571570

@@ -658,9 +657,8 @@ def test_encrypted_signed_response_3(self):
658657
id_attr="")
659658
assert valid
660659

661-
_, key_file = make_temp(cert_key_str, decode=False)
662-
663-
decr_text = self.server.sec.decrypt(signed_resp, key_file)
660+
key_fd = make_temp(cert_key_str, decode=False)
661+
decr_text = self.server.sec.decrypt(signed_resp, key_fd.name)
664662

665663
resp = samlp.response_from_string(decr_text)
666664

@@ -720,9 +718,8 @@ def test_encrypted_signed_response_4(self):
720718

721719
assert valid
722720

723-
_, key_file = make_temp(cert_key_str, decode=False)
724-
725-
decr_text = self.server.sec.decrypt(decr_text, key_file)
721+
key_fd = make_temp(cert_key_str, decode=False)
722+
decr_text = self.server.sec.decrypt(decr_text, key_fd.name)
726723

727724
resp = samlp.response_from_string(decr_text)
728725

@@ -763,9 +760,8 @@ def test_encrypted_response_1(self):
763760

764761
assert sresponse.signature is None
765762

766-
_, key_file = make_temp(cert_key_str_advice, decode=False)
767-
768-
decr_text = self.server.sec.decrypt(_resp, key_file)
763+
key_fd = make_temp(cert_key_str_advice, decode=False)
764+
decr_text = self.server.sec.decrypt(_resp, key_fd.name)
769765

770766
resp = samlp.response_from_string(decr_text)
771767

@@ -795,9 +791,8 @@ def test_encrypted_response_2(self):
795791

796792
decr_text_1 = self.server.sec.decrypt(_resp, self.client.config.encryption_keypairs[1]["key_file"])
797793

798-
_, key_file = make_temp(cert_key_str_advice, decode=False)
799-
800-
decr_text_2 = self.server.sec.decrypt(decr_text_1, key_file)
794+
key_fd = make_temp(cert_key_str_advice, decode=False)
795+
decr_text_2 = self.server.sec.decrypt(decr_text_1, key_fd.name)
801796

802797
resp = samlp.response_from_string(decr_text_2)
803798

@@ -826,9 +821,8 @@ def test_encrypted_response_3(self):
826821

827822
assert sresponse.signature is None
828823

829-
_, key_file = make_temp(cert_key_str_assertion, decode=False)
830-
831-
decr_text = self.server.sec.decrypt(_resp, key_file)
824+
key_fd = make_temp(cert_key_str_assertion, decode=False)
825+
decr_text = self.server.sec.decrypt(_resp, key_fd.name)
832826

833827
resp = samlp.response_from_string(decr_text)
834828

@@ -918,13 +912,11 @@ def test_encrypted_response_6(self):
918912

919913
assert sresponse.signature is None
920914

921-
_, key_file = make_temp(cert_key_str_assertion, decode=False)
922-
923-
decr_text_1 = _server.sec.decrypt(_resp, key_file)
924-
925-
_, key_file = make_temp(cert_key_str_advice, decode=False)
915+
key_fd1 = make_temp(cert_key_str_assertion, decode=False)
916+
decr_text_1 = _server.sec.decrypt(_resp, key_fd1.name)
926917

927-
decr_text_2 = _server.sec.decrypt(decr_text_1, key_file)
918+
key_fd2 = make_temp(cert_key_str_advice, decode=False)
919+
decr_text_2 = _server.sec.decrypt(decr_text_1, key_fd2.name)
928920

929921
resp = samlp.response_from_string(decr_text_2)
930922

@@ -1637,9 +1629,8 @@ def test_encrypted_signed_response_1(self):
16371629

16381630
assert valid
16391631

1640-
_, key_file = make_temp(cert_key_str, decode=False)
1641-
1642-
decr_text = self.server.sec.decrypt(signed_resp, key_file)
1632+
key_fd = make_temp(cert_key_str, decode=False)
1633+
decr_text = self.server.sec.decrypt(signed_resp, key_fd.name)
16431634

16441635
resp = samlp.response_from_string(decr_text)
16451636

@@ -1732,9 +1723,8 @@ def test_encrypted_signed_response_3(self):
17321723
id_attr="")
17331724
assert valid
17341725

1735-
_, key_file = make_temp(cert_key_str, decode=False)
1736-
1737-
decr_text = self.server.sec.decrypt(signed_resp, key_file)
1726+
key_fd = make_temp(cert_key_str, decode=False)
1727+
decr_text = self.server.sec.decrypt(signed_resp, key_fd.name)
17381728

17391729
resp = samlp.response_from_string(decr_text)
17401730

@@ -1794,9 +1784,8 @@ def test_encrypted_signed_response_4(self):
17941784

17951785
assert valid
17961786

1797-
_, key_file = make_temp(cert_key_str, decode=False)
1798-
1799-
decr_text = self.server.sec.decrypt(decr_text, key_file)
1787+
key_fd = make_temp(cert_key_str, decode=False)
1788+
decr_text = self.server.sec.decrypt(decr_text, key_fd.name)
18001789

18011790
resp = samlp.response_from_string(decr_text)
18021791

@@ -1837,9 +1826,8 @@ def test_encrypted_response_1(self):
18371826

18381827
assert sresponse.signature is None
18391828

1840-
_, key_file = make_temp(cert_key_str_advice, decode=False)
1841-
1842-
decr_text = self.server.sec.decrypt(_resp, key_file)
1829+
key_fd = make_temp(cert_key_str_advice, decode=False)
1830+
decr_text = self.server.sec.decrypt(_resp, key_fd.name)
18431831

18441832
resp = samlp.response_from_string(decr_text)
18451833

@@ -1869,9 +1857,8 @@ def test_encrypted_response_2(self):
18691857

18701858
decr_text_1 = self.server.sec.decrypt(_resp, self.client.config.encryption_keypairs[1]["key_file"])
18711859

1872-
_, key_file = make_temp(cert_key_str_advice, decode=False)
1873-
1874-
decr_text_2 = self.server.sec.decrypt(decr_text_1, key_file)
1860+
key_fd = make_temp(cert_key_str_advice, decode=False)
1861+
decr_text_2 = self.server.sec.decrypt(decr_text_1, key_fd.name)
18751862

18761863
resp = samlp.response_from_string(decr_text_2)
18771864

@@ -1900,9 +1887,8 @@ def test_encrypted_response_3(self):
19001887

19011888
assert sresponse.signature is None
19021889

1903-
_, key_file = make_temp(cert_key_str_assertion, decode=False)
1904-
1905-
decr_text = self.server.sec.decrypt(_resp, key_file)
1890+
key_fd = make_temp(cert_key_str_assertion, decode=False)
1891+
decr_text = self.server.sec.decrypt(_resp, key_fd.name)
19061892

19071893
resp = samlp.response_from_string(decr_text)
19081894

@@ -1992,13 +1978,11 @@ def test_encrypted_response_6(self):
19921978

19931979
assert sresponse.signature is None
19941980

1995-
_, key_file = make_temp(cert_key_str_assertion, decode=False)
1996-
1997-
decr_text_1 = _server.sec.decrypt(_resp, key_file)
1998-
1999-
_, key_file = make_temp(cert_key_str_advice, decode=False)
1981+
key_fd1 = make_temp(cert_key_str_assertion, decode=False)
1982+
decr_text_1 = _server.sec.decrypt(_resp, key_fd1.name)
20001983

2001-
decr_text_2 = _server.sec.decrypt(decr_text_1, key_file)
1984+
key_fd2 = make_temp(cert_key_str_advice, decode=False)
1985+
decr_text_2 = _server.sec.decrypt(decr_text_1, key_fd2.name)
20021986

20031987
resp = samlp.response_from_string(decr_text_2)
20041988

0 commit comments

Comments
 (0)