puppetserver-ca 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 096942e18856b71e6912b2e4c234e7731cad8d4aaf1a73bc6e3872cb942f069c
-  data.tar.gz: a4ad256a4e5bd6c6b44847efd839577df195043bdd3a6e84ab4ab4076e42575a
+  metadata.gz: c28c8d7be542d749738c32b848b4bb318498a949fb52e4bf6d44a5da878583a7
+  data.tar.gz: c6e09079aa3463da55cc0c185c7bddad22ff1967cd57c0d687dc000072748749
 SHA512:
-  metadata.gz: cbd2f38221367f6cf38f62acecab8ef6ad22ea140a58faab81c97afbdf3f6ab9245efe8ac98839e7a617586af49920f8272645f9b202feda1080b7d3aea1b9bf
-  data.tar.gz: 94dbceba6d9868c6d8c8ffecfdef1b9f4a85e63d7604cb2ba1d63ec8339a210b5afb9a9ed42aebd524f1d2233afdbf2f596f4d5ee9a416311c2841f558954d17
+  metadata.gz: 46f81f6b946a37380c520c9611aaf4ba89155fcdaa6eefa1500cece3a57c946498ce959862e99645cc9dfcbedd8667157abf0b03fcfb37068ce27c9819b3088a
+  data.tar.gz: 1e37edeee98389efa59e82f2d041337ca4ba72e9a82b2fdf053e40d0f02139454d0e8d547f070dfcde9a639aba19181cbd464f61e29351a4bee30cf2aff4f37a

data/.travis.yml

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

data/Gemfile

@@ -5,6 +5,11 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in puppetserver-ca.gemspec
 gemspec
 
-gem 'pry'
-gem 'pry-byebug'
 gem 'hocon', '~> 1.2', require: false
+gem 'rake', '~> 13.0', require: false
+gem 'rspec', '~> 3.4', require: false
+
+group(:development, optional: true) do
+  gem 'pry'
+  gem 'pry-byebug'
+end

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

@@ -118,20 +118,41 @@ Options:
         end
 
         def output_certs(certs)
-          padded = 0
+          cert_column_width = certs.map { |c| c['name'].size }.max
+
           certs.each do |cert|
-            cert_size = cert["name"].size
-            padded = cert_size if cert_size > padded
+            @logger.inform(format_cert(cert, cert_column_width))
           end
+        end
 
-          certs.each do |cert|
-            # In newer versions of the CA api we return subjcet_alt_names
-            # in addition to dns_alt_names, this field includes DNS alt
-            # names but also IP alt names.
-            alt_names = cert["subject_alt_names"] || cert["dns_alt_names"]
-            @logger.inform "    #{cert["name"]}".ljust(padded + 6) + " (SHA256) " + " #{cert["fingerprints"]["SHA256"]}" +
-                               (alt_names.empty? ? "" : "\talt names: #{alt_names}")
-            end
+        def format_cert(cert, cert_column_width)
+          [
+            format_cert_and_sha(cert, cert_column_width),
+            format_alt_names(cert),
+            format_authorization_extensions(cert)
+          ].compact.join("\t")
+        end
+
+        def format_cert_and_sha(cert, cert_column_width)
+          justified_certname = cert['name'].ljust(cert_column_width + 6)
+          sha = cert['fingerprints']['SHA256']
+          "    #{justified_certname} (SHA256)  #{sha}"
+        end
+
+        def format_alt_names(cert)
+          # In newer versions of the CA api we return subject_alt_names
+          # in addition to dns_alt_names, this field includes DNS alt
+          # names but also IP alt names.
+          alt_names = cert['subject_alt_names'] || cert['dns_alt_names']
+          "alt names: #{alt_names}" unless alt_names.empty?
+        end
+
+        def format_authorization_extensions(cert)
+          auth_exts = cert['authorization_extensions']
+          return nil if auth_exts.nil? || auth_exts.empty?
+
+          values = auth_exts.map { |ext, value| "#{ext}: #{value}" }.join(', ')
+          "authorization extensions: [#{values}]"
         end
 
         def separate_certs(all_certs)

data/lib/puppetserver/ca/version.rb

@@ -1,5 +1,5 @@
 module Puppetserver
   module Ca
-    VERSION = "1.6.0"
+    VERSION = "1.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetserver-ca
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter