puppetserver-ca 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 020665126fef9a8fe7bc63652247bf13cf909ab37e2a3336d43724bc63b26d32
-  data.tar.gz: c8d62416aaa1c4ded40daee19907798a13ed6fa3ea123436701adf88b9b497cd
+  metadata.gz: 78b8703a01de06ec5c4a6202f8341662452f4d33d37c1390b558556ce817253d
+  data.tar.gz: eea0c603eee53c14a82de6b80f263014ca76261eb39fa2b679031ad6ecc69b1f
 SHA512:
-  metadata.gz: 89f506f4124c95b8b7029043ce46f216b837d3863875077476bfb835cbaf83399734d02dc7bd64ec39234d4d68735e98997ea81a724146ccef7b540e02d59849
-  data.tar.gz: 33b9fa7893650441e456e39edda8d5d4532bcd52fe42f0832769eafad982655d2eb26357b51080a90d1da313b4a69d02f01119ae9dc1e4af645641664e9f8699
+  metadata.gz: 64ff93865e33b2dccd3f4308580278315d007b450611acdbb36631aabc9794d82b5f8973aa5872384f05146abe62dfa3290b5e3774f8816bafa4b70db7bf3fbc
+  data.tar.gz: 734dc57fa4e9f8ce390a966502ea8104cb7640aec4564759ca39c377fdaeb06ed8992fbab88dfa3ef5a2c24921e6400223e4bee2c902d0f4f92f676537f779c5

data/.travis.yml

@@ -8,6 +8,8 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.1
+  - 3.2
 before_install:
    gem install bundler -v 1.16.1 && (gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true)
 script:

data/lib/puppetserver/ca/utils/http_client.rb

@@ -10,17 +10,12 @@ module Puppetserver
       # Utilities for doing HTTPS against the CA that wraps Net::HTTP constructs
       class HttpClient
 
-        DEFAULT_HEADERS = {
-          'User-Agent'   => 'PuppetserverCaCli',
-          'Content-Type' => 'application/json',
-          'Accept'       => 'application/json'
-        }
-
         attr_reader :store
 
         # Not all connections require a client cert to be present.
         # For example, when querying the status endpoint.
         def initialize(logger, settings, with_client_cert: true)
+          @default_headers = make_headers(ENV['HOME'])
           @logger = logger
           @store = make_store(settings[:localcacert],
                               settings[:certificate_revocation],
@@ -52,7 +47,7 @@ module Puppetserver
         # The Connection object should have HTTP verbs defined on it that take
         # a body (and optional overrides). Returns whatever the block given returned.
         def with_connection(url, &block)
-          request = ->(conn) { block.call(Connection.new(conn, url, @logger)) }
+          request = ->(conn) { block.call(Connection.new(conn, url, @logger, @default_headers)) }
 
           begin
             Net::HTTP.start(url.host, url.port,
@@ -68,7 +63,22 @@ module Puppetserver
 
         private
 
-       def load_with_errors(path, setting, &block)
+        def make_headers(home)
+          headers = {
+            'User-Agent'   => 'PuppetserverCaCli',
+            'Content-Type' => 'application/json',
+            'Accept'       => 'application/json'
+          }
+
+          token_path = "#{home}/.puppetlabs/token"
+          if File.exist?(token_path)
+            headers['X-Authentication'] = File.read(token_path)
+          end
+
+          headers
+        end
+
+        def load_with_errors(path, setting, &block)
           begin
             content = File.read(path)
             block.call(content)
@@ -81,21 +91,23 @@ module Puppetserver
                     "Could not parse '#{setting}' at '#{path}'.\n" +
                     "  OpenSSL returned: #{e.message}")
           end
-       end
+        end
 
         # Helper class that wraps a Net::HTTP connection, a HttpClient::URL
         # and defines methods named after HTTP verbs that are called on the
         # saved connection, returning a Result.
         class Connection
-          def initialize(net_http_connection, url_struct, logger)
+
+          def initialize(net_http_connection, url_struct, logger, default_headers)
             @conn = net_http_connection
             @url = url_struct
             @logger = logger
+            @default_headers = default_headers
           end
 
-          def get(url_overide = nil, headers = {})
+          def get(url_overide = nil, header_overrides = {})
             url = url_overide || @url
-            headers = DEFAULT_HEADERS.merge(headers)
+            headers = @default_headers.merge(header_overrides)
 
             @logger.debug("Making a GET request at #{url.full_url}")
 
@@ -105,9 +117,9 @@ module Puppetserver
 
           end
 
-          def put(body, url_override = nil, headers = {})
+          def put(body, url_override = nil, header_overrides = {})
             url = url_override || @url
-            headers = DEFAULT_HEADERS.merge(headers)
+            headers = @default_headers.merge(header_overrides)
 
             @logger.debug("Making a PUT request at #{url.full_url}")
 
@@ -118,9 +130,9 @@ module Puppetserver
             Result.new(result.code, result.body)
           end
 
-          def delete(url_override = nil, headers = {})
+          def delete(url_override = nil, header_overrides = {})
             url = url_override || @url
-            headers = DEFAULT_HEADERS.merge(headers)
+            headers = @default_headers.merge(header_overrides)
 
             @logger.debug("Making a DELETE request at #{url.full_url}")
 

data/lib/puppetserver/ca/version.rb

@@ -1,5 +1,5 @@
 module Puppetserver
   module Ca
-    VERSION = "2.5.0"
+    VERSION = "2.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetserver-ca
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.12
 signing_key: 
 specification_version: 4
 summary: A simple CLI tool for interacting with Puppet Server's Certificate Authority