rubydns 0.6.0 → 2.0.0

data/spec/spec_helper.rb

@@ -0,0 +1,30 @@
+
+if ENV['COVERAGE'] || ENV['TRAVIS']
+	begin
+		require 'simplecov'
+		
+		SimpleCov.start do
+			add_filter "/spec/"
+		end
+		
+		if ENV['TRAVIS']
+			require 'coveralls'
+			Coveralls.wear!
+		end
+	rescue LoadError
+		warn "Could not load simplecov: #{$!}"
+	end
+end
+
+require "bundler/setup"
+require "async"
+require "async/rspec"
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

metadata

@@ -1,100 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rexec
+  name: async-dns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: async-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-description: ! "\tRubyDNS is a high-performance DNS server which can be easily integrated
-  into\n\tother projects or used as a stand-alone daemon (via RExec). By default it
-  uses\n\trule-based pattern matching. Results can be hard-coded, computed, fetched
-  from\n\ta remote DNS server or fetched from a local cache, depending on requirements.\n\n\tIn
-  addition, RubyDNS includes a high-performance asynchronous DNS resolver\n\tbuilt
-  on top of EventMachine. This module can be used by itself in client\n\tapplications
-  without using the full RubyDNS server stack.\n"
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "\t\tRubyDNS is a high-performance DNS server which can be easily integrated
+  into\n\t\tother projects or used as a stand-alone daemon. By default it uses\n\t\trule-based
+  pattern matching. Results can be hard-coded, computed, fetched from\n\t\ta remote
+  DNS server or fetched from a local cache, depending on requirements.\n\n\t\tIn addition,
+  RubyDNS includes a high-performance asynchronous DNS resolver\n\t\tbuilt on top
+  of Celluloid. This module can be used by itself in client\n\t\tapplications without
+  using the full RubyDNS server stack.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables:
-- rd-dns-check
-- rd-resolve-test
+- rubydns-check
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".simplecov"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - README.md
 - Rakefile
-- bin/rd-dns-check
-- bin/rd-resolve-test
+- bin/rubydns-check
+- examples/Gemfile
+- examples/README.md
+- examples/basic-dns.rb
+- examples/cname.rb
+- examples/flakey-dns.rb
+- examples/fortune-dns.rb
+- examples/geoip-dns.rb
+- examples/simple.rb
+- examples/soa-dns.rb
+- examples/test-dns-1.rb
+- examples/test-dns-2.rb
+- examples/wikipedia-dns.rb
 - lib/rubydns.rb
-- lib/rubydns/chunked.rb
-- lib/rubydns/extensions/hexdump.rb
-- lib/rubydns/extensions/logger.rb
-- lib/rubydns/extensions/resolv.rb
-- lib/rubydns/extensions/string-1.8.rb
-- lib/rubydns/extensions/string-1.9.2.rb
-- lib/rubydns/extensions/string-1.9.3.rb
-- lib/rubydns/extensions/string.rb
-- lib/rubydns/handler.rb
-- lib/rubydns/message.rb
-- lib/rubydns/resolver.rb
-- lib/rubydns/server.rb
-- lib/rubydns/system.rb
-- lib/rubydns/transaction.rb
+- lib/rubydns/rule_based_server.rb
 - lib/rubydns/version.rb
 - rubydns.gemspec
-- test/examples/dropping-dns.rb
-- test/examples/fortune-dns.rb
-- test/examples/geoip-dns.rb
-- test/examples/soa-dns.rb
-- test/examples/test-dns-1.rb
-- test/examples/test-dns-2.rb
-- test/helper.rb
-- test/hosts.txt
-- test/test_daemon.rb
-- test/test_domains.txt
-- test/test_passthrough.rb
-- test/test_resolver.rb
-- test/test_rules.rb
-- test/test_slow_server.rb
-- test/test_system.rb
-- test/test_truncation.rb
-homepage: https://github.com/ioquatix/rubydns
-licenses: []
+- spec/rubydns/daemon_spec.rb
+- spec/rubydns/hosts.txt
+- spec/rubydns/injected_supervisor_spec.rb
+- spec/rubydns/passthrough_spec.rb
+- spec/rubydns/rules_spec.rb
+- spec/spec_helper.rb
+homepage: http://www.codeotaku.com/projects/rubydns
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -102,34 +135,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An easy to use DNS server and resolver for Ruby.
 test_files:
-- test/examples/dropping-dns.rb
-- test/examples/fortune-dns.rb
-- test/examples/geoip-dns.rb
-- test/examples/soa-dns.rb
-- test/examples/test-dns-1.rb
-- test/examples/test-dns-2.rb
-- test/helper.rb
-- test/hosts.txt
-- test/test_daemon.rb
-- test/test_domains.txt
-- test/test_passthrough.rb
-- test/test_resolver.rb
-- test/test_rules.rb
-- test/test_slow_server.rb
-- test/test_system.rb
-- test/test_truncation.rb
+- spec/rubydns/daemon_spec.rb
+- spec/rubydns/hosts.txt
+- spec/rubydns/injected_supervisor_spec.rb
+- spec/rubydns/passthrough_spec.rb
+- spec/rubydns/rules_spec.rb
+- spec/spec_helper.rb

data/bin/rd-dns-check

@@ -1,374 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright, 2009, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Pulls down DNS data from old-dns
-# rd-dns-check -s old-dns.mydomain.com -d mydomain.com. -f old-dns.yml
-
-# Check data against old-dns
-# rd-dns-check -s old-dns.mydomain.com -d mydomain.com. -c old-dns.yml
-
-# Check data against new DNS server
-# rd-dns-check -s 10.0.0.36 -d mydomain.com. -c old-dns.yml
-
-require 'yaml'
-require 'optparse'
-require 'set'
-
-class DNSRecord
-  def initialize(arr)
-    @record = arr
-    normalize
-  end
-  
-  def normalize
-    @record[0] = @record[0].downcase
-    @record[1] = @record[1].upcase
-    @record[2] = @record[2].upcase
-    @record[3] = @record[3].downcase
-  end
-  
-  def hostname
-    @record[0]
-  end
-  
-  def klass
-    @record[1]
-  end
-  
-  def type
-    @record[2]
-  end
-  
-  def value
-    @record[3]
-  end
-  
-  def is_address?
-    ["A", "AAAA"].include?(type)
-  end
-  
-  def is_cname?
-    return type == "CNAME"
-  end
-  
-  def to_s
-    "#{hostname.ljust(50)} #{klass.rjust(4)} #{type.rjust(5)} #{value}"
-  end
-  
-  def key
-    "#{hostname}:#{klass}:#{type}".downcase
-  end
-  
-  def to_a
-    @record
-  end
-  
-  def == other
-    return @record == other.to_a
-  end
-end
-
-def dig(dns_server, cmd, exclude = ["TXT", "HINFO", "SOA", "NS"])
-	records = []
-	
-	IO.popen("dig @#{dns_server} +nottlid +nocmd +noall +answer " + cmd) do |p|
-		p.each do |line|
-			r = line.chomp.split(/\s/, 4)
-			
-			next if exclude.include?(r[2])
-      
-			records << DNSRecord.new(r)
-		end
-	end
-	
-	return records
-end
-
-def retrieve_records(dns_server, dns_root)
-	return dig(dns_server, "#{dns_root} AXFR")
-end
-
-def resolve_hostname(dns_server, hostname)
-  return dig(dns_server, "#{hostname} A").first
-end
-
-def resolve_address(dns_server, address)
-  return dig(dns_server, "-x #{address}").first
-end
-
-def print_summary(records, errors, okay, &block)
-  puts "[ Summary ]".center(72, "=")
-  puts "Checked #{records.size} record(s). #{errors} errors."
-  if errors == 0
-    puts "Everything seemed okay."
-  else
-    puts "The following records are okay:"
-    okay.each do |r|
-      if block_given?
-        yield r
-      else
-        puts "".rjust(12) + r.to_s
-      end
-    end
-  end
-end
-
-# Resolve hostnames to IP address "A" or "AAAA" records.
-# Works through CNAME records in order to find out the final
-# address if possible. Checks for loops in CNAME records.
-def resolve_addresses(records)
-  addresses = {}
-  cnames = {}
-  
-  # Extract all hostname -> ip address mappings
-  records.each do |r|
-    if r.is_address?
-      addresses[r.hostname] = r
-    elsif r.is_cname?
-      cnames[r.hostname] = r
-    end
-  end
-  
-  cnames.each do |hostname, r|
-    q = r
-    trail = []
-    failed = false
-    
-    # Keep track of CNAME records to avoid loops
-    while q.is_cname?
-      trail << q
-      q = cnames[q.value] || addresses[q.value]
-      
-      # Q could be nil at this point, which means there was no address record
-      # Q could be already part of the trail, which means there was a loop
-      if q == nil || trail.include?(q)
-        failed = true
-        break
-      end
-    end
-    
-    if failed
-      q = trail.last
-      puts "*** Warning: CNAME record #{hostname} does not point to actual address!"
-      trail.each_with_index do |r, idx|
-        puts idx.to_s.rjust(10) + ": " + r.to_s
-      end
-    end
-    
-    addresses[r.hostname] = q
-  end
-  
-  return addresses, cnames
-end
-
-def check_reverse(records, dns_server)
-  errors = 0
-  okay = []
-  
-  puts "[ Checking Reverse Lookups ]".center(72, "=")
-  
-  records.each do |r|
-    next unless r.is_address?
-    
-    sr = resolve_address(dns_server, r.value)
-    
-    if sr == nil
-      puts "*** Could not resolve host"
-      puts "".rjust(12) + r.to_s
-      errors += 1
-    elsif r.hostname != sr.value
-      puts "*** Hostname does not match"
-      puts "Primary: ".rjust(12) + r.to_s
-      puts "Secondary: ".rjust(12) + sr.to_s
-      errors += 1
-    else
-      okay << [r, sr]
-    end
-  end
-  
-  print_summary(records, errors, okay) do |r|
-    puts "Primary:".rjust(12) + r[0].to_s
-    puts "Secondary:".rjust(12) + r[1].to_s
-  end
-end
-
-def ping_records(records)
-  addresses, cnames = resolve_addresses(records)
-
-  errors = 0
-  okay = []
-
-  puts "[ Pinging Records ]".center(72, "=")
-  
-  addresses.each do |hostname, r|
-    ping = "ping -c 5 -t 5 -i 1 -o #{r.value} > /dev/null"
-    
-    system(ping)
-    
-    if $?.exitstatus == 0
-      okay << r
-    else
-      puts "*** Could not ping host #{hostname.dump}: #{ping.dump}"
-      puts "".rjust(12) + r.to_s
-      errors += 1
-    end
-  end
-  
-  print_summary(records, errors, okay)
-end
-
-def query_records(primary, secondary_server)
-  addresses, cnames = resolve_addresses(primary)
-  
-  okay = []
-  errors = 0
-  
-  primary.each do |r|
-    sr = resolve_hostname(secondary_server, r.hostname)
-    
-    if sr == nil
-      puts "*** Could not resolve hostname #{r.hostname.dump}"
-      puts "Primary: ".rjust(12) + r.to_s
-      
-      rsr = resolve_address(secondary_server, (addresses[r.value] || r).value)
-      puts "Address: ".rjust(12) + rsr.to_s if rsr
-      
-      errors += 1
-    elsif sr.value != r.value
-      ra = addresses[r.value] if r.is_cname?
-      sra = addresses[sr.value] if sr.is_cname?
-      
-      if (sra || sr).value != (ra || r).value
-        puts "*** IP Address does not match"
-        puts "Primary: ".rjust(12) + r.to_s
-        puts "Resolved: ".rjust(12) + ra.to_s if ra
-        puts "Secondary: ".rjust(12) + sr.to_s
-        puts "Resolved: ".rjust(12) + sra.to_s if sra
-        errors += 1
-      end
-    else
-      okay << r
-    end
-  end
-  
-  print_summary(primary, errors, okay)
-end
-
-def check_records(primary, secondary)
-  s = {}
-  okay = []
-  errors = 0
-  
-  secondary.each do |r|
-    s[r.key] = r
-  end
-
-  puts "[ Checking Records ]".center(72, "=")
-
-  primary.each do |r|
-    sr = s[r.key]
-    
-    if sr == nil
-      puts "*** Could not find record"
-      puts "Primary: ".rjust(12) + r.to_s
-      errors += 1
-    elsif sr != r
-      puts "*** Records are different"
-      puts "Primary: ".rjust(12) + r.to_s
-      puts "Secondary: ".rjust(12) + sr.to_s
-      errors += 1
-    else
-      okay << r
-    end
-  end
-  
-  print_summary(primary, errors, okay)
-end
-
-OPTIONS = {
-	:DNSServer => nil,
-	:DNSRoot => ".",
-}
-
-ARGV.options do |o|
-  script_name = File.basename($0)
-  
-  o.set_summary_indent('  ')
-  o.banner = "Usage: #{script_name} [options]"
-  o.define_head "This script is designed to test and check DNS servers."
-  
-  o.on("-s ns.my.domain.", "--server ns.my.domain.", String, "The DNS server to query.") { |host| OPTIONS[:DNSServer] = host }
-  o.on("-d my.domain.", "--domain my.domain.", String, "The DNS zone to transfer/test.") { |host| OPTIONS[:DNSRoot] = host }
-  
-  o.on("-f output.yml", "--fetch output.yml", String, "Pull down a list of hosts. Filters TXT and HINFO records. DNS transfers must be enabled.") { |f|
-    records = retrieve_records(OPTIONS[:DNSServer], OPTIONS[:DNSRoot])
-    
-    output = (f ? File.open(f, "w") : STDOUT)
-    
-    output.write(YAML::dump(records))
-    
-    puts "#{records.size} record(s) retrieved."
-  }
-  
-  o.on("-c input.yml", "--check input.yml", String, "Check that the DNS server returns results as specified by the file.") { |f|
-    input = (f ? File.open(f) : STDIN)
-    
-    master_records = YAML::load(input.read)
-    secondary_records = retrieve_records(OPTIONS[:DNSServer], OPTIONS[:DNSRoot])
-    
-    check_records(master_records, secondary_records)
-  }
-  
-  o.on("-q input.yml", "--query input.yml", String, "Query the remote DNS server with all hostnames in the given file, and checks the IP addresses are consistent.") { |f|
-    input = (f ? File.open(f) : STDIN)
-    
-    master_records = YAML::load(input.read)
-    
-    query_records(master_records, OPTIONS[:DNSServer])
-  }
-  
-  o.on("-p input.yml", "--ping input.yml", String, "Ping all hosts to check if they are available or not.") { |f|
-    input = (f ? File.open(f) : STDIN)
-    
-    master_records = YAML::load(input.read)
-    
-    ping_records(master_records)
-  }
-  
-  o.on("-r input.yml", "--reverse input.yml", String, "Check that all address records have appropriate reverse entries.") { |f|
-    input = (f ? File.open(f) : STDIN)
-    
-    master_records = YAML::load(input.read)
-    
-    check_reverse(master_records, OPTIONS[:DNSServer])
-  }
-  
-  o.separator ""
-  o.separator "Help and Copyright information"
-  
-  o.on_tail("--copy", "Display copyright information") {
-    puts "#{script_name}. Copyright (c) 2009, 2011 Samuel Williams. Released under the MIT license."
-    puts "See http://www.oriontransfer.co.nz/ for more information."
-    exit
-  }
-  
-  o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
-end.parse!