dns_one 0.4.48 → 0.4.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5594e70d0e8e9e4e1a48fdfd912d679708807ba
-  data.tar.gz: f07e8e672204c721295f875542f4a5e3f41ea8da
+  metadata.gz: 31952ea93dc7ece574b2a235f1dca11504c4e892
+  data.tar.gz: 9aa0c8f73e8255825d711f94cb574ae84d15ac98
 SHA512:
-  metadata.gz: 4d36a7402147335e9390e9486ff972648fc9ad0142581021a6fff15848470a0b13f6e589800aad62c0bf09e14a68c6d772c70f7600e89f2b1a79bb5e01a8e2d1
-  data.tar.gz: d7beb92f9e3d1b3bbe9f244086cbed96cbaa721faaa46d28c5fd361c2a775f944ef3e8e0a1f0621040e051e3042bd368154e3d063a124e30a75b0084b56ce7f0
+  metadata.gz: 33bda4530037b8037b897a1ec3d2c9a86cfc20d84837b176171c531dbc15447646837848d4a0b85df41730df16d5a2a2916c1647d3bc73ad351f03604a4c1d5a
+  data.tar.gz: 4d12197f714963e6512dae88d456ce914cd16c2fad47f0359b0b9d373780bb858b10b6163c6e2fd192a17e103ab32e5e93c79440ad2d34a81bbeb49bdfebb579

data/lib/dns_one/backend/base.rb

@@ -0,0 +1,9 @@
+module DnsOne; module Backend; class Base
+    def allow_cache
+        true
+    end
+
+    def preload_dummy?
+        false
+    end
+end; end; end

data/lib/dns_one/backend/db.rb

@@ -1,5 +1,5 @@
 
-module DnsOne; module Backend; class DB
+module DnsOne; module Backend; class DB < Base
 
     def initialize conf
         @query = conf.delete :query
@@ -7,12 +7,23 @@ module DnsOne; module Backend; class DB
         setup_db
     end
 
-    def find dom_name, tries = 1
+    def find dom_name
+        query build_query(dom_name)
+    end
+
+    # Find a dummy zone to make AR/pg load all dependencies
+    def preload_dummy?
+        true
+    end
+
+    private
+
+    def query sql, tries = 1
         return if tries > 3
 
         # http://jakeyesbeck.com/2016/02/14/ruby-threads-and-active-record-connections/
         res = ActiveRecord::Base.connection_pool.with_connection do
-            ActiveRecord::Base.connection.execute build_query(dom_name)
+            ActiveRecord::Base.connection.execute sql
         end
 
         first_record = res&.first
@@ -23,17 +34,11 @@ module DnsOne; module Backend; class DB
         Log.e "SQL query error. Trying to reconnect #{tries}. Details:\n#{e.desc}"
         # http://geoff.evason.name/2015/01/18/postgres-ssl-connection-has-been-closed-unexpectedly
         ActiveRecord::Base.connection.reconnect! 
-        find dom_name, (tries+1)
+        find sql, (tries+1)
     rescue => e
         Log.e "SQL query error. Details:\n#{e.desc}"
     end
 
-    def allow_cache
-        true
-    end
-
-    private
-
     def build_query dom_name
         @query.sub "'$domain'", 
                     ActiveRecord::Base.connection.quote(dom_name)

data/lib/dns_one/backend/file.rb

@@ -1,5 +1,5 @@
 
-module DnsOne; module Backend; class File
+module DnsOne; module Backend; class File < Base
 
     def initialize file
         @domain_map = {}

data/lib/dns_one/backend/http_bell.rb

@@ -0,0 +1,62 @@
+
+module DnsOne; module Backend; class HTTPBell < Base
+
+    def initialize conf
+        @conf = conf
+        @domains = {}
+        @last_id = nil
+        update
+        listen_updater_bell
+    end
+
+    def find dom_name
+        @domains[dom_name]
+    end
+
+    def allow_cache
+        false
+    end
+
+    private
+
+    def update
+        last_id = @last_id || 0
+
+        url = @conf[:update_cache_url].sub '$id', last_id.to_s
+
+        recs = `curl #{url}`
+            .split("\n")
+            .map{ |r| 
+                r.strip.split /\s+/
+            }
+
+        recs.each do |rec|
+            id, domain = rec
+            id = id.to_i
+            @domains[domain] = @conf[:update_cache_record_set]
+            if !@last_id || @last_id < id
+                @last_id = id
+            end
+        end
+
+        Log.d "#{recs.size} new domains added."
+    end
+
+    def listen_updater_bell
+        unless @conf[:update_cache_bell_port]
+            return 
+        end
+        require "socket"  
+        dts = TCPServer.new '0.0.0.0', @conf[:update_cache_bell_port]
+        Thread.new do
+            loop do  
+                Thread.start(dts.accept) do |s|
+                    s.close
+                    Log.i "update`ing..."
+                    update
+                end  
+            end  
+        end
+    end
+  
+end; end; end

data/lib/dns_one/cache.rb

@@ -1,6 +1,6 @@
 
 module DnsOne; class Cache
-    DEFAULT_MAX_SIZE = 10000
+    DEFAULT_MAX_SIZE = 100000
 
     def initialize max_size = nil
         @max_size = max_size || DEFAULT_MAX_SIZE

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.48"
+    VERSION = "0.4.49"
 end

data/lib/dns_one/zone_search.rb

@@ -17,8 +17,9 @@ module DnsOne; class ZoneSearch
         @cache = Cache.new @conf[:cache_max]
         @ignore_subdomains_re = build_ignore_subdomains_re
 
-        # Find a dummy zone to make AR/pg load all dependencies
-        query 'dummy.com.br', Resolv::DNS::Resource::IN, '1.2.3.4'
+        if @backend.preload_dummy?
+            query 'dummy.com.br', Resolv::DNS::Resource::IN, '1.2.3.4'
+        end
 
         self
     end
@@ -38,7 +39,7 @@ module DnsOne; class ZoneSearch
 
         # 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' }"
         return records unless rec_set
@@ -81,20 +82,20 @@ module DnsOne; class ZoneSearch
             unless ::File.exists? file
                 Util.die "Domain list file #{file} not found."
             end
-            Backend::File.new file          
+            Backend::File.new file
+        elsif @conf[:backend][:update_cache_url]
+            unless @conf[:backend][:update_cache_record_set]
+                Util.die "backend.update_cache_record_set not set."
+            end
+            Backend::HTTPBell.new @conf[:backend]
         else
             Backend::DB.new @conf[:backend]
         end
     end
 
     def find_record_set dom_name
-        use_cache = true
-        use_cache = false if dom_name =~ /^NC/
-        dom_name.sub! /^NC/, ''
-
-        dom_name.downcase!
-
-        dom_name.sub! /\.home$/i, ''
+        dom_name, use_cache = check_debug_tags dom_name
+        dom_name = normalize_domain dom_name
         
         if @ignore_subdomains_re
             dom_name.sub! @ignore_subdomains_re, '' 
@@ -102,22 +103,30 @@ module DnsOne; class ZoneSearch
 
         enabled_cache = use_cache && @backend.allow_cache
 
-        from_cache = false
-
         if enabled_cache and rec_set = @cache.find(dom_name)
             Log.d "found in cache (#{@cache.stat})"
-            from_cache = true
-            [rec_set, from_cache]
+            [rec_set, true]
         else
             if rec_set = @backend.find(dom_name)
-                if enabled_cache
-                    @cache.add dom_name, rec_set 
-                end
-                [rec_set, from_cache]
+                @cache.add dom_name, rec_set if enabled_cache
+                [rec_set, false]
             end
         end        
     end
 
+    def normalize_domain dom_name
+        dom_name.downcase
+                .sub(/\.home$/i, '')
+    end
+
+    def check_debug_tags dom_name
+        use_cache = true
+        if dom_name.sub!(/^NC/, '')
+            use_cache = false 
+        end
+        [dom_name, use_cache]
+    end
+
     def check_record_sets
         if @conf[:record_sets].blank?
             Util.die "Record sets cannot be empty. Check file."

data/util/dns_one.service

@@ -10,3 +10,4 @@ WorkingDirectory=/var/local/dns_one
 ExecStart=/bin/bash -lc '/root/.rbenv/shims/dns_one'
 StandardOutput=syslog
 StandardError=syslog
+SyslogIdentifier=dns_one

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.48
+  version: 0.4.49
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-03 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,8 +160,10 @@ files:
 - exe/dns_one
 - gempush
 - lib/dns_one.rb
+- lib/dns_one/backend/base.rb
 - lib/dns_one/backend/db.rb
 - lib/dns_one/backend/file.rb
+- lib/dns_one/backend/http_bell.rb
 - lib/dns_one/cache.rb
 - lib/dns_one/cli.rb
 - lib/dns_one/core_ext/blank.rb