dns_one 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cf333022498bfdecb773415f6a7c3b370349573
-  data.tar.gz: 732d0765d3be07b1f9056e2ab17cfa4b41636b63
+  metadata.gz: 218dc35c2add52a6bc28230581cf23c36d9ddf3f
+  data.tar.gz: 1de9365403cb1cb20d0ae24858dfbfc06299fd05
 SHA512:
-  metadata.gz: ce64e58c10cc148b607493fa761da7290487992f6439168a1d8703d686a74e3afd0681fc5fb47d40dfecc40fc903de0abd6e33c5e24ff35a26fc44fe52a8b684
-  data.tar.gz: 2f3a2c80f77715a02a39a29b6c034703c6dfbad4edd715a68c9741204dbea2adba53b7aad7300f0f59a1349757098b5f9c31da2b6df15ba035db5696064fc6d3
+  metadata.gz: 6e5e40f70701eb9b81e829d46a40d60492b83cf35d918c4a9ce02ea9d63638b5581bf6b88b8229ca1ed7b459a7b1657ead42f34699af88c1107b56be516fe75f
+  data.tar.gz: 13485f2609f753e5ce53c6d78e33551e0e8fdda428edf577b15f277259cbdae469779d1176c9d18f3851993cc024b64361e39896cd7a0e190d76853fa0cf4ae4

data/README.md

@@ -34,6 +34,12 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Compatibility
+
+IPV6 error in Ruby 2.3.0:  
+
+variables address, a1 and a2 should`nt be frozen in 2.3.0/lib/ruby/2.3.0/resolv.rb
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/tomlobato/dns_one.

data/lib/dns_one.rb

@@ -1,10 +1,14 @@
+# Core
+require 'syslog'
+require 'syslog/logger'
 
+# Gems
 require 'rubydns'
 require 'active_record'
 require 'yaml'
 require 'rexec'
-require 'syslog'
-require 'syslog/logger'
+
+# DnsOne
 
 require "dns_one/core_extensions"
 require "dns_one/log"
@@ -36,7 +40,7 @@ module DnsOne; class DnsOne
 
 		# check_root
 		begin
-			Dir.chdir WORK_DIR
+			Dir.chdir (@conf.config[:work_dir] || WORK_DIR)
 		rescue => e
 			Log.w "Cannot change working dir to #{WORK_DIR}. Will continue in #{Dir.pwd}."
 		end
@@ -54,6 +58,8 @@ module DnsOne; class DnsOne
 		conf = YAML.load_file conf_file
 		conf.deep_symbolize_keys!
 
+		conf[:config] ||= {}
+
 		OpenStruct.new conf
 	end
 

data/lib/dns_one/backend/db.rb

@@ -1,4 +1,4 @@
-module Backend; class DB
+module Backend; class BackendDB
     def initialize conf
         @query = conf.delete :query
         @db_conf = conf
@@ -32,6 +32,10 @@ module Backend; class DB
         record_values&.first
     end
 
+    def allow_cache
+        true
+    end
+
     private
 
     def build_query dom_name

data/lib/dns_one/backend/file.rb

@@ -1,22 +1,31 @@
 
-module Backend; class File
+module Backend; class BackendFile
     def initialize file
         @domain_map = {}
-        load_file file
+        load file
     end
 
     def find dom_name
         @domain_map[dom_name.downcase]
     end
 
+    def allow_cache
+        false
+    end
+
     private
 
-    def load
+    def load file
         File.open(file).each_line do |line|
+            line.strip!
             domain_name, rec_set_name = line
-                .strip
                 .split(/[,\s]+/)
-            @domain_map[domain_name.strip.downcase] = rec_set_name&.strip || ''
+            if domain_name and not domain_name.empty?
+                @domain_map[domain_name.strip.downcase] = rec_set_name&.strip || ''
+            else
+                Log.w "Ignoring #{file} line: #{line}"
+            end
         end
     end
+
 end; end

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
 end

data/lib/dns_one/zone_search.rb

@@ -29,6 +29,10 @@ module DnsOne; class ZoneSearch
         Log.d "record set name #{ rec_set_name ? 'found' : 'not_found' }"
         rec_set_name or return
 
+        if rec_set_name == ''
+            rec_set_name = @conf.record_sets.keys.first.to_s
+        end
+
         rec_set = @conf.record_sets[rec_set_name.to_sym]
         Log.d "record set #{ rec_set ? 'found' : 'not found' }"
         rec_set or return
@@ -55,16 +59,17 @@ module DnsOne; class ZoneSearch
     def set_backend
         if file = @conf.backend[:file]
             unless File.exists? file
-                Util.die "Configuration file #{file} not found."
+                Util.die "Domain list file #{file} not found."
             end
-            Backend::File.new file          
+            Backend::BackendFile.new file          
         else
-            Backend::DB.new @conf.backend
+            Backend::BackendDB.new @conf.backend
         end
     end
 
     def find_record_set dom_name
-        use_cache = dom_name !~ /^NC/
+        use_cache = true
+        use_cache = false if dom_name =~ /^NC/
         dom_name.sub! /^NC/, ''
 
         dom_name.downcase!
@@ -75,12 +80,16 @@ module DnsOne; class ZoneSearch
             dom_name.sub! @ignore_subdomains_re, '' 
         end
 
-        if use_cache and rec_set = @cache.find(dom_name)
+        enabled_cache = use_cache && @backend.allow_cache
+
+        if enabled_cache and rec_set = @cache.find(dom_name)
             Log.d "found in cache"
             rec_set
         else
             if rec_set = @backend.find(dom_name)
-                @cache.add dom_name, rec_set if use_cache
+                if enabled_cache
+                    @cache.add dom_name, rec_set 
+                end
                 rec_set
             end
         end        

data/util/sample_conf.yml

@@ -1,8 +1,8 @@
 
 config:
-  run_as: dnsserver # required (adduser dnsserver)
-  # cache_max: 100000 # optional, defaults to 10000
-  ignore_subdomains: www en it es pt ru fr at
+  run_as: dnsserver                           # optional, but highly recommended! adduser --system dnsserver
+  ignore_subdomains: www en it es pt ru fr at # optional
+  # cache_max: 100000                         # optional, defaults to 10000
 
 backend:
   ############## 
@@ -12,14 +12,17 @@ backend:
   username: db_user
   password: db_pass
   pool: 20
+
   adapter: postgresql
   host: my-pg-db.com
   port: 5432
+
   # adapter: mysql2
   # host: my-mysql-db.com
   # port: 3306
   # # socket: /var/run/mysqld/mysqld.sock"
-  query: SELECT 'set1' FROM domains WHERE url = $domain LIMIT 1
+
+  query: SELECT 'my_set_1' FROM domains WHERE url = $domain LIMIT 1
   # query: SELECT domains.record_set FROM domains WHERE domain_name = $domain LIMIT 1
 
   # or... 
@@ -28,9 +31,9 @@ backend:
   # File backend #
   ################
 
-  # file: /etc/dns_one/domain.csv 
+  # file: /etc/dns_one/domains.csv 
 
-  # domain.csv example (set is optional, if missing the first record_set will be used)):
+  # domains.csv example (set is optional, if missing the first record_set will be used)):
   # mydomain.com set1
   # myotherdomain.com
   # myotherdomain2.com
@@ -38,7 +41,7 @@ backend:
 
 record_sets:
 
-  set1:
+  my_set_1:
     A:      123.234.345.456
     AAAA:   1234:3c00::f03c:91fa:fec2:15df
     NS:
@@ -54,7 +57,7 @@ record_sets:
       - 200                 # minimum  The minimum number of seconds to be used for TTL values in RRs.
       # More about SOA fields on http://ruby-doc.org/stdlib-2.0.0/libdoc/resolv/rdoc/Resolv/DNS/Resource/SOA.html
 
-  set2:
+  my_other_set:
     A:      32.34.54.56
     AAAA:   9034:3c00::f03c:91fb:fec2:15d0
     NS:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Tom Lobato
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: DNS server for many zones sharing only one or few records, written in Ruby.