From aeb5d81aa6ac077ce33febb140027240421c63a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri.vosandi@gmail.com>
Date: Wed, 3 May 2017 21:12:51 +0000
Subject: [PATCH] tests: Generate DH params file in single location

---
 certidude/cli.py | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/certidude/cli.py b/certidude/cli.py
index f133159..01324ea 100755
--- a/certidude/cli.py
+++ b/certidude/cli.py
@@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
 
 NOW = datetime.utcnow().replace(tzinfo=None)
 
-def setup_client(prefix="client_"):
+def setup_client(prefix="client_", dh=False):
     # Create section in /etc/certidude/client.conf
     def wrapper(func):
         def wrapped(**arguments):
@@ -39,6 +39,14 @@ def setup_client(prefix="client_"):
             common_name = arguments.get("common_name")
             authority = arguments.get("authority")
             b = os.path.join(const.STORAGE_PATH, authority)
+            if dh:
+                path = os.path.join(const.STORAGE_PATH, "dh.pem")
+                if not os.path.exists(path):
+                    rpm("openssl")
+                    apt("openssl")
+                    cmd = "openssl", "dhparam", "-out", path, ("1024" if os.getenv("TRAVIS") else "2048")
+                    subprocess.check_call(cmd)
+                arguments["dhparam_path"] = path
 
             # Create corresponding section in Certidude client configuration file
             client_config = ConfigParser()
@@ -62,25 +70,12 @@ def setup_client(prefix="client_"):
 
             for j in ("key", "request", "certificate", "authority", "revocations"):
                 arguments["%s_path" % j] = client_config.get(authority, "%s path" % j)
+
             return func(**arguments)
         return wrapped
     return wrapper
 
 
-def generate_dhparam(path):
-    # Prevent logjam etc for OpenVPN and nginx server
-    def wrapper(func):
-        def wrapped(**arguments):
-            if not os.path.exists(path):
-                rpm("openssl")
-                apt("openssl")
-                cmd = "openssl", "dhparam", "-out", path, ("1024" if os.getenv("TRAVIS") else "2048")
-                subprocess.check_call(cmd)
-            arguments["dhparam_path"] = path
-            return func(**arguments)
-        return wrapped
-    return wrapper
-
 @click.command("request", help="Run processes for requesting certificates and configuring services")
 @click.option("-r", "--renew", default=False, is_flag=True, help="Renew now")
 @click.option("-f", "--fork", default=False, is_flag=True, help="Fork to background")
@@ -388,8 +383,7 @@ def certidude_request(fork, renew, no_wait):
     default="/etc/openvpn/site-to-client.conf",
     type=click.File(mode="w", atomic=True, lazy=True),
     help="OpenVPN configuration file")
-@generate_dhparam("/etc/openvpn/dh.pem")
-@setup_client(prefix="server_")
+@setup_client(prefix="server_", dh=True)
 def certidude_setup_openvpn_server(authority, common_name, config, subnet, route, local, proto, port, **paths):
     # Install dependencies
     apt("openvpn")
@@ -449,8 +443,7 @@ def certidude_setup_openvpn_server(authority, common_name, config, subnet, route
     type=click.File(mode="w", atomic=True, lazy=True),
     help="Site configuration file of nginx, /etc/nginx/sites-available/%s.conf by default" % const.HOSTNAME)
 @click.option("--verify-client", "-vc", default="optional", type=click.Choice(['optional', 'on', 'off']))
-@generate_dhparam("/etc/nginx/ssl/dh.pem")
-@setup_client(prefix="server_")
+@setup_client(prefix="server_", dh=True)
 def certidude_setup_nginx(authority, common_name, site_config, tls_config, verify_client, **paths):
     apt("nginx")
     rpm("nginx")