rubydns 1.0.3 → 2.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bbfcdd537ed47ea32a9fd572e8f53994535c1d4
-  data.tar.gz: 656870a2f618afdf7c855ea92c90233fdcf8d55a
+  metadata.gz: 81194c2e8cae24a9908e8b4a89004555dc239dc2
+  data.tar.gz: df55b4550b2380779083664b4d4031fd1bf420da
 SHA512:
-  metadata.gz: 7c16e4fa1973b74001b5312e20dec2679462ad7277adf4b27711a70c0824e15dcbc92246753937304121a9cabf2c440d2e2453ed63ad7f1afe0fbc28a56fb690
-  data.tar.gz: 064149625cf5011ccb709164be9458690ed313a70b6b708da757cf956431f3bf87b62e8fe72278dca49472e4babef29d1be38ba6a67721ecdee61e37e4dd2e30
+  metadata.gz: 053b7994f85527e132900059f185ac3ff7d9a94b7cd75d4c1d6266a42100bbf93e340ecbdda74333106759ebc3429027f095b8185d9bd627b3182a87d385e475
+  data.tar.gz: 3964d053132451e904cd10e5630303af8686ba36721ef01b2aa337211b069e1c5d45978f4109cc5f71c4c52aaef5973c25879b8d10a34c3d449b32b0f0135c92

data/.rspec

@@ -0,0 +1,4 @@
+--color 
+--format documentation
+--warnings
+--require spec_helper

data/.travis.yml

@@ -1,14 +1,11 @@
 language: ruby
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y bind9
+sudo: false
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0.0
-  - 1.9.3
-  - rbx-2
-matrix:
-  allow_failures:
-    - rvm: rbx-2 
-env: COVERAGE=true
+  - 2.2.6
+  - 2.3.0
+  - 2.4.0
+  - ruby-head
+addons:
+  apt:
+    packages:
+    - bind9

data/Gemfile

@@ -1,8 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in trenni.gemspec
 gemspec
 
+group :development do
+	gem "process-daemon"
+end
+
 group :test do
 	gem 'simplecov'
 	gem 'coveralls', require: false

data/README.md

@@ -1,18 +1,14 @@
 # RubyDNS
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ioquatix/rubydns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-RubyDNS is a high-performance DNS server which can be easily integrated into other projects or used as a stand-alone daemon. By default it uses rule-based pattern matching. Results can be hard-coded, computed, fetched from a remote DNS server or fetched from a local cache, depending on requirements.
-
-In addition, RubyDNS includes a high-performance asynchronous DNS resolver built on top of [Celluloid][1]. This module can be used by itself in client applications without using the full RubyDNS server stack.
+[![Gitter](https://badges.gitter.im/Join+Chat.svg)](https://gitter.im/ioquatix/rubydns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-For examples and documentation please see the main [project page][2].
+RubyDNS is a high-performance DNS server which can be easily integrated into other projects or used as a stand-alone daemon. By default it uses rule-based pattern matching. Results can be hard-coded, computed, fetched from a remote DNS server or fetched from a local cache, depending on requirements.
 
-[1]: https://celluloid.io
-[2]: http://www.codeotaku.com/projects/rubydns/
+[![Build Status](https://travis-ci.org/ioquatix/rubydns.svg)](https://travis-ci.org/ioquatix/rubydns)
+[![Code Climate](https://codeclimate.com/github/ioquatix/rubydns.svg)](https://codeclimate.com/github/ioquatix/rubydns)
+[![Coverage Status](https://coveralls.io/repos/ioquatix/rubydns/badge.svg)](https://coveralls.io/r/ioquatix/rubydns)
 
-[![Build Status](https://travis-ci.org/ioquatix/rubydns.svg?branch=master)](https://travis-ci.org/ioquatix/rubydns)
-[![Code Climate](https://codeclimate.com/github/ioquatix/rubydns.png)](https://codeclimate.com/github/ioquatix/rubydns)
-[![Coverage Status](https://coveralls.io/repos/ioquatix/rubydns/badge.svg?branch=master)](https://coveralls.io/r/ioquatix/rubydns?branch=master)
+[![RubyDNS Introduction](http://img.youtube.com/vi/B9ygq0xh3HQ/maxresdefault.jpg)](https://www.youtube.com/watch?v=B9ygq0xh3HQ&feature=youtu.be&hd=1 "RubyDNS Introduction")
 
 ## Installation
 
@@ -30,36 +26,42 @@ Or install it yourself as:
 
 ## Usage
 
-This is copied from `test/examples/test-dns-2.rb`. It has been simplified slightly.
+There are [lots of examples available](examples/README.md) in the `examples/` directory.
+
+### Basic DNS Server
 
-	#!/usr/bin/env ruby
-	require 'rubydns'
+Here is the code from `examples/basic-dns.rb`:
 
-	INTERFACES = [
-		[:udp, "0.0.0.0", 5300],
-		[:tcp, "0.0.0.0", 5300]
-	]
-	Name = Resolv::DNS::Name
-	IN = Resolv::DNS::Resource::IN
+```ruby
+#!/usr/bin/env ruby
+require 'rubydns'
 
-	# Use upstream DNS for name resolution.
-	UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+INTERFACES = [
+	[:udp, "0.0.0.0", 5300],
+	[:tcp, "0.0.0.0", 5300],
+]
 
-	# Start the RubyDNS server
-	RubyDNS::run_server(:listen => INTERFACES) do
-		match(/test\.mydomain\.org/, IN::A) do |transaction|
-			transaction.respond!("10.0.0.80")
-		end
+IN = Resolv::DNS::Resource::IN
+
+# Use upstream DNS for name resolution.
+UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+
+# Start the RubyDNS server
+RubyDNS::run_server(:listen => INTERFACES) do
+	match(%r{test.local}, IN::A) do |transaction|
+		transaction.respond!("10.0.0.80")
+	end
 
-		# Default DNS handler
-		otherwise do |transaction|
-			transaction.passthrough!(UPSTREAM)
-		end
+	# Default DNS handler
+	otherwise do |transaction|
+		transaction.passthrough!(UPSTREAM)
 	end
+end
+```
 
-Start the server using `./test.rb`. You can then test it using dig:
+Start the server using `RUBYOPT=-w ./examples/basic-dns.rb`. You can then test it using dig:
 
-	$ dig @localhost -p 5300 test.mydomain.org
+	$ dig @localhost -p 5300 test.local
 	$ dig @localhost -p 5300 google.com
 
 ### File Handle Limitations
@@ -70,24 +72,29 @@ On some platforms (e.g. Mac OS X) the number of file descriptors is relatively l
 
 It is possible to create and integrate your own custom servers.
 
-	class MyServer < RubyDNS::Server
-		def process(name, resource_class, transaction)
-			transaction.fail!(:NXDomain)
-		end
+```ruby
+class MyServer < RubyDNS::Server
+	def process(name, resource_class, transaction)
+		transaction.fail!(:NXDomain)
 	end
+end
+
+Async::Reactor.run do
+	task = MyServer.run
 	
-	# Use the RubyDNS infrastructure for running the daemon:
-	# If asynchronous is true, it will return immediately, otherwise, it will block the current thread until Ctrl-C is pressed (SIGINT).
-	RubyDNS::run_server(asynchronous: false, server_class: MyServer)
+	# ... do other things
 	
-	# Directly instantiate the celluloid supervisor:
-	supervisor = MyServer.supervise
-	supervisor.actors.first.run
+	# Shut down the server:
+	task.stop
+end
+```
 
 This is the best way to integrate with other projects.
 
 ## Performance
 
+**Due to changes in the underlying code, there have been some very minor performance regressions. The numbers below will be updated in due course.**
+
 We welcome additional benchmarks and feedback regarding RubyDNS performance. To check the current performance results, consult the [travis build job output](https://travis-ci.org/ioquatix/rubydns).
 
 ### Server
@@ -114,115 +121,6 @@ These benchmarks are included in the unit tests.
 
 DNSSEC is currently not supported and is [unlikely to be supported in the future](http://sockpuppet.org/blog/2015/01/15/against-dnssec/).
 
-## Compatibility
-
-### Migrating from RubyDNS 0.8.x to 0.9.x
-
-RubyDNS 0.9.0 is based on a branch which replaced EventMachine with Celluloid. This reduces the complexity in writing concurrent systems hugely, but it is also a largely untested code path. RubyDNS 0.8.x using EventMachine has been tested over 4 years now by many projects.
-
-The reason for the change is simply that EventMachine is now a dead project and no longer being maintained/supported. The ramifications of this are: no IPv6 support, crashes/segfaults in certain workloads with no workable solution going forward, and lack of integration with external libraries.
-
-The difference for authors integrating RubyDNS in a daemon should be minimal. For users integrating RubyDNS into an existing system, you need to be aware of the contracts imposed by Celluloid, namely, whether it affects other parts of your system. Some areas of Celluloid are well developed, others are still needing attention (e.g. how it handles forking child processes). We expect the 0.8 branch should remain stable for a long time, but 0.9 branch will eventually become the 1.0 release.
-
-The benefits of using Celluloid include: fault tolerance, high performance, scalability across multiple hardware threads (when using Rubinius or JRuby), simpler integration with 3rd party data (e.g. `defer` has now been removed since it isn't necessary with celluloid).
-
-### Migrating from RubyDNS 0.7.x to 0.8.x
-
-The primary change is the removal of the dependency on `RExec` which was used for daemons and the addition of the testing dependency `process-daemon`. In order to create and run your own daemon, you may use `process-daemon` or another tool of your choice.
-
-The transaction options are now conveniently available:
-
-	transaction.options[key] == transaction[key]
-
-The remote peer address used to be available directly via `transaction[:peer]` but profiling revealed that the `EventMachine::Connection#get_peername` was moderately expensive. Therefore, the incoming connection is now available in `transaction[:connection]` and more specifically `transaction[:peer]` is no longer available and replaced by `transaction[:connection].peername` which gives `[ip_address, port]`.
-
-### Migrating from RubyDNS 0.6.x to 0.7.x
-
-The asynchronous deferred processing became the default and only method for processing requests in `0.7.0`. This simplifies the API but there were a few changes, notably the removal of `defer!` and the addition of `defer`. The reason for this was due to issues relating to deferred processing and the flow of control, which were confusing and introduced bugs in specific situations. Now, you can assume flow control through the entire block even with non-blocking functions.
-
-	RubyDNS::run_server(:listen => SERVER_PORTS) do
-		match(/\.*.com/, IN::A) do |transaction|
-			# Won't block and won't continue until fiber.resume is called.
-			defer do |fiber|
-				# No domain exists, after 5 seconds:
-				EventMachine::Timer.new(5) do
-					transaction.fail!(:NXDomain)
-					
-					fiber.resume
-				end
-			end
-		end
-
-		otherwise do
-			transaction.fail!(:NXDomain)
-		end
-	end
-
-You can see a complete example in `test/test_slow_server.rb`.
-
-#### Server structure changes
-
-When integrating RubyDNS into another project, the rule based DSL is often a hurdle rather than a feature. Thus, the rule-based DSL component of `RubyDNS::Server` class has been separated into a derived `RubyDNS::RuleBasedServer` class. `RubyDNS::Server` can be derived and the `RubyDNS::Server#process` method can be overridden to provide a single entry point for DNS processing.
-
-In addition, `RubyDNS::Server#run` can now start the server, provided you are within an `EventMachine#run` context. The existing entry point, `RubyDNS::run_server` provides the same rule-based DSL as previous versions.
-
-#### Method name changes
-
-Some method names have changed to improve consistency.
-
-- `failure!` became `fail!`
-- `append` became `add`
-- `append_query!` became `append!`
-
-### Migrating from RubyDNS 0.5.x to 0.6.x
-
-The order of arguments to pattern based rules has changed. For regular expression based rules, the arguments are now ordered `|transaction, match_data|`. The main reason for this change was that in many cases match_data is not important and can thus be ignored, e.g. `|transaction|`.
-
-Going forward, Ruby 1.8.x is no longer supported.
-
-### Migrating from RubyDNS 0.4.x to 0.5.x
-
-The system standard resolver was synchronous, and this could stall the server when making upstream requests to other DNS servers. A new resolver `RubyDNS::Resolver` now provides an asynchronous interface and the `Transaction::passthrough` makes exclusive use of this to provide high performance asynchonous resolution.
-
-Here is a basic example of how to use the new resolver in full. It is important to provide both `:udp` and `:tcp` connection specifications, so that large requests will be handled correctly:
-
-	resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
-
-	EventMachine::run do
-		resolver.query('google.com', IN::A) do |response|
-			case response
-			when RubyDNS::Message
-				puts "Got response: #{response.answers.first}"
-			else
-				# Response is of class RubyDNS::ResolutionFailure
-				puts "Failed: #{response.message}"
-			end
-
-			EventMachine::stop
-		end
-	end
-
-Existing code that uses `Resolv::DNS` as a resolver will need to be updated:
-
-	# 1/ Add this at the top of your file; Host specific system information:
-	require 'rubydns/system'
-	
-	# 2/ Change from R = Resolv::DNS.new to:
-	R = RubyDNS::Resolver.new(RubyDNS::System::nameservers)
-
-Everything else in the server can remain the same. You can see a complete example in `test/test_resolver.rb`.
-
-### Migrating from RubyDNS 0.3.x to 0.4.x
-
-Due to changes in `resolv.rb`, superficial parts of RubyDNS have changed. Rather than using `:A` to specify A-records, one must now use the class name.
-
-	match(..., :A)
-
-becomes
-
-	IN = Resolv::DNS::Resource::IN
-	match(..., IN::A)
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,11 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
-end
+RSpec::Core::RakeTask.new(:test)
 
-task :default => :spec
-
-require 'celluloid'
-Celluloid.logger.level = Logger::ERROR
+task :default => :test

data/examples/basic-dns.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+require 'rubydns'
+
+INTERFACES = [
+	[:udp, "0.0.0.0", 5300],
+	[:tcp, "0.0.0.0", 5300],
+]
+
+IN = Resolv::DNS::Resource::IN
+
+# Use upstream DNS for name resolution.
+UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+
+# Start the RubyDNS server
+RubyDNS::run_server(:listen => INTERFACES) do
+	match(%r{test.local}, IN::A) do |transaction|
+		transaction.respond!("10.0.0.80")
+	end
+
+	# Default DNS handler
+	otherwise do |transaction|
+		transaction.passthrough!(UPSTREAM)
+	end
+end

data/examples/cname.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'rubydns'
+require 'rubydns/system'
+ 
+INTERFACES = [
+	[:udp, "0.0.0.0", 5300],
+	[:tcp, "0.0.0.0", 5300]
+]
+
+Name = Resolv::DNS::Name
+IN = Resolv::DNS::Resource::IN
+
+UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+	
+RubyDNS::run_server(:listen => INTERFACES) do
+	# How to respond to something other than what was requested.
+	match(//, IN::A) do |transaction|
+		transaction.respond!(Name.create('foo.bar'), resource_class: IN::CNAME)
+	end
+
+	otherwise do |transaction|
+		transaction.passthrough!(UPSTREAM)
+	end
+end

data/examples/flakey-dns.rb

@@ -49,8 +49,8 @@ class FlakeyDNS < Process::Daemon
 					logger.info 'Dropping domain MICROSOFT...'
 					transaction.fail!(:NXDomain)
 				else
-					# Pass the request to the otherwise handler
-					false
+					logger.info 'Passing DNS request upstream...'
+					transaction.passthrough!(fallback_resolver_supervisor.actors.first)
 				end
 			end
 

data/examples/simple.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'rubydns'
+
+INTERFACES = [
+	[:udp, '0.0.0.0', 5300],
+	[:tcp, '0.0.0.0', 5300]
+]
+
+Name = Resolv::DNS::Name
+IN = Resolv::DNS::Resource::IN
+
+# Use upstream DNS for name resolution.
+UPSTREAM = RubyDNS::Resolver.new([[:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53]])
+
+# Start the RubyDNS server
+RubyDNS.run_server(listen: INTERFACES) do
+	match(/test.mydomain.org/, IN::A) do |transaction|
+			transaction.respond!('10.0.0.80')
+	end
+
+	# Default DNS handler
+	otherwise do |transaction|
+			transaction.passthrough!(UPSTREAM)
+	 end
+end

data/examples/soa-dns.rb

@@ -0,0 +1,82 @@
+#!/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.
+
+require 'rubygems'
+require 'rubydns'
+
+$R = Resolv::DNS.new
+Name = Resolv::DNS::Name
+IN = Resolv::DNS::Resource::IN
+
+RubyDNS.run_server(listen: [[:udp, '0.0.0.0', 5400]]) do
+	# SOA Record
+	#   dig @localhost -p 5400 SOA mydomain.org
+	match('mydomain.org', IN::SOA) do |transaction|
+		#
+		# For more details about these headers please see:
+		#   http://www.ripe.net/ripe/docs/ripe-203.html
+		#
+		
+		transaction.respond!(
+			Name.create('ns.mydomain.org.'),    # Master Name
+			Name.create('admin.mydomain.org.'), # Responsible Name
+			File.mtime(__FILE__).to_i,          # Serial Number
+			1200,                               # Refresh Time
+			900,                                # Retry Time
+			3_600_000,                          # Maximum TTL / Expiry Time
+			172_800                             # Minimum TTL
+		)
+		
+		transaction.append!(transaction.question, IN::NS, section: :authority)
+	end
+
+	# Default NS record
+	#   dig @localhost -p 5400 mydomain.org NS
+	match('mydomain.org', IN::NS) do |transaction|
+		transaction.respond!(Name.create('ns.mydomain.org.'))
+	end
+
+	# For this exact address record, return an IP address
+	#   dig @localhost -p 5400 CNAME bob.mydomain.org
+	match(/([^.]+).mydomain.org/, IN::CNAME) do |transaction|
+		transaction.respond!(Name.create('www.mydomain.org'))
+		transaction.append!('www.mydomain.org', IN::A)
+	end
+
+	match('80.0.0.10.in-addr.arpa', IN::PTR) do |transaction|
+		transaction.respond!(Name.create('www.mydomain.org.'))
+	end
+
+	match('www.mydomain.org', IN::A) do |transaction|
+		transaction.respond!('10.0.0.80')
+	end
+
+	match('ns.mydomain.org', IN::A) do |transaction|
+		transaction.respond!('10.0.0.10')
+	end
+
+	# Default DNS handler
+	otherwise do |transaction|
+		# Non-Existant Domain
+		transaction.fail!(:NXDomain)
+	end
+end