puppetserver-ca 1.11.4 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f87fa83d3ff569fee855447005639494a385d4d01a20d2e32ed88e4a163f2719
-  data.tar.gz: 5b7a864f4a2740c9d86e4de14bf040863fdbe0d865f3b0840a0a043c646c1862
+  metadata.gz: 2a83e41c0525189b98d0fbdb8922c0c72d8d45a6cd74e9c4f85706d368dbab3c
+  data.tar.gz: 9c58fa566bb413d0dded376f6dc7846911826e7f5cbac75f1140ccc68afd7d8a
 SHA512:
-  metadata.gz: e2f557beb7b22e3c216f43f07f3b48eb4f186db777d59568dff0b20dd2e7fd67167fb1b5d37ec14744dbc28bd5f0083807760678dbcad27c96999b759c1dd507
-  data.tar.gz: 7d1f4778efd450240815353c8b144675d5ff54f4508233ffcc0a166381916ace5dda560ab6ef02f240a405b5a2d2d14af7c72be87cb4bbda01ede68fe69a0dcb
+  metadata.gz: f46104125080129c6b3fba14c2c2bc0f79a9372c01d2ca027de100c608bea2be2ab69da8bab9c70b6722e7e305854ff46aa77442c43568eabe4cde66be9ec048
+  data.tar.gz: 5be1cc72ee0444f022f4597bc9b2c4efb2f6c9ca0eb0eb99264da08f41689e61880b1f091b3183c32ef5ac1a61375500a2a9b6f3c9f6c851a458c89cda0a6d81

data/lib/puppetserver/ca/action/generate.rb

@@ -26,7 +26,7 @@ Usage:
   puppetserver ca generate [--help]
   puppetserver ca generate --certname NAME[,NAME] [--config PATH]
                            [--subject-alt-names NAME[,NAME]]
-                           [--ca-client]
+                           [--ca-client] [--force]
 
 Description:
   Generates a new certificate signed by the intermediate CA
@@ -75,6 +75,10 @@ BANNER
                     'Causes the cert to be generated offline.') do |ca_client|
               parsed['ca-client'] = true
             end
+            opts.on('--force', 'Suppress errors when signing cert offline.',
+                    "To be used with '--ca-client'") do |force|
+              parsed['force'] = true
+            end
             opts.on('--ttl TTL', 'The time-to-live for each cert generated and signed') do |ttl|
               parsed['ttl'] = ttl
             end
@@ -139,8 +143,21 @@ BANNER
 
           # Generate and save certs and associated keys
           if input['ca-client']
-            # Refused to generate certs offfline if the CA service is running
-            return 1 if HttpClient.check_server_online(puppet.settings, @logger)
+            # Refuse to generate certs offline if the CA service is running
+            begin
+              return 1 if HttpClient.check_server_online(puppet.settings, @logger)
+            rescue Puppetserver::Ca::ConnectionFailed => e
+              base_message = "Could not determine whether Puppet Server is online."
+              if input['force']
+                @logger.inform("#{base_message} Connection check failed with " \
+                  "error: #{e.wrapped}\nContinuing with certificate signing.")
+              else
+                @logger.inform("#{base_message} If you are certain that the " \
+                  "Puppetserver service is stopped, run this command again " \
+                  "with the '--force' flag.")
+                raise e
+              end
+            end
             all_passed = generate_authorized_certs(certnames, alt_names, puppet.settings, signer.digest)
           else
             all_passed = generate_certs(certnames, alt_names, puppet.settings, signer.digest, input['ttl'])

data/lib/puppetserver/ca/version.rb

@@ -1,5 +1,5 @@
 module Puppetserver
   module Ca
-    VERSION = "1.11.4"
+    VERSION = "1.11.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetserver-ca
 version: !ruby/object:Gem::Version
-  version: 1.11.4
+  version: 1.11.5
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter