bullion 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 593707ee0875636704bc97eb1a384705165b91df8df9603f579f3ec0520604a4
-  data.tar.gz: f4605392c33a44eb1a39e06ec1a1bfb72b1746a8120eadfd9064cdf1dfb554a4
+  metadata.gz: 8733df57bd7abe9e12c46001165fad25429956ca243f4f0a91aea4a306b59d3d
+  data.tar.gz: 91a0941eebf4e61c807301c16cfe0d9ebc1d965bfd573b8b89ad2e43a0a1206c
 SHA512:
-  metadata.gz: 77a51b885d00586cf3550aad568687652b84c8072904144ccf2fe185ed0c04126036337c06f5f8a6719e19a6a62159ea496133af4c9894fe0327ab4cbcb2eb04
-  data.tar.gz: 9d393200ce899d507489b76c0a0093b9547230958ea3a0bebf7be33e88ada915f9a76a5f232416095fc1acae77cd45bb6863248a523942d49f9c380f539002ac
+  metadata.gz: 1d61ea6623bf7c2ba97fa1e7b71712cdebaa8dc7580a6a4f7788eaf51fe92a9218e4b2f89a4a48425772f86f9e2e2af22f166b536c5d64756ccc3ed4c2db8f4d
+  data.tar.gz: 496eb52624bc02f15ce0f51833d6435d4e157c3f8ba05052231d1e50b0eb14eade65d4eb6ccc7f870d7753cdc01bc0cafcfbc3d4dccb618aeee6d3e76355d2b9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullion (0.1.3)
+    bullion (0.2.0)
       httparty (~> 0.18)
       json (~> 2.5)
       jwt (~> 1.5)

data/README.md

@@ -36,8 +36,8 @@ Whether run locally or via Docker, the following environment variables configure
 | `CA_CERT_PATH` | `$CA_DIR/tls.crt` | Public cert for Bullion. If Bullion is an intermediate CA, you'll want to include the root CA's public cert in this file as well the signed cert for Bullion. |
 | `CA_DOMAINS` | `example.com` | A comma-delimited list of domains for which Bullion will sign certificate requests. Subdomains are automatically allowed. Certificates containing other domains will be rejected. |
 | `CERT_VALIDITY_DURATION` | `7776000` | How long should issued certs be valid (in seconds)? Default is 90 days. |
-| `DATABASE_URL` | _None_ | A shorthand for telling Bullion how to connect to a database. Acceptable URLs will either being with `sqlite3:` or [`mysql2://`](https://github.com/brianmario/mysql2#using-active-records-database_url). |
-| `DNS01_NAMESERVERS` | `8.8.8.8` | A comma-delimited list of nameservers to use for resolving [DNS-01](https://letsencrypt.org/docs/challenge-types/#dns-01-challenge) challenges. Usually you'll want this to be set to your _internal_ nameservers so internal names resolve correctly. |
+| `DATABASE_URL` | _None_ | **(Required)** A shorthand for telling Bullion how to connect to a database. Acceptable URLs will either being with `sqlite3:` or [`mysql2://`](https://github.com/brianmario/mysql2#using-active-records-database_url). |
+| `DNS01_NAMESERVERS` | _None_ | A comma-delimited list of nameservers to use for resolving [DNS-01](https://letsencrypt.org/docs/challenge-types/#dns-01-challenge) challenges. Usually you'll want this to be set to your _internal_ nameservers so internal names resolve correctly. When not set, it'll use the host's DNS. |
 | `LOG_LEVEL` | `warn` | Log level for Bullion. Supported levels (starting with the noisiest) are debug, info, warn, error, and fatal. |
 | `BULLION_PORT` | `9292` | TCP port Bullion will listen on. |
 | `MIN_THREADS` | `2` | Minimum number of [Puma](https://puma.io/) threads for processing requests. |

data/lib/bullion.rb

@@ -51,7 +51,7 @@ module Bullion
     }
   DB_CONNECTION_SETTINGS.freeze
 
-  NAMESERVERS = ENV.fetch('DNS01_NAMESERVERS', '8.8.8.8').split(',')
+  NAMESERVERS = ENV.fetch('DNS01_NAMESERVERS', '').split(',')
 
   MetricsRegistry = Prometheus::Client.registry
 

data/lib/bullion/challenge_clients/dns.rb

@@ -26,22 +26,31 @@ module Bullion
         # Randomly select a nameserver to pull the TXT record
         nameserver = NAMESERVERS.sample
 
-        begin
-          records = Resolv::DNS.open(nameserver: nameserver) do |dns|
-            dns.getresources(
-              name,
-              Resolv::DNS::Resource::IN::TXT
-            )
+        records = records_for(name, nameserver)
+        record = records.map(&:strings).flatten.first
+        LOGGER.debug "Resolved #{name} to value #{record}"
+        record
+      rescue Resolv::ResolvError
+        msg = ["Resolution error for #{name}"]
+        msg << "via #{nameserver}" if nameserver
+        LOGGER.info msg.join(' ')
+        false
+      rescue StandardError => e
+        msg = ["Error '#{e.message}' for #{name}"]
+        msg << "with #{nameserver}" if nameserver
+        LOGGER.warn msg.join(' ')
+        false
+      end
+
+      def records_for(name, nameserver = nil)
+        if nameserver
+          Resolv::DNS.open(nameserver: nameserver) do |dns|
+            dns.getresources(name, Resolv::DNS::Resource::IN::TXT)
+          end
+        else
+          Resolv::DNS.open do |dns|
+            dns.getresources(name, Resolv::DNS::Resource::IN::TXT)
           end
-          record = records.map(&:strings).flatten.first
-          LOGGER.debug "Resolved #{name} to value #{record}"
-          record
-        rescue Resolv::ResolvError
-          LOGGER.info "Resolution error for #{name} via #{nameserver}"
-          false
-        rescue StandardError => e
-          LOGGER.warn "Error '#{e.message}' for #{name} with #{nameserver}"
-          false
         end
       end
     end

data/lib/bullion/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullion
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty