puma-acme 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/Gemfile.lock +7 -8
  4. data/lib/puma/acme/plugin.rb +1 -1
  5. data/lib/puma/acme/structs.rb +9 -1
  6. data/lib/puma/acme/version.rb +1 -1
  7. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 84f8bb1abae3b7f66a4f1498ee4f708cd4e12f1eb290e28be02293adf0a53cb9
4
- data.tar.gz: '090157d8a4e856ad8d48613b2545712f17cbe7e7162c4a6935856c0bac6ff711'
3
+ metadata.gz: 66741709adca41127a7eebb62a7012bda8866ed0ec8b4000c41d7c4428e401f7
4
+ data.tar.gz: 87f0fe1b1939d919e94a8d3b57a01724b3a5cca1134cd4a9c5070a4fee46024a
5
5
  SHA512:
6
- metadata.gz: 3ba1f6e584a4d1f3e518daafaefbbeba14788a8739552ee716d2ac47741b117f8ec55688089278ac53341625bb5770677d7a8a1bf0121f43288eef2a19f17d45
7
- data.tar.gz: 76b1ec1a0661a2b57e8bfb4c760cbffb1bcffbaf8d548bfad8a42d447bb3934ac7350108132887f488702c6c32831fe37924857af1723e009cb853918038d2f2
6
+ metadata.gz: 83353e186df39a2eb1bdbed8a7bfedb6f27c17fd4cd253fd054525798faacb8389cf13203c212b91fb9934762b59ded9b68ef6dfbbbef2d5f86f640abbd01fa2
7
+ data.tar.gz: b3d8782d477859287cd80f5a15ca3d509dba74f8b95ff7aaad96c8806b03fd84d13664fdc913a80560dec7769021c40fb504c95cef8747c9e7460c1d9cfc25b4
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  ## [Unreleased]
2
2
 
3
+ ## 0.1.4 - 4/11/24
4
+
5
+ - fix for expired order/cert renewal
6
+
3
7
  ## 0.1.3 - 3/1/24
4
8
 
5
9
  - update dependencies
data/Gemfile.lock CHANGED
@@ -1,11 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- puma-acme (0.1.3)
4
+ puma-acme (0.1.4)
5
5
  acme-client (~> 2.0.13)
6
6
  pstore (~> 0.1)
7
7
  puma (~> 6.0)
8
- sinatra (~> 4.0)
8
+ sinatra (>= 3.2)
9
9
 
10
10
  GEM
11
11
  remote: https://rubygems.org/
@@ -16,7 +16,7 @@ GEM
16
16
  addressable (2.8.6)
17
17
  public_suffix (>= 2.0.2, < 6.0)
18
18
  base64 (0.2.0)
19
- bigdecimal (3.1.6)
19
+ bigdecimal (3.1.7)
20
20
  crack (1.0.0)
21
21
  bigdecimal
22
22
  rexml
@@ -28,13 +28,13 @@ GEM
28
28
  faraday (~> 2.0)
29
29
  hashdiff (1.1.0)
30
30
  http.rb (0.12.0)
31
- minitest (5.20.0)
31
+ minitest (5.22.3)
32
32
  minitest-mock_expectations (1.2.0)
33
33
  mustermann (3.0.0)
34
34
  ruby2_keywords (~> 0.0.1)
35
35
  net-http (0.4.1)
36
36
  uri
37
- nio4r (2.7.0)
37
+ nio4r (2.7.1)
38
38
  pstore (0.1.3)
39
39
  public_suffix (5.0.4)
40
40
  puma (6.4.2)
@@ -45,7 +45,7 @@ GEM
45
45
  rack (>= 3.0.0, < 4)
46
46
  rack-session (2.0.0)
47
47
  rack (>= 3.0.0)
48
- rake (13.1.0)
48
+ rake (13.2.0)
49
49
  rexml (3.2.6)
50
50
  ruby2_keywords (0.0.5)
51
51
  sinatra (4.0.0)
@@ -63,7 +63,6 @@ GEM
63
63
  hashdiff (>= 0.4.0, < 2.0.0)
64
64
 
65
65
  PLATFORMS
66
- arm64-darwin-23
67
66
  x86_64-linux
68
67
 
69
68
  DEPENDENCIES
@@ -76,4 +75,4 @@ DEPENDENCIES
76
75
  webmock (~> 3.19)
77
76
 
78
77
  BUNDLED WITH
79
- 2.3.26
78
+ 2.4.22
data/lib/puma/acme/plugin.rb CHANGED
@@ -124,7 +124,7 @@ module Puma
124
124
  @manager.account!
125
125
  end
126
126
 
127
- if cert.order.nil?
127
+ if cert.order.nil? || cert.order.expired?
128
128
  @logger.debug 'Acme: creating order'
129
129
  @manager.order!(cert)
130
130
  else
data/lib/puma/acme/structs.rb CHANGED
@@ -67,8 +67,12 @@ module Puma
67
67
  identifiers&.map(&:value)
68
68
  end
69
69
 
70
+ def expired?(now: Time.now.utc)
71
+ x509.not_after > now
72
+ end
73
+
70
74
  def usable?(now: Time.now.utc)
71
- !cert_pem.nil? && !key_pem.nil? && x509.not_after > now
75
+ !cert_pem.nil? && !key_pem.nil? && !expired?(now: now)
72
76
  end
73
77
 
74
78
  def renewable?(renew_in, now: Time.now.utc)
@@ -129,6 +133,10 @@ module Puma
129
133
 
130
134
  new(acme_order.to_h.slice(*members).merge(identifiers: identifiers, authorizations: authorizations))
131
135
  end
136
+
137
+ def expired?(now: Time.now.utc)
138
+ not_after > now
139
+ end
132
140
  end
133
141
  end
134
142
  end
data/lib/puma/acme/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Puma
4
4
  module Acme
5
- VERSION = '0.1.3'
5
+ VERSION = '0.1.4'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puma-acme
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anchor Security, Inc
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-03-01 00:00:00.000000000 Z
11
+ date: 2024-04-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: acme-client
@@ -56,16 +56,16 @@ dependencies:
56
56
  name: sinatra
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: '4.0'
61
+ version: '3.2'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: '4.0'
68
+ version: '3.2'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: http.rb
71
71
  requirement: !ruby/object:Gem::Requirement