puma-acme 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2015bc7d0607d5b5c295e0dcd66db310fe8cbeedc8eaba728cbe8a22531580
-  data.tar.gz: 9b68efe0b7fcc76d5a990cbab2c01f40b842fde9ce99dc05c98fd9b02fb88a44
+  metadata.gz: 66741709adca41127a7eebb62a7012bda8866ed0ec8b4000c41d7c4428e401f7
+  data.tar.gz: 87f0fe1b1939d919e94a8d3b57a01724b3a5cca1134cd4a9c5070a4fee46024a
 SHA512:
-  metadata.gz: 0f21ec6c93e596e7383e3f089ed49e18266ae512c90b4915bc8036c5ab36c560ff56ce1090b56a87a57038f947a950468a056be5beb715176a553d386bf10054
-  data.tar.gz: 1cab79a891cf25c1cfad5bc332f0f613ea1154e7e025bac94b415156d26b733a7f76d4df343a7367f39f001405b9e25f0a06d8ebcd6fc338848b61bea768072f
+  metadata.gz: 83353e186df39a2eb1bdbed8a7bfedb6f27c17fd4cd253fd054525798faacb8389cf13203c212b91fb9934762b59ded9b68ef6dfbbbef2d5f86f640abbd01fa2
+  data.tar.gz: b3d8782d477859287cd80f5a15ca3d509dba74f8b95ff7aaad96c8806b03fd84d13664fdc913a80560dec7769021c40fb504c95cef8747c9e7460c1d9cfc25b4

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## 0.1.4 - 4/11/24
+
+- fix for expired order/cert renewal
+
+## 0.1.3 - 3/1/24
+
+- update dependencies
+- add github actions and dependabot config
+- add rubygems rake tasks
+
 ## 0.1.2 - 1/16/24
 
 - Add port number to https url log line

data/Gemfile.lock

@@ -1,22 +1,24 @@
 PATH
   remote: .
   specs:
-    puma-acme (0.1.2.pre)
+    puma-acme (0.1.4)
       acme-client (~> 2.0.13)
       pstore (~> 0.1)
-      puma (~> 5.6)
-      sinatra (~> 3.1)
+      puma (~> 6.0)
+      sinatra (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    acme-client (2.0.16)
+    acme-client (2.0.17)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     base64 (0.2.0)
-    crack (0.4.5)
+    bigdecimal (3.1.7)
+    crack (1.0.0)
+      bigdecimal
       rexml
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
@@ -26,39 +28,41 @@ GEM
       faraday (~> 2.0)
     hashdiff (1.1.0)
     http.rb (0.12.0)
-    minitest (5.20.0)
+    minitest (5.22.3)
     minitest-mock_expectations (1.2.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     net-http (0.4.1)
       uri
-    nio4r (2.7.0)
+    nio4r (2.7.1)
     pstore (0.1.3)
     public_suffix (5.0.4)
-    puma (5.6.8)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    rack (2.2.8)
-    rack-protection (3.2.0)
+    rack (3.0.9.1)
+    rack-protection (4.0.0)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rake (13.1.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rake (13.2.0)
     rexml (3.2.6)
     ruby2_keywords (0.0.5)
-    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)
     uri (0.13.0)
     vcr (6.2.0)
-    webmock (3.19.1)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
-  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -71,4 +75,4 @@ DEPENDENCIES
   webmock (~> 3.19)
 
 BUNDLED WITH
-   2.3.26
+   2.4.22

data/Rakefile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|

data/lib/puma/acme/plugin.rb

@@ -124,7 +124,7 @@ module Puma
           @manager.account!
         end
 
-        if cert.order.nil?
+        if cert.order.nil? || cert.order.expired?
           @logger.debug 'Acme: creating order'
           @manager.order!(cert)
         else

data/lib/puma/acme/structs.rb

@@ -67,8 +67,12 @@ module Puma
         identifiers&.map(&:value)
       end
 
+      def expired?(now: Time.now.utc)
+        x509.not_after > now
+      end
+
       def usable?(now: Time.now.utc)
-        !cert_pem.nil? && !key_pem.nil? && x509.not_after > now
+        !cert_pem.nil? && !key_pem.nil? && !expired?(now: now)
       end
 
       def renewable?(renew_in, now: Time.now.utc)
@@ -129,6 +133,10 @@ module Puma
 
         new(acme_order.to_h.slice(*members).merge(identifiers: identifiers, authorizations: authorizations))
       end
+
+      def expired?(now: Time.now.utc)
+        not_after > now
+      end
     end
   end
 end

data/lib/puma/acme/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Acme
-    VERSION = '0.1.2'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-acme
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Anchor Security, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: http.rb
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,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: Puma plugin for ACME.