From 2a7b1612f8035cf6893b49002802856f9358cc39 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 29 May 2020 18:00:25 +0200 Subject: [PATCH] Introduce genServerCert_dependencies again This method allows to fail fast --- katello_certs_tools/katello_ssl_tool.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/katello_certs_tools/katello_ssl_tool.py b/katello_certs_tools/katello_ssl_tool.py index 22213fe..3e7aeed 100644 --- a/katello_certs_tools/katello_ssl_tool.py +++ b/katello_certs_tools/katello_ssl_tool.py @@ -447,17 +447,14 @@ def genServerCertReq(d, verbosity=0): def genServerCert(password, d, verbosity=0): """ server cert generation and signing """ - passwordCheck(password) + genServerCert_dependencies(password, d) serverKeyPairDir = os.path.join(d['--dir'], d['--set-hostname']) gendir(serverKeyPairDir) ca_key = os.path.join(d['--dir'], os.path.basename(d['--ca-key'])) - dependencyCheck(ca_key) - ca_cert = os.path.join(d['--dir'], os.path.basename(d['--ca-cert'])) - dependencyCheck(ca_cert) server_cert_req = os.path.join(serverKeyPairDir, os.path.basename(d['--server-cert-req'])) @@ -802,7 +799,7 @@ def genServerRpm(d, verbosity=0): return "%s.noarch.rpm" % serverRpmName -def genServer_dependencies(password, d): +def genServerCert_dependencies(password, d): """ deps for the general --gen-server command. I.e., generation of server.{key,csr,crt}. """ @@ -850,10 +847,11 @@ def _main(): elif getOption(options, 'rpm_only'): genServerRpm(DEFS, options.verbose) else: - genServer_dependencies(getCAPassword(options, confirmYN=0), DEFS) + ca_password = getCAPassword(options, confirmYN=0) + genServerCert_dependencies(ca_password, DEFS) genServerKey(DEFS, options.verbose) genServerCertReq(DEFS, options.verbose) - genServerCert(getCAPassword(options, confirmYN=0), DEFS, options.verbose) + genServerCert(ca_password, DEFS, options.verbose) if not getOption(options, 'no_rpm'): genServerRpm(DEFS, options.verbose)