apartment_acme_client 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66eaebf9ae761526e149a5bedd237deee499a95107edb9ce3c1e3916e29c058b
-  data.tar.gz: 4ab90728f136c38b453a24f54b760c84539c4333ae0cb24ba4122dcb54c124b6
+  metadata.gz: b3d126738e9200783bf929ef8f8e6dd406a9aec36e6e2cfab24e4791a7807e79
+  data.tar.gz: 89d4ba2e18df6deb075c0c6648f8eb08b6daae092b6d9809a4a34ecab0b1f7a4
 SHA512:
-  metadata.gz: ff22698eadfef2b8b2e6d0c25793ad5bb1228ff66262c039ef01b969aabb42458caf4d3e6f0f8485a4eca5273b878328661437fe4591f6d809317a44811f1ae1
-  data.tar.gz: 870ed58bb9befb87b788fa1976f4fd73b052982cc1b57be889c2783a1ec55372ce24d155b286fd5937c24bb910bbb69ece5cf101b3e7e298d8117adc51d7f100
+  metadata.gz: 6817464fa2b8b43627c511c5b81182d2da6ded01e0ec0a207dc0f4008b7e677d914a3a7e0b7c10cf29d4dd93114d160f07f38e8fdc50109bd31d3b0c251f874a
+  data.tar.gz: d197fc06dd5b544b44ef575c73140e364ebbe1a50852df103f8e828c220bc2beb6bc97233dee0ab5d7a2c619700d1003ef919f6b6c022a514bb5aae7b3fd7e60

data/README.md

@@ -314,6 +314,3 @@ Aws.config.update(
   )
 )
 ```
-
-TODO
-- Get CI running

data/Rakefile

@@ -8,7 +8,7 @@ require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ApartmentAcmeClien'
+  rdoc.title    = 'ApartmentAcmeClient'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/lib/apartment_acme_client/acme_client/real_client.rb

@@ -6,6 +6,7 @@ module ApartmentAcmeClient
   module AcmeClient
     class RealClient
       attr_reader :csr_private_key
+
       def initialize(acme_client_private_key:, csr_private_key:)
         @client = Acme::Client.new(
           private_key: acme_client_private_key,

data/lib/apartment_acme_client/certificate_storage/s3.rb

@@ -81,8 +81,7 @@ module ApartmentAcmeClient
 
       def s3_file(filename)
         s3 = Aws::S3::Resource.new(region: ApartmentAcmeClient.aws_region)
-        object = s3.bucket(ApartmentAcmeClient.aws_bucket).object(filename)
-        object
+        s3.bucket(ApartmentAcmeClient.aws_bucket).object(filename)
       end
     end
   end

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/dns_api/route53.rb

@@ -26,8 +26,7 @@ module ApartmentAcmeClient
         @values = values
       end
 
-      # NOTE:
-      # if you get error like:
+      # NOTE: If you get error like:
       #
       # "Invalid Resource Record: FATAL problem:
       # InvalidCharacterString
@@ -71,7 +70,7 @@ module ApartmentAcmeClient
       end
 
       def route53
-        # Note: The `region` doesn't matter, because Route53 is global.
+        # NOTE: The `region` doesn't matter, because Route53 is global.
         @route53 ||= Aws::Route53::Client.new(region: 'us-east-1')
       end
 

data/lib/apartment_acme_client/encryption.rb

@@ -48,7 +48,7 @@ module ApartmentAcmeClient
     # params:
     #  - authorizations - a list of authorizations, which may be http or dns based (ignore the non-wildcard ones)
     #  - wildcard_domain - the url of the wildcard's base domain (e.g. "site.example.com")
-    def authorize_domains_with_dns(authorizations, wildcard_domain:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def authorize_domains_with_dns(authorizations, wildcard_domain:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       label = nil
       record_type = nil
       values = []
@@ -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'
 
@@ -108,9 +111,10 @@ module ApartmentAcmeClient
     # returns true on success, false otherwise.
     #
     # from https://github.com/unixcharles/acme-client/tree/master#authorize-for-domain
-    def authorize_domain_with_http(domain_authorization)
+    def authorize_domain_with_http(domain_authorization) # rubocop:disable Metrics/MethodLength
       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 # rubocop:disable Style/EmptyElse
+        # 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.7'
 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.7
 platform: ruby
 authors:
 - Robin Dunlop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: acme-client
   requirement: !ruby/object:Gem::Requirement
@@ -231,8 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Let's Encrypt interface for Multi-tenancy applications (like Apartment)