Load the encryption template using package resources

Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
IdentityPython · Jan 7, 2021 · 17f4daf · 17f4daf
1 parent bdc3707
commit 17f4daf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -53,6 +53,7 @@ install_requires =
     pytz
     requests >= 1.0.0
     six
+    importlib_resources
 
 
 [options.packages.find]

diff --git a/src/saml2/data/__init__.py b/src/saml2/data/__init__.py
diff --git a/src/saml2/data/templates/__init__.py b/src/saml2/data/templates/__init__.py
diff --git a/src/saml2/xml_template/template.xml → src/saml2/data/templates/template_enc.xml b/src/saml2/xml_template/template.xml → src/saml2/data/templates/template_enc.xml
diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
@@ -24,6 +24,7 @@
 import saml2.cryptography.asymmetric
 import saml2.cryptography.pki
 import saml2.xmldsig as ds
+import saml2.data.templates as _data_template
 from saml2 import samlp
 from saml2 import SamlBase
 from saml2 import SAMLError
@@ -1288,8 +1289,8 @@ def __init__(
         self.only_use_keys_in_metadata = only_use_keys_in_metadata
 
         if not template:
-            this_dir, this_filename = os.path.split(__file__)
-            self.template = os.path.join(this_dir, 'xml_template', 'template.xml')
+            with _resource_path(_data_template, "template_enc.xml") as fp:
+                self.template = str(fp)
         else:
             self.template = template
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,7 @@ install_requires = @@
         pytz
         requests >= 1.0.0
         six
+        importlib_resources
     [options.packages.find]
@@ Expand Down @@