Move csrgen templates into ipaclient package

csrgen broke packaging of ipaclient for PyPI. All csrgen related resources are now package data of ipaclient package. Package data is accessed with Jinja's PackageLoader() or through pkg_resources. https://pagure.io/freeipa/issue/6714 Signed-off-by: Christian Heimes <cheimes@redhat.com>
freeipa · Mar 2, 2017 · 779b561 · 779b561
1 parent 9e24918
commit 779b561
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 45 deletions.
diff --git a/configure.ac b/configure.ac
@@ -463,7 +463,6 @@ AC_CONFIG_FILES([
     install/share/Makefile
     install/share/advise/Makefile
     install/share/advise/legacy/Makefile
-    install/share/csrgen/Makefile
     install/share/profiles/Makefile
     install/share/schema.d/Makefile
     install/ui/Makefile

diff --git a/install/share/Makefile.am b/install/share/Makefile.am
@@ -2,7 +2,6 @@ NULL =
 
 SUBDIRS =  				\
 	advise				\
-	csrgen				\
 	profiles			\
 	schema.d			\
 	$(NULL)

diff --git a/install/share/csrgen/Makefile.am b/install/share/csrgen/Makefile.am
diff --git a/ipaclient/csrgen.py b/ipaclient/csrgen.py
@@ -8,14 +8,15 @@
 import pipes
 import traceback
 
+import pkg_resources
+
 import jinja2
 import jinja2.ext
 import jinja2.sandbox
 import six
 
 from ipalib import errors
 from ipalib.text import _
-from ipaplatform.paths import paths
 from ipapython.ipa_log_manager import log_mgr
 
 if six.PY3:
@@ -72,10 +73,14 @@ class Formatter(object):
     """
     base_template_name = None
 
-    def __init__(self, csr_data_dir=paths.CSR_DATA_DIR):
+    def __init__(self, csr_data_dir=None):
+        if csr_data_dir is not None:
+            loader = jinja2.FileSystemLoader(
+                os.path.join(csr_data_dir, 'templates'))
+        else:
+            loader = jinja2.PackageLoader('ipaclient', 'csrgen/templates')
         self.jinja2 = jinja2.sandbox.SandboxedEnvironment(
-            loader=jinja2.FileSystemLoader(
-                os.path.join(csr_data_dir, 'templates')),
+            loader=loader,
             extensions=[jinja2.ext.ExprStmtExtension, IPAExtension],
             keep_trailing_newline=True, undefined=IndexableUndefined)
 
@@ -277,9 +282,13 @@ def rules_for_profile(self, profile_id, helper):
 
 
 class FileRuleProvider(RuleProvider):
-    def __init__(self, csr_data_dir=paths.CSR_DATA_DIR):
+    def __init__(self, csr_data_dir=None):
         self.rules = {}
-        self.csr_data_dir = csr_data_dir
+        if csr_data_dir is None:
+            self.csr_data_dir = pkg_resources.resource_filename(
+                'ipaclient', 'csrgen')
+        else:
+            self.csr_data_dir = csr_data_dir
 
     def _rule(self, rule_name, helper):
         if (rule_name, helper) not in self.rules:

diff --git a/...are/csrgen/profiles/caIPAserviceCert.json → ...ent/csrgen/profiles/caIPAserviceCert.json b/...are/csrgen/profiles/caIPAserviceCert.json → ...ent/csrgen/profiles/caIPAserviceCert.json
diff --git a/install/share/csrgen/profiles/userCert.json → ipaclient/csrgen/profiles/userCert.json b/install/share/csrgen/profiles/userCert.json → ipaclient/csrgen/profiles/userCert.json
diff --git a/install/share/csrgen/rules/dataDNS.json → ipaclient/csrgen/rules/dataDNS.json b/install/share/csrgen/rules/dataDNS.json → ipaclient/csrgen/rules/dataDNS.json
diff --git a/install/share/csrgen/rules/dataEmail.json → ipaclient/csrgen/rules/dataEmail.json b/install/share/csrgen/rules/dataEmail.json → ipaclient/csrgen/rules/dataEmail.json
diff --git a/install/share/csrgen/rules/dataHostCN.json → ipaclient/csrgen/rules/dataHostCN.json b/install/share/csrgen/rules/dataHostCN.json → ipaclient/csrgen/rules/dataHostCN.json
diff --git a/...l/share/csrgen/rules/dataSubjectBase.json → ipaclient/csrgen/rules/dataSubjectBase.json b/...l/share/csrgen/rules/dataSubjectBase.json → ipaclient/csrgen/rules/dataSubjectBase.json
diff --git a/...ll/share/csrgen/rules/dataUsernameCN.json → ipaclient/csrgen/rules/dataUsernameCN.json b/...ll/share/csrgen/rules/dataUsernameCN.json → ipaclient/csrgen/rules/dataUsernameCN.json
diff --git a/install/share/csrgen/rules/syntaxSAN.json → ipaclient/csrgen/rules/syntaxSAN.json b/install/share/csrgen/rules/syntaxSAN.json → ipaclient/csrgen/rules/syntaxSAN.json
diff --git a/...all/share/csrgen/rules/syntaxSubject.json → ipaclient/csrgen/rules/syntaxSubject.json b/...all/share/csrgen/rules/syntaxSubject.json → ipaclient/csrgen/rules/syntaxSubject.json
diff --git a/...share/csrgen/templates/certutil_base.tmpl → ...lient/csrgen/templates/certutil_base.tmpl b/...share/csrgen/templates/certutil_base.tmpl → ...lient/csrgen/templates/certutil_base.tmpl
diff --git a/.../share/csrgen/templates/openssl_base.tmpl → ipaclient/csrgen/templates/openssl_base.tmpl b/.../share/csrgen/templates/openssl_base.tmpl → ipaclient/csrgen/templates/openssl_base.tmpl
diff --git a/...hare/csrgen/templates/openssl_macros.tmpl → ...ient/csrgen/templates/openssl_macros.tmpl b/...hare/csrgen/templates/openssl_macros.tmpl → ...ient/csrgen/templates/openssl_macros.tmpl
diff --git a/ipaclient/setup.py b/ipaclient/setup.py
@@ -43,6 +43,13 @@
             "ipaclient.remote_plugins.2_156",
             "ipaclient.remote_plugins.2_164",
         ],
+        package_data={
+            'ipaclient': [
+                'csrgen/profiles/*.json',
+                'csrgen/rules/*.json',
+                'csrgen/templates/*.tmpl',
+            ],
+        },
         install_requires=[
             "cryptography",
             "ipalib",
@@ -56,5 +63,6 @@
         extras_require={
             "install": ["ipaplatform"],
             "otptoken_yubikey": ["yubico", "usb"]
-        }
+        },
+        zip_safe=False,
     )
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
@@ -238,7 +238,6 @@ class BasePathNamespace(object):
     SCHEMA_COMPAT_ULDIF = "/usr/share/ipa/schema_compat.uldif"
     IPA_JS_PLUGINS_DIR = "/usr/share/ipa/ui/js/plugins"
     UPDATES_DIR = "/usr/share/ipa/updates/"
-    CSR_DATA_DIR = "/usr/share/ipa/csrgen"
     DICT_WORDS = "/usr/share/dict/words"
     CACHE_IPA_SESSIONS = "/var/cache/ipa/sessions"
     VAR_KERBEROS_KRB5KDC_DIR = "/var/kerberos/krb5kdc/"