summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kanakarakis <ivan.kanak@gmail.com>2021-02-05 11:53:59 +0200
committerIvan Kanakarakis <ivan.kanak@gmail.com>2021-03-07 20:50:01 +0200
commitaeeccd3c70ade71c3a3aab736d21474bdec106c8 (patch)
treed4929d218d398d23b95893385585d11df9ae85ca
parenta0539a2444b93dc8a4989ea0769cd4242a53ec58 (diff)
downloadpysaml2-aeeccd3c70ade71c3a3aab736d21474bdec106c8.tar.gz
tests: Do not hardcode the namespace prefix for encrypted assertions
Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
-rw-r--r--tests/test_50_server.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/test_50_server.py b/tests/test_50_server.py
index dfc24eee..07ef4b91 100644
--- a/tests/test_50_server.py
+++ b/tests/test_50_server.py
@@ -6,6 +6,7 @@ import os
from contextlib import closing
from six.moves.urllib.parse import parse_qs
import uuid
+import re
from saml2.cert import OpenSSLWrapper
from saml2.sigver import make_temp, DecryptError, EncryptError, CertificateError
@@ -129,8 +130,10 @@ class TestServer1():
self.verify_assertion(assertion)
assert assertion[0].signature is None
- assert 'EncryptedAssertion><encas1:Assertion xmlns:encas0="http://www.w3.org/2001/XMLSchema-instance" ' \
- 'xmlns:encas1="urn:oasis:names:tc:SAML:2.0:assertion"' in decr_text
+ assert re.search(
+ r':EncryptedAssertion><encas[0-9]:Assertion ([^ >]* )*xmlns:encas[0-9]="urn:oasis:names:tc:SAML:2.0:assertion"',
+ decr_text,
+ )
def verify_advice_assertion(self, resp, decr_text):
assert resp.assertion[0].signature is None
@@ -1188,9 +1191,10 @@ class TestServer1NonAsciiAva():
def verify_encrypted_assertion(self, assertion, decr_text):
self.verify_assertion(assertion)
assert assertion[0].signature is None
-
- assert 'EncryptedAssertion><encas1:Assertion xmlns:encas0="http://www.w3.org/2001/XMLSchema-instance" ' \
- 'xmlns:encas1="urn:oasis:names:tc:SAML:2.0:assertion"' in decr_text
+ assert re.search(
+ r':EncryptedAssertion><encas[0-9]:Assertion ([^ >]* )*xmlns:encas[0-9]="urn:oasis:names:tc:SAML:2.0:assertion"',
+ decr_text,
+ )
def verify_advice_assertion(self, resp, decr_text):
assert resp.assertion[0].signature is None