acmesmith 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58fb0220ae11e6aa3899cac2c584c744bb111388
-  data.tar.gz: 64df0d8ed2d9b5d43cd09deeb7ef1f6975ef6f02
+  metadata.gz: b30ccc8df20bb33b80e00e387793b0f48123dc0d
+  data.tar.gz: d5e42027029489bab6d284cbdf4340dd4d0c1378
 SHA512:
-  metadata.gz: 658d7a8b735e4fc51d7b91c82cfa514058e00eb95c96c681feeb4ca35bb68f1bdb57c806040576c7aeb6ae977274549ec0f987e13b162910b6bdcdb6b2f29530
-  data.tar.gz: 2aa5fb15c1e042fd821098617470886bf6f85914fa99115d815574132178a4a4d6c56b77186a9c5114cce99693f9bdbfd0e346feeb8ad181c69fee99295be2e5
+  metadata.gz: 20f3d365e5e16cddb7409fde72996798cecf0447f08bd84059f3943ad4712ee7cb64a002529e7363e9af0c6de00a1b577a6a1211f093fbde3dfb27557c84ae70
+  data.tar.gz: fdf60a6de0063f0d53c6d2e0991fca8c444c15cbb1c4595f7f279cc696eb6c4db318ba87a77cf480704915c47d9307801e7221795b2be00d57af8cd9f0750351

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v2.0.3 (2018-05-19)
+
+### Bug fixes
+
+- `route53` couldn't create an appropriate RRSet when ACME server needs multiple authorizations for the single domain.  [#31](https://github.com/sorah/acmesmith/issues/31)
+
+  (In fact, responsing could fail when ordering certificate for `*.example.org` and `example.org` to LE.)
+
 ## v2.0.2 (2018-05-18)
 
 ### Bug fixes

data/lib/acmesmith/challenge_responders/route53.rb

@@ -55,7 +55,9 @@ module Acmesmith
           puts " * #{zone_id}:"
           change_batch.fetch(:changes).each do |b|
             rrset = b.fetch(:resource_record_set)
-            puts "   - #{b.fetch(:action)}: #{rrset.fetch(:name)} #{rrset.fetch(:ttl)} #{rrset.fetch(:type)} #{rrset.dig(:resource_records, 0, :value)}"
+            rrset.fetch(:resource_records).each do |rr|
+              puts "   - #{b.fetch(:action)}: #{rrset.fetch(:name)} #{rrset.fetch(:ttl)} #{rrset.fetch(:type)} #{rr.fetch(:value)}"
+            end
           end
           print "   ... "
 
@@ -98,14 +100,29 @@ module Acmesmith
       end
 
       def change_batch_for_challenges(domain_and_challenges, comment: nil, action: 'UPSERT')
-        {
-          comment: "ACME challenge response #{comment}",
-          changes: domain_and_challenges.map do |d,c|
+        changes = domain_and_challenges
+          .map do |d, c|
+            rrset_for_challenge(d, c)
+          end
+          .group_by do |_|
+            # Reduce changes by name. ACME server may require multiple challenge responses for the same identifier
+            _.fetch(:name) 
+          end
+          .map do |name, cs| 
+            cs.inject { |result, change|
+              result.merge(resource_records: result.fetch(:resource_records, []) + change.fetch(:resource_records))
+            }
+          end
+          .map do |change|
             {
               action: action,
-              resource_record_set: rrset_for_challenge(d,c),
+              resource_record_set: change,
             }
-          end,
+          end
+
+        {
+          comment: "ACME challenge response #{comment}",
+          changes: changes,
         }
       end
 

data/lib/acmesmith/version.rb

@@ -1,3 +1,3 @@
 module Acmesmith
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acmesmith
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client