puppetserver-ca 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652bd1357434ad6509c6c08678b57373a4bd6ef1
-  data.tar.gz: 0ad23edeca68b2813ff5d3b1683882f911e7a4c8
+  metadata.gz: e4ce165ce36009a209f855a3be43baf46d9f3149
+  data.tar.gz: 1dff6f4475def4e3dcbd069e48bfcd1d9f7401b0
 SHA512:
-  metadata.gz: 7445af71aaa5aeed30c9e69ac679cd88bffd60a126e9f0766196a69edb353b8473312dec8b34cb767a87f58837af307005fc11e13d368538404a8ab464415970
-  data.tar.gz: 3a3e1ca91518f68c6a6aedb682357c34d9ddf845f482586d9bc21f342c0a36f9f59f577401c73cfcf9ae12d1dd44a952b5c30c28c84f7fd1032f2ac4e0e8db6f
+  metadata.gz: c667523644d19b2d835507b473c8a8e33c5ac397faa43ad272283289c5fb228ebb35f32bd62fb31ce93842a6065b6aae7f579685e1addcfb07257771eb3d2bff
+  data.tar.gz: 8e37ef678e3fef24eb89b7e6ca51662323e3014f656582d54a05751f2de440e8bc8304b970bef3fac250538e567de5cee7abfbc2e7effaebfa1e0dcd86918165

data/lib/puppetserver/ca/clean_action.rb

@@ -93,9 +93,7 @@ BANNER
       end
 
       def clean_certs(certnames, settings)
-        client = HttpClient.new(settings[:localcacert],
-                                settings[:certificate_revocation],
-                                settings[:hostcrl])
+        client = HttpClient.new(settings)
 
         url = client.make_ca_url(settings[:ca_server],
                                  settings[:ca_port],

data/lib/puppetserver/ca/create_action.rb

@@ -141,9 +141,7 @@ BANNER
       end
 
       def http_client(settings)
-        @client ||= HttpClient.new(settings[:localcacert],
-                                         settings[:certificate_revocation],
-                                         settings[:hostcrl])
+        @client ||= HttpClient.new(settings)
       end
 
       # Make an HTTP request to submit certificate requests to CA

data/lib/puppetserver/ca/list_action.rb

@@ -101,9 +101,7 @@ Options:
       end
 
       def http_client(settings)
-        @client ||= HttpClient.new(settings[:localcacert],
-                                   settings[:certificate_revocation],
-                                   settings[:hostcrl])
+        @client ||= HttpClient.new(settings)
       end
 
       def get_certificate_statuses(settings)

data/lib/puppetserver/ca/puppet_config.rb

@@ -101,6 +101,9 @@ module Puppetserver
         server = overrides.fetch(:server, '$certname')
         settings[:server] = substitutions['$server'] = server.sub(unresolved_setting, substitutions)
 
+        privatekeydir = overrides.fetch(:privatekeydir, '$ssldir/private_keys')
+        settings[:privatekeydir] = substitutions['$privatekeydir'] = privatekeydir.sub(unresolved_setting, substitutions)
+
         settings[:masterport] = substitutions['$masterport'] = overrides.fetch(:masterport, '8140')
 
         settings[:ca_name] =  overrides.fetch(:ca_name, 'Puppet CA: $certname')
@@ -125,7 +128,7 @@ module Puppetserver
         settings[:localcacert] =    overrides.fetch(:localcacert, '$certdir/ca.pem')
         settings[:hostcert] =       overrides.fetch(:hostcert, '$certdir/$certname.pem')
         settings[:hostcrl] =        overrides.fetch(:hostcrl, '$ssldir/crl.pem')
-        settings[:privatekeydir] =  overrides.fetch(:privatekeydir, '$ssldir/private_keys')
+        settings[:hostprivkey] =    overrides.fetch(:hostprivkey, '$privatekeydir/$certname.pem')
         settings[:publickeydir] =   overrides.fetch(:publickeydir, '$ssldir/public_keys')
         settings[:certificate_revocation] = parse_crl_usage(overrides.fetch(:certificate_revocation, 'true'))
 

data/lib/puppetserver/ca/revoke_action.rb

@@ -93,9 +93,7 @@ BANNER
       end
 
       def revoke_certs(certnames, settings)
-        client = HttpClient.new(settings[:localcacert],
-                                settings[:certificate_revocation],
-                                settings[:hostcrl])
+        client = HttpClient.new(settings)
 
         url = client.make_ca_url(settings[:ca_server],
                                  settings[:ca_port],

data/lib/puppetserver/ca/sign_action.rb

@@ -77,9 +77,7 @@ Options:
       end
 
       def http_client(settings)
-        @client ||= HttpClient.new(settings[:localcacert],
-                                   settings[:certificate_revocation],
-                                   settings[:hostcrl])
+        @client ||= HttpClient.new(settings)
       end
 
       def get_certificate_statuses(settings)

data/lib/puppetserver/ca/version.rb

@@ -1,5 +1,5 @@
 module Puppetserver
   module Ca
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/puppetserver/utils/http_client.rb

@@ -14,8 +14,20 @@ module Puppetserver
 
       attr_reader :store
 
-      def initialize(localcacert, crl_usage, hostcrl)
-        @store = make_store(localcacert, crl_usage, hostcrl)
+      def initialize(settings)
+        @store = make_store(settings[:localcacert],
+                            settings[:certificate_revocation],
+                            settings[:hostcrl])
+        @cert = load_cert(settings[:hostcert])
+        @key = load_key(settings[:hostprivkey])
+      end
+
+      def load_cert(cert_path)
+        OpenSSL::X509::Certificate.new(File.read(cert_path))
+      end
+
+      def load_key(key_path)
+        OpenSSL::PKey.read(File.read(key_path))
       end
 
       # Returns a URI-like wrapper around CA specific urls
@@ -32,6 +44,7 @@ module Puppetserver
 
         Net::HTTP.start(url.host, url.port,
                         use_ssl: true, cert_store: @store,
+                        cert: @cert, key: @key,
                         &request)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetserver-ca
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter