anchor-pki 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 668bda70c37b6cfed433ff05de800a8e2a4f1576a6a16b73d0c653794890938a
-  data.tar.gz: 9c96396faf03bed36249890bd19682988bdbb52d4e5eca4fe7994bbfaddf66f8
+  metadata.gz: 199d953aecf7e0a21ec2d40b4b910932dce98194b02dad0ccb5a19a8edca7dfc
+  data.tar.gz: 75eebd2d66d21913ec9299be8f6a11ba04a53bdb6f63554258644b18d5495f56
 SHA512:
-  metadata.gz: 6a8a30a3eb39f5544250bf12338c31d7f3392fda4440a74dc916c28ffac5d2817b8687a911695db06d46f236f7e27857a482abb172854f7d9fd88e5332115749
-  data.tar.gz: 004d41141dcca7ef89f994f726e0502c43957ce0c144d09fc719f71292f9abdc1a7cb45c6a57f75a84debd9ca2ac3f2085778879e104f4349bae51100c46909e
+  metadata.gz: 7f0b100133cdbd56308538a5c3085062221d3e9d7caa154aebe7fa61661ac59713f8e14829ced0dba6731c6fbff20a47d5382e6062e164e7ac85cd05ea94c406
+  data.tar.gz: 6424e2cb19604b4a78a673109fc1ffc1bc4ee62de8a036fdacc36030b23d67f320f7142bc62f4fdae7b3b3864d2ab1cbdb950548460b7bf01178a2a828dea7b7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.8.0] - 2024-03-04
+
+- fix 0.7 regression such that configuration once again considers ENV values
+
 ## [0.7.0] - 2024-01-11
 
 - inherit from the puma-acme plugin in auto\_cert plugin

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    anchor-pki (0.6.3)
+    anchor-pki (0.8.0)
       puma-acme (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    acme-client (2.0.15)
+    acme-client (2.0.17)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
     addressable (2.8.4)
@@ -16,7 +16,7 @@ GEM
     base64 (0.2.0)
     crack (0.4.5)
       rexml
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
@@ -39,32 +39,34 @@ GEM
     public_suffix (5.0.1)
     puma (6.4.2)
       nio4r (~> 2.0)
-    puma-acme (0.1.0)
+    puma-acme (0.1.3)
       acme-client (~> 2.0.13)
       pstore (~> 0.1)
-      puma (~> 6.4)
-      sinatra (~> 3.1)
-    rack (2.2.8)
-    rack-protection (3.2.0)
+      puma (~> 6.0)
+      sinatra (~> 4.0)
+    rack (3.0.9.1)
+    rack-protection (4.0.0)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rainbow (3.1.1)
     rake (13.1.0)
     regexp_parser (2.8.0)
     rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.51.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -93,10 +95,11 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (3.2.0)
+    sinatra (4.0.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.2.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.0.0)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     tilt (2.3.0)
     unicode-display_width (2.4.2)

data/lib/anchor/auto_cert/configuration.rb

@@ -30,11 +30,14 @@ module Anchor
       alias_method :directory_url=, :directory=
 
       def initialize(opts = {})
-        self.directory_url     = opts.delete(:directory_url)
-        self.allow_identifiers = opts.delete(:allow_identifiers)
+        opts[:directory] ||= envs(:directory)
+        opts[:eab_kid] ||= envs(:eab_kid)
+        opts[:eab_hmac_key] ||= envs(:eab_hmac_key)
+        opts[:server_names] ||= envs(:server_names)&.split(',')
 
         if (eab = opts.delete(:external_account_binding))
-          self.external_account_binding = eab
+          opts[:eab_kid]      = eab[:kid]
+          opts[:eab_hmac_key] = eab[:hmac_key]
         end
 
         super(opts)
@@ -48,6 +51,12 @@ module Anchor
         self.eab_kid      = eab[:kid]
         self.eab_hmac_key = eab[:hmac_key]
       end
+
+      private
+
+      def envs(key)
+        Anchor::ENV_VARS[key].map { |k| ENV.fetch(k, nil) }.compact.first
+      end
     end
   end
 end

data/lib/anchor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anchor
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/anchor.rb

@@ -6,6 +6,13 @@ require 'openssl'
 # Anchor module is the top-level namespace for the Anchor PKI client.
 #
 module Anchor
+  ENV_VARS = {
+    directory: %w[ACME_DIRECTORY ACME_DIRECTORY_URL],
+    eab_kid: %w[ACME_KID ACME_EAB_KID],
+    eab_hmac_key: %w[ACME_HMAC_KEY ACME_EAB_HMAC_KEY],
+    server_names: %w[ACME_SERVER_NAME ACME_SERVER_NAMES SERVER_NAME SERVER_NAMES ACME_ALLOW_IDENTIFIERS]
+  }.freeze
+
   def self.add_cert(pem)
     (@certs ||= []) << OpenSSL::X509::Certificate.new(pem)
   end

data/lib/puma/plugin/auto_cert.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative '../../anchor'
 require_relative '../dsl'
 
 require 'puma/acme'
@@ -20,13 +21,6 @@ module Puma
         attr_accessor :start_hooks
       end
 
-      ENV_VARS = {
-        server_names: %w[ACME_SERVER_NAME ACME_SERVER_NAMES SERVER_NAME SERVER_NAMES ACME_ALLOW_IDENTIFIERS],
-        directory: %w[ACME_DIRECTORY ACME_DIRECTORY_URL],
-        eab_kid: %w[ACME_KID ACME_EAB_KID],
-        eab_hmac_key: %w[ACME_HMAC_KEY ACME_EAB_HMAC_KEY]
-      }.freeze
-
       def self.add_start_hook(&block)
         (self.start_hooks ||= []) << block
       end
@@ -47,7 +41,7 @@ module Puma
           return
         end
 
-        server_names = [*config.all(:server_names, env: ENV_VARS[:server_names])]
+        server_names = [*config.all(:server_names, env: Anchor::ENV_VARS[:server_names])]
                        .map { |val| val.split(/[ ,]/) }.flatten.uniq
 
         if server_names.empty?
@@ -71,10 +65,11 @@ module Puma
           end
         end
 
-        launcher.options[:acme_directory] ||= config.first(:directory, env: ENV_VARS[:directory])
+        launcher.options[:acme_directory] ||= config.first(:directory, env: Anchor::ENV_VARS[:directory])
 
-        launcher.options[:acme_eab_kid]      ||= config.first(:eab_kid, env: ENV_VARS[:eab_kid])
-        launcher.options[:acme_eab_hmac_key] ||= config.first(:eab_hmac_key, env: ENV_VARS[:eab_hmac_key])
+        launcher.options[:acme_eab_kid]      ||= config.first(:eab_kid, env: Anchor::ENV_VARS[:eab_kid])
+        launcher.options[:acme_eab_hmac_key] ||= config.first(:eab_hmac_key,
+                                                              env: Anchor::ENV_VARS[:eab_hmac_key])
 
         launcher.options[:acme_mode] ||= config.first(:mode) || :foreground
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anchor-pki
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Anchor Security, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma-acme
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Ruby client for Anchor PKI. See https://anchor.dev/ for details.