dns_one 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f528114ee7c5a3f7d408fc8145be9aca563faaa8
-  data.tar.gz: 46f90187b9565856cbef718c8401f813c1a90081
+  metadata.gz: bc8be979621a0fc5e52dfbe6c57f73cb77aaec42
+  data.tar.gz: b4dc717ee6ecd5ab0b87367874b630869e942fb5
 SHA512:
-  metadata.gz: a95763e1b6bb77707524d45c8aa7c890ba81e1cdf061a1fba7969004eda42f4b7b8dee8bc573af1a65fca2314f1ef6e05994f7328838d62e044278d2250e0382
-  data.tar.gz: 1760effc82e9636e220b58f9c2fd041d7a80808b351859c2d7edd40edaa00d218eb8ea18a9eaa5284944181f8b3f616b5a5d32dd52df99606df28764b9ca7c1f
+  metadata.gz: 5e8048cc9ee4cfb43414b2bf89d7a7dea2f7457b1cd3b0d90baa8600bdc237c36bcd4809b0a7ca00f6788483143e2f8afcabd9c4661d47d6c11c35c7bc20b8f9
+  data.tar.gz: 186601a91301576e1d40b091f0af0529d17e1d01104ca7be3801f242b933ba9bb9d2684310c5866e23f6c35bd9d37854436fb1a9b33ba882d669f328d3662efc

data/lib/dns_one/server.rb

@@ -1,7 +1,8 @@
 
 module DnsOne; class Server # < RExec::Daemon::Base
 
-    DNS_DAEMON_RUN_AS = "dnsserver"
+    DEFAULT_RUN_AS = "dnsone"
+
     DNS_DAEMON_INTERFACES = [
         [:udp, "0.0.0.0", 53],
         [:tcp, "0.0.0.0", 53],
@@ -18,19 +19,26 @@ module DnsOne; class Server # < RExec::Daemon::Base
         conf = @conf
         RubyDNS::run_server(listen: dns_daemon_interfaces, logger: Log.logger) do
             on(:start) do
-                if RExec.current_user == 'root' and conf[:run_as]
-                    RExec.change_user conf[:run_as]
+                if RExec.current_user == 'root'
+                    run_as = conf[:run_as] || DEFAULT_RUN_AS
+                    RExec.change_user run_as
                 end
                 Log.i "Running as #{RExec.current_user}"
             end
 
             match(/(.+)/) do |t| # transaction
                 domain_name = t.question.to_s
-                answer, other_records = ZoneSearch.instance.query domain_name, t.resource_class
-                if answer or other_records
-                    t.respond! *answer if answer
-                    other_records.each do |rec|
-                        t.add rec.obj, {section: rec.section}
+                ip_address = t.options[:peer] rescue nil
+
+                records = ZoneSearch.instance.query domain_name, t.resource_class, ip_address
+
+                if records
+                    if records.empty?
+                        t.fail! :NoError
+                    else
+                        records.each do |rec|
+                            t.respond! *[rec.val].flatten, {resource_class: rec.res_class, section: rec.section}
+                        end
                     end
                 else
                     t.fail! :NXDomain

data/lib/dns_one/util.rb

@@ -26,4 +26,8 @@ module DnsOne; class Util; class << self
       stat.uid == 0 && stat.gid == 0
   end
 
+  def last_mod constant
+    constant.to_s.split('::').last
+  end
+
 end; end; end

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.8"
+    VERSION = "0.4.10"
 end

data/lib/dns_one/zone_search.rb

@@ -20,40 +20,45 @@ module DnsOne; class ZoneSearch
         end
     end
 
-    def query dom_name, res_class    
+    def query dom_name, res_class, ip_address
         dom_name = dom_name.dup
+        res_class_short = Util.last_mod res_class # :A, :NS, found in conf.yml:record_sets items
+        Log.d "request #{ dom_name }/#{res_class_short} from #{ip_address}..."
 
-        Log.d "searching #{ dom_name }..."
+        records = []
 
         rec_set_name = find_record_set dom_name
-        Log.d "record set name #{ rec_set_name ? 'found' : 'not found' } for #{dom_name} #{res_class}"
-        rec_set_name or return
+        Log.d "domain #{ rec_set_name ? 'found' : 'not found' } for #{dom_name}/#{res_class_short}"
+        return unless rec_set_name
 
-        if rec_set_name == ''
-            rec_set_name = @conf[:ecord_sets].keys.first.to_s
-        end
+        # use first record set if rec_set_name == ''
+        rec_set_name = @conf[:record_sets].keys.first if rec_set_name == ''
 
         rec_set = @conf[:record_sets][rec_set_name.to_sym]
-        Log.d "record set #{ rec_set ? 'found' : 'not found' } for #{dom_name} #{res_class}"
-        rec_set or return
+        Log.d "record set #{ rec_set ? 'found' : 'not found' } for #{dom_name}/#{res_class_short}"
+        return records unless rec_set
 
-        answer = nil
+        # TODO: move parsing logic to own class
 
-        unless res_class == IN::NS
-            if rec = rec_set[ res_class.to_s.split('::').last.to_sym ]
-                answer = rec
-                answer = [answer] unless answer.is_a? Array
-            end
-        end
+        recs = rec_set[res_class_short.to_sym]
 
-        other_records = []
+        # Loop over 1 or more
+        recs = [recs]
+        recs.flatten! unless res_class == IN::SOA
 
-        # NS
-        ns_list = rec_set[:NS].map{|ns| IN::NS.new(Name.create ns)}
-        ns_section = res_class == IN::NS ? :answer : :authority
-        other_records << OpenStruct.new(obj: ns_list, section: ns_section)
+        recs.compact.each do |val_raw|
+            val = if res_class == IN::NS
+                Name.create val_raw
+            elsif res_class == IN::SOA
+                [0, 1].each{|i| val_raw[i] = Name.create val_raw[i] }
+                val_raw
+            else
+                val_raw
+            end
+            records << OpenStruct.new(val: val, res_class: res_class, section: 'answer')
+        end
 
-        [answer, other_records]
+        records
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
 platform: ruby
 authors:
 - Tom Lobato