bullion 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010c02c548debe154dae0438bf036238266630be93974cdb264983843286a56e
-  data.tar.gz: 02412dd0d7268bcef1e19b7c863a21f7252d5a7633fecd236bc768758506169a
+  metadata.gz: 164cf3dcab36d3365270c3e7bbfb47af7daf559d6b1d1d22764d5eb5e31d3e9d
+  data.tar.gz: dd530b27db7e32e710a6eb8c32728d153ab53da0443cfa3a786336ce8aef96ba
 SHA512:
-  metadata.gz: 65c9667eb7c624797e20c054694b7f2da90ad36ed541836e02500b0cd7bcca0359d432d3062b77dacb4c5455e11d741a91fa5d61a596b673f6bf1fe302a8968a
-  data.tar.gz: 6bbb7cab6cf45c08899fafbf9291dbe9de7a61ac10af364d622d72eea5b857ee4889c3a4e813b7d5adac8383596c2dec9bb6bf111e2405501a7604293432f20e
+  metadata.gz: 1da0d24140bb16c16d440848f6dff64a8b73c846f01c882924cdffb96c16874ed2b81ad4204ee83ece321f0c9d5e449c4b22013724f9454fc37691adf2ef1ca8
+  data.tar.gz: a8aff288e4ba92cea77f7cbb3d07613564a59e5e525ed991581e3c51701923d6a7f04501d1582554cefcd2bd8e3081f122413ee0f302f4ee36603eb54b536ec1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullion (0.4.2)
+    bullion (0.5.0)
       dry-configurable (~> 1.1)
       httparty (~> 0.21)
       json (~> 2.6)
@@ -77,6 +77,7 @@ GEM
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -85,6 +86,9 @@ GEM
     mutex_m (0.2.0)
     mysql2 (0.5.5)
     nio4r (2.6.1)
+    nokogiri (1.15.5)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.15.5-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.5-x86_64-linux)
@@ -187,6 +191,8 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
+    sqlite3 (1.6.9)
+      mini_portile2 (~> 2.8.0)
     sqlite3 (1.6.9-arm64-darwin)
     sqlite3 (1.6.9-x86_64-linux)
     thor (1.3.0)
@@ -200,6 +206,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  ruby
   x86_64-linux
 
 DEPENDENCIES

data/lib/bullion/helpers/service.rb

@@ -6,12 +6,39 @@ module Bullion
     module Service
       def add_acme_headers(nonce, additional: {})
         headers["Replay-Nonce"] = nonce
-        headers["Link"] = "<#{uri("/directory")}>;rel=\"index\""
+        add_link_relation("index", uri("/directory"))
 
         additional.each do |name, value|
           headers[name.to_s] = value.to_s
         end
       end
+
+      def add_link_relation(type, value)
+        cur = link_headers_to_hash(headers["Link"])
+        cur[type] = value
+        headers["Link"] = hashed_links_to_link_headers(cur)
+      end
+
+      private
+
+      def link_headers_to_hash(values_string)
+        return {} unless values_string&.length&.positive?
+
+        values_string.split(",").to_h do |relation|
+          raw_value, raw_name = relation.split(";")
+          value = /^<(.+)>$/.match(raw_value)[1]
+          name = /^rel="(.+)"$/.match(raw_name)[1]
+          [name, value]
+        end
+      end
+
+      def hashed_links_to_link_headers(hash)
+        hash.reduce([]) do |acc, data|
+          name = "rel=\"#{data[0]}\""
+          value = "<#{data[1]}>"
+          acc << [value, name].join(";")
+        end.join(",")
+      end
     end
   end
 end

data/lib/bullion/services/ca.rb

@@ -355,8 +355,11 @@ module Bullion
 
         if challenge.status == "valid"
           data[:validated] = challenge.validated
-          order = challenge.authorization.order
+          authorization = challenge.authorization
+          authorization.update!(status: "valid") unless authorization.status == "valid"
+          order = authorization.order
           order.update!(status: "ready") unless order.status == "ready"
+          add_link_relation("up", uri("/authorizations/#{challenge.authorization.id}"))
         end
 
         data.to_json
@@ -369,6 +372,7 @@ module Bullion
       # @see https://tools.ietf.org/html/rfc8555#section-7.4.2
       post "/certificates/:id" do
         parse_acme_jwt
+        add_acme_headers @new_nonce
 
         order = Models::Order.where(certificate_id: params[:id]).first
         if order && order.status == "valid"

data/lib/bullion/version.rb

@@ -3,7 +3,7 @@
 module Bullion
   VERSION = [
     0, # major
-    4, # minor
-    2 # patch
+    5, # minor
+    0 # patch
   ].join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullion
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2024-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable