apartment_acme_client 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66eaebf9ae761526e149a5bedd237deee499a95107edb9ce3c1e3916e29c058b
-  data.tar.gz: 4ab90728f136c38b453a24f54b760c84539c4333ae0cb24ba4122dcb54c124b6
+  metadata.gz: 115dac06d080c93def98277b1b04e446db7cd66ee17b0cf40b2fba938232d9b7
+  data.tar.gz: d774f8b6bb8cc99af3efaa00848fadd9ea9614d42448aa84cba992fae2941fb6
 SHA512:
-  metadata.gz: ff22698eadfef2b8b2e6d0c25793ad5bb1228ff66262c039ef01b969aabb42458caf4d3e6f0f8485a4eca5273b878328661437fe4591f6d809317a44811f1ae1
-  data.tar.gz: 870ed58bb9befb87b788fa1976f4fd73b052982cc1b57be889c2783a1ec55372ce24d155b286fd5937c24bb910bbb69ece5cf101b3e7e298d8117adc51d7f100
+  metadata.gz: ce6bb72b308c1ca1087096de06de131e98b95c31ea0129f9890ee5687715262b3e60ce41cd5151f92ad32ebf48f1043b6156bd16da5e8156dbcccaa80ab52b5c
+  data.tar.gz: 65d76565e6fa300c866f7de531d6017af79cccb1c81210128fa7f0bbc6b79724ffbcf4f2dd100b76484fa7cbf05196e891ff3bdb5b6908efc1bc9e9ba81ad79d

data/lib/apartment_acme_client/dns_api/check_dns.rb

@@ -51,7 +51,7 @@ module ApartmentAcmeClient
         @nameservers
       end
 
-      def wait_for_present(value, timeout_seconds: 60)
+      def wait_for_present(value, timeout_seconds: 120)
         time = 1
         until check_dns(value)
           puts "Waiting for DNS to update"

data/lib/apartment_acme_client/encryption.rb

@@ -67,7 +67,7 @@ module ApartmentAcmeClient
         values << value
       end
 
-      return unless values.any?
+      return true unless values.any?
 
       route53 = ApartmentAcmeClient::DnsApi::Route53.new(
         requested_domain: wildcard_domain,
@@ -76,18 +76,21 @@ module ApartmentAcmeClient
         values: values
       )
 
+      puts "writing #{label} to Route53"
       route53.write_record
 
       check_dns = ApartmentAcmeClient::DnsApi::CheckDns.new(wildcard_domain, label)
 
       check_dns.wait_for_present(values.first)
+      puts "waiting 60 seconds before requesting DNS check from LetsEncrypt"
+      sleep(60)
 
       if check_dns.check_dns(values.first)
         # DNS is updated, proceed with cert request
         dns_authorizations.each do |domain_authorization|
           domain_authorization.request_validation
 
-          30.times do
+          60.times do
             # may be 'pending' initially
             break if domain_authorization.status == 'valid'
 
@@ -111,6 +114,7 @@ module ApartmentAcmeClient
     def authorize_domain_with_http(domain_authorization)
       challenge = domain_authorization.http
 
+      puts "authorizing Domain: #{domain_authorization.domain}"
       # The http method will require you to respond to a HTTP request.
 
       # You can retrieve the challenge token
@@ -148,7 +152,10 @@ module ApartmentAcmeClient
 
       30.times do
         # may be 'pending' initially
-        break if challenge.status == 'valid'
+        if challenge.status == 'valid'
+          puts "authorized!"
+          break
+        end
 
         puts "Waiting for letsencrypt to authorize the single domain. Status: #{challenge.status}"
 
@@ -179,10 +186,14 @@ module ApartmentAcmeClient
 
         authorize_domain_with_http(authorization)
       end
-      # Do the DNS (wildcard) authorizations
-      authorize_domains_with_dns(order.authorizations, wildcard_domain: wildcard_domain)
 
-      client.request_certificate(common_name: common_name, names: domain_names_requested, order: order)
+      # Do the DNS (wildcard) authorizations
+      if authorize_domains_with_dns(order.authorizations, wildcard_domain: wildcard_domain)
+        client.request_certificate(common_name: common_name, names: domain_names_requested, order: order)
+      else
+        # error, not authorized
+        nil
+      end
     end
 
     # for use in order to store this on the machine for NGINX use

data/lib/apartment_acme_client/renewal_service.rb

@@ -14,6 +14,10 @@ module ApartmentAcmeClient
         domains: good_domains,
         wildcard_domain: ApartmentAcmeClient.wildcard_domain
       )
+      if certificate.nil?
+        puts "ERROR, no certificate returned aborting"
+        return
+      end
 
       ApartmentAcmeClient::CertificateStorage::Proxy.singleton.store_certificate_string(certificate)
       ApartmentAcmeClient::CertificateStorage::Proxy.singleton.store_csr_private_key_string(encryptor.csr_private_key_string)

data/lib/apartment_acme_client/version.rb

@@ -1,3 +1,3 @@
 module ApartmentAcmeClient
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apartment_acme_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Robin Dunlop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails