bullion 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2161239051e1b4393633bd44decfe3909f4643fcda36110e0c8583385f809d5
-  data.tar.gz: 7b273e81ff9d3301a6d6fefd674914998b3ea428dbb3c6c75d4b4667496537bd
+  metadata.gz: 56d18291c0ea53bad26341c758991fc355fd502dff0af9f63228b898581ec22e
+  data.tar.gz: 3cca92ceecec74f0571a84a9295ebd062baa7f8b607c45b0bca7d85032681067
 SHA512:
-  metadata.gz: 7d2a3b51a3a66826cb8ccc659a48f1db25e4d6ee47fb4494ce80956b7d5df7590aef672f34ce009d9a2b982c599f27368be867ea1a999e20cdb29645716a1657
-  data.tar.gz: e2447971e639f8bc3014767cf1623e1d519b79aae820b12c12d3067b9e27a7f1caa3f02c0ed52a0380d48ca60da73627ca9a21a94f03508495fc6b05293fdd82
+  metadata.gz: c597fba5cdec355e16599e7dce74cc388cc48bf52afee1f756d3cefd930131a359e097fb4094f7f599c99d3f0e9d62a9b6b6700ba4c458e0ada75acc239179b9
+  data.tar.gz: cd59c5e385d342823ddb57bffe8fdc958c158738ca61cc1d63431ed06c23819d59b1b8e16e812172dcefc43d2710fe10877004cd4b7dc1fe66ae71324eb36386

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullion (0.4.3)
+    bullion (0.5.1)
       dry-configurable (~> 1.1)
       httparty (~> 0.21)
       json (~> 2.6)

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,10 +355,14 @@ 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"
         end
 
+        add_link_relation("up", uri("/authorizations/#{challenge.authorization.id}"))
+
         data.to_json
       rescue Bullion::Acme::Error => e
         content_type "application/problem+json"
@@ -369,6 +373,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
-    3 # patch
+    5, # minor
+    1 # patch
   ].join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullion
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 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