diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2022-01-05 17:57:00 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2022-01-05 18:29:07 +0000 |
| commit | 03238e343a595e1cb4fd43a84062db72b094c832 (patch) | |
| tree | 7f99b16578f5b6b2321cefda23af442e899fcf88 | |
| parent | 36295cfb4b33bd026c57e49c99e342da1413ce5f (diff) | |
| download | keystone-03238e343a595e1cb4fd43a84062db72b094c832.tar.gz | |
Add support for pysaml2 >= 7.1.0
A constant was renamed in commit 1e59eaa0 [1].
[1] https://github.com/IdentityPython/pysaml2/commit/1e59eaa0
Change-Id: I0489fde7eced9af8a534736960b75a0d2c189933
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
| -rw-r--r-- | keystone/federation/idp.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/keystone/federation/idp.py b/keystone/federation/idp.py index fd464f5c2..2f1a4fe5a 100644 --- a/keystone/federation/idp.py +++ b/keystone/federation/idp.py @@ -366,7 +366,11 @@ class SAMLGenerator(object): """ canonicalization_method = xmldsig.CanonicalizationMethod() - canonicalization_method.algorithm = xmldsig.ALG_EXC_C14N + # TODO(stephenfin): Drop when we remove support for pysaml < 7.1.0 + if hasattr(xmldsig, 'TRANSFORM_C14N'): # >= 7.1.0 + canonicalization_method.algorithm = xmldsig.TRANSFORM_C14N + else: # < 7.1.0 + canonicalization_method.algorithm = xmldsig.ALG_EXC_C14N signature_method = xmldsig.SignatureMethod( algorithm=xmldsig.SIG_RSA_SHA1) @@ -374,7 +378,11 @@ class SAMLGenerator(object): envelope_transform = xmldsig.Transform( algorithm=xmldsig.TRANSFORM_ENVELOPED) - c14_transform = xmldsig.Transform(algorithm=xmldsig.ALG_EXC_C14N) + # TODO(stephenfin): Drop when we remove support for pysaml < 7.1.0 + if hasattr(xmldsig, 'TRANSFORM_C14N'): # >= 7.1.0 + c14_transform = xmldsig.Transform(algorithm=xmldsig.TRANSFORM_C14N) + else: # < 7.1.0 + c14_transform = xmldsig.Transform(algorithm=xmldsig.ALG_EXC_C14N) transforms.transform = [envelope_transform, c14_transform] digest_method = xmldsig.DigestMethod(algorithm=xmldsig.DIGEST_SHA1) |