evt-dns-resolve_host 0.0.0.0 → 0.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f2c109900a98a609793db9aa17c57a226d0622
-  data.tar.gz: e37d7580573e4e595a3dd1710af66d1d3b3dfb6e
+  metadata.gz: ae6e00ea579cee629e25ccd99a53b4c317c626fe
+  data.tar.gz: b128cc7ae8cbf445fa7d7cfc44e450b8a34b51cf
 SHA512:
-  metadata.gz: 958116b8dc08f84892e3847f93fd266908408df50916271b096af5b5e93e32b40dc8a6c72eea054d5c19ca649d024f8d83a00c6433ec9664bc78a3576a131504
-  data.tar.gz: dfbccae87305fdb7b11fdca2cb5883eb65f58a58a778d7ebc1646a6f7bf804b6505d8d39c3f1f833ff813d3e30cbbefe8414e2f85667cbf116cf76d6d59d9c3a
+  metadata.gz: a69ac9ab686e8f9164f63383a192c150a6e806c05bc03abd57fe42df6ea60dce69da04b6e612460002d74186ebd6a9bfeea83bcc887ae8d298f7efb9e4badb29
+  data.tar.gz: 740b17b05105e2246b250bd84c957d94bf6d496568c43d1e338ac686df302524c5211ab838d45c1760ff7e8e4806389ceb2538f618d6b4394bb84d7eb451c363

data/lib/dns/resolve_host.rb

@@ -1,9 +1,14 @@
+require 'ipaddr'
+require 'resolv'
+
 require 'configure'; Configure.activate
-require 'log'
+require 'settings'; Settings.activate
 
 require 'dns/resolve_host/log'
 
 require 'dns/resolve_host/defaults'
-require 'dns/resolve_host/nameserver'
+require 'dns/resolve_host/log_attributes'
 require 'dns/resolve_host/resolve_host'
+require 'dns/resolve_host/resolution_error'
 require 'dns/resolve_host/substitute'
+require 'dns/resolve_host/static_resolver'

data/lib/dns/resolve_host/controls/server.rb

@@ -21,9 +21,7 @@ module DNS
             end
           end
 
-          nameserver = Nameserver.new bind_address, port
-
-          block.(nameserver)
+          block.(bind_address, port)
 
           # The rubydns library does not properly unbind its server socket when
           # the actor terminates. See the following github issue:

data/lib/dns/resolve_host/log_attributes.rb

@@ -0,0 +1,15 @@
+module DNS
+  class ResolveHost
+    module LogAttributes
+      def self.get(resolve_host, hostname)
+        if resolve_host.nameserver_address
+          nameserver = "#{resolve_host.nameserver_address}:#{resolve_host.nameserver_port}"
+        else
+          nameserver = "(system)"
+        end
+
+        "Hostname: #{hostname}, Nameserver: #{nameserver}"
+      end
+    end
+  end
+end

data/lib/dns/resolve_host/resolution_error.rb

@@ -0,0 +1,5 @@
+module DNS
+  class ResolveHost
+    ResolutionError = Class.new StandardError
+  end
+end

data/lib/dns/resolve_host/resolve_host.rb

@@ -4,44 +4,71 @@ module DNS
 
     configure :resolve_host
 
-    attr_accessor :nameserver
+    attr_accessor :nameserver_address
+    attr_writer :nameserver_port
 
-    def call(hostname, &block)
-      if nameserver
-        options = { :nameserver_port => [nameserver.to_a] }
-      else
-        options = nil
+    dependency :hosts_resolver, Resolv::Hosts
+
+    def self.build(address: nil, port: nil, hosts_file: nil)
+      if address.nil? and not port.nil?
+        raise ArgumentError, "Cannot specify port without address"
       end
 
+      instance = new
+
+      StaticResolver.configure instance, hosts_file, attr_name: :hosts_resolver
+
+      instance.nameserver_address = address if address
+      instance.nameserver_port = port if port
+
+      instance
+    end
+
+    def self.call(hostname, &block)
+      instance = new
+      instance.(hostname, &block)
+    end
+
+    def call(hostname, &block)
       logger.trace { "Resolving host (#{LogAttributes.get self, hostname})" }
 
-      Resolv::DNS.open options do |dns|
-        block.(dns) if block
+      Resolv::DNS.open dns_resolver_options do |dns_resolver|
+        resolver = Resolv.new [hosts_resolver, dns_resolver]
+
+        block.(dns_resolver) if block
 
-        addresses = dns.getaddresses hostname
+        addresses = resolver.getaddresses hostname
 
         addresses.map! &:to_s
 
         if addresses.empty?
-          logger.warn { "Could not resolve host (#{LogAttributes.get self, hostname})" }
-        else
-          logger.info { "Resolved host (#{LogAttributes.get self, hostname}, Address#{'es' unless addresses.count == 1}: #{addresses * ', '})" }
+          error_message = "Could not resolve host (#{LogAttributes.get self, hostname})"
+          logger.error { error_message }
+          raise ResolutionError, error_message
         end
 
+        logger.info { "Resolved host (#{LogAttributes.get self, hostname}, Address#{'es' unless addresses.count == 1}: #{addresses * ', '})" }
+
         return addresses
       end
     end
 
-    module LogAttributes
-      def self.get(resolve_host, hostname)
-        if resolve_host.nameserver
-          nameserver = resolve_host.nameserver.to_a * ':'
-        else
-          nameserver = "(system)"
-        end
-
-        "Hostname: #{hostname}, Nameserver: #{nameserver}"
+    def dns_resolver_options
+      if nameserver_address
+        { :nameserver_port => [nameserver] }
+      else
+        # Resolv::DNS.new expects the options argument to be *nil* when the
+        # system nameservers are meant to be used [Nathan Ladd, Mon 2 Jan 2017]
+        nil
       end
     end
+
+    def nameserver
+      [nameserver_address, nameserver_port]
+    end
+
+    def nameserver_port
+      @nameserver_port ||= Defaults.port
+    end
   end
 end

data/lib/dns/resolve_host/static_resolver.rb

@@ -0,0 +1,39 @@
+module DNS
+  class ResolveHost
+    module StaticResolver
+      def self.get(hosts_file=nil)
+        logger.trace { "Constructing static resolver (HostsFile: #{hosts_file.inspect})" }
+
+        if hosts_file.nil?
+          hosts_file = Resolv::Hosts::DefaultFileName
+        elsif !File.exist?(hosts_file)
+          File.open(hosts_file) { }
+        end
+
+        static_resolver = Resolv::Hosts.new hosts_file
+
+        logger.trace { "Static resolver constructed (HostsFile: #{hosts_file})" }
+
+        static_resolver
+      end
+
+      def self.configure(receiver, hosts_file=nil, attr_name: nil)
+        attr_name ||= :static_resolver
+
+        instance = get hosts_file
+        receiver.public_send "#{attr_name}=", instance
+        instance
+      end
+
+      def self.logger
+        @logger ||= Log.get self
+      end
+
+      module Assertions
+        def file?(file)
+          @filename == file
+        end
+      end
+    end
+  end
+end

data/lib/dns/resolve_host/substitute.rb

@@ -7,7 +7,20 @@ module DNS
 
       class ResolveHost
         def call(hostname)
-          map[hostname]
+          if map.key? hostname
+            map[hostname]
+          elsif ip_address? hostname
+            [hostname]
+          else
+            raise ResolutionError
+          end
+        end
+
+        def ip_address?(string)
+          IPAddr.new string
+          true
+        rescue IPAddr::InvalidAddressError
+          false
         end
 
         def set(hostname, ip_addresses)
@@ -19,7 +32,7 @@ module DNS
         end
 
         def map
-          @map ||= Hash.new { [] }
+          @map ||= {}
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-dns-resolve_host
 version: !ruby/object:Gem::Version
-  version: 0.0.0.0
+  version: 0.1.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-configure
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: evt-log
+  name: evt-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -79,8 +79,10 @@ files:
 - lib/dns/resolve_host/controls/server.rb
 - lib/dns/resolve_host/defaults.rb
 - lib/dns/resolve_host/log.rb
-- lib/dns/resolve_host/nameserver.rb
+- lib/dns/resolve_host/log_attributes.rb
+- lib/dns/resolve_host/resolution_error.rb
 - lib/dns/resolve_host/resolve_host.rb
+- lib/dns/resolve_host/static_resolver.rb
 - lib/dns/resolve_host/substitute.rb
 homepage: https://github.com/eventide-project/dns-resolve-host
 licenses:

data/lib/dns/resolve_host/nameserver.rb

@@ -1,9 +0,0 @@
-module DNS
-  class ResolveHost
-    Nameserver = Struct.new :ip_address, :port do
-      def to_a
-        [ip_address, port]
-      end
-    end
-  end
-end