Added support for appending dependent queries. Useful for returning CNAME and A record pairs.

Added an example showing how to implement SOA records.

Author: Samuel Williams

lib/rubydns/server.rb

@@ -96,10 +96,10 @@ def process(name, record_type, *args)
 # Match failed against record_type?
 case pattern[1]
 when String
-next if pattern[1] != record_type.upcase
+next if pattern[1] != record_type
 @logger.debug "Resource type #{record_type} matched"
 when Array
-next if pattern[1].include?(record_type.upcase)
+next if pattern[1].include?(record_type)
 @logger.debug "Resource type #{record_type} matched #{pattern[1].inspect}"
 end
 
@@ -154,7 +154,7 @@ def receive_data(data)
 transaction = Transaction.new(self, query, question, resource_class, answer)
 
 begin
-process(transaction.name, transaction.record_type, transaction)
+transaction.process
 rescue
 @logger.error "Exception thrown while processing #{transaction}!"
 @logger.error "#{$!.class}: #{$!.message}"

lib/rubydns/transaction.rb

@@ -15,6 +15,26 @@
 
 module RubyDNS
 
+# Turn a symbol or string name into a resource class. For example,
+# convert <tt>:A</tt> into <tt>Resolv::DNS::Resource::IN::A</tt>
+def self.lookup_resource_class(klass)
+return nil if klass == nil
+
+if Symbol === klass
+klass = klass.to_s
+end
+
+if String === klass
+if Resolv::DNS::Resource.const_defined?(klass)
+return Resolv::DNS::Resource.const_get(klass)
+elsif Resolv::DNS::Resource::IN.const_defined?(klass)
+return Resolv::DNS::Resource::IN.const_get(klass)
+end
+end
+
+return klass
+end
+
 # This class provides all details of a single DNS question and answer. This
 # is used by the DSL to provide DNS related functionality.
 class Transaction
@@ -56,6 +76,16 @@ def to_s
 "#{name} #{record_type}"
 end
 
+# Run a new query through the rules with the given name and resource type. The
+# results of this query are appended to the current transactions <tt>answer</tt>.
+def append_query!(name, resource_type = nil)
+Transaction.new(@server, @query, name, RubyDNS.lookup_resource_class(resource_type) || @resource_class, @answer).process
+end
+
+def process
+@server.process(name, record_type, self)
+end
+
 # Use the given resolver to respond to the question. This will <tt>query</tt>
 # the resolver and <tt>merge!</tt> the answer if one is received. If recursion is
 # not requested, the result is <tt>failure!(:Refused)</tt>. If the resolver does

lib/rubydns/version.rb

@@ -17,7 +17,7 @@ module RubyDNS
  module VERSION #:nodoc:
  MAJOR = 0
  MINOR = 1
- TINY = 6
+ TINY = 7
 
  STRING = [MAJOR, MINOR, TINY].join('.')
  end

test/soa_example1.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2009 Samuel Williams. Released under the GNU GPLv3.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+require 'rubygems'
+require 'rubydns'
+
+$R = Resolv::DNS.new
+Name = Resolv::DNS::Name
+
+RubyDNS::run_server(:listen => [[:udp, "0.0.0.0", 5300]]) do
+# SOA Record
+# dig @localhost -p 5300 SOA mydomain.org
+match("mydomain.org", :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
+3600000, # Maximum TTL / Expiry Time
+172800 # Minimum TTL
+)
+end
+
+# Default NS record
+# dig @localhost -p 5300 NS
+match("", :NS) do |transaction|
+transaction.respond!(Name.create("ns.mydomain.org."))
+end
+
+# For this exact address record, return an IP address
+# dig @localhost -p 5300 CNAME bob.mydomain.org
+match(/([^.]+).mydomain.org/, :CNAME) do |match_data, transaction|
+transaction.respond!(Name.create("www.mydomain.org"))
+transaction.append_query!("www.mydomain.org", :A)
+end
+
+match("80.0.0.10.in-addr.arpa", :PTR) do |transaction|
+transaction.respond!(Name.create("www.mydomain.org."))
+end
+
+match("www.mydomain.org", :A) do |transaction|
+transaction.respond!("10.0.0.80", :record_type => :A)
+end
+
+match("ns.mydomain.org", :A) do |transaction|
+transaction.respond!("10.0.0.10")
+end
+
+# Default DNS handler
+otherwise do |transaction|
+# Non-Existant Domain
+transaction.failure!(:NXDomain)
+end
+end