dns_one 0.4.52 → 0.4.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b253e07948277570f96219b31ca73e7f811a269a
-  data.tar.gz: ed8c82eeea3442fd17dc4ba15629762f070ff647
+  metadata.gz: 8ff52cd75b1db5bec370f515b509df7e29a05d99
+  data.tar.gz: 9685f288aecc2a805bb3a982383a1b596017bd1d
 SHA512:
-  metadata.gz: e65d63e6b8b2b7ba9ee1c5861f01e99126d973cc0c629e46445dc6734200b6ed60902b30177660ac280fdfd23e88284d9400c8a8d90ac66bf2a87610be2d541a
-  data.tar.gz: 16d1654dbae7fef7a1d6beb9f3485313aaf33e0d40569040db42a32cd1932b5036b8b3242e2827fce818ab62036633694dfbdc12e052d577b0ce7f6e8a114a3a
+  metadata.gz: 07e22468f0192d6cac46a61480e09c16ef404fa794e19b1839406a63aed91a87477f624c5078d756c9c6b05208e3c0aba4f394df9da265b6ed71aa5138bcb0a2
+  data.tar.gz: 01e593ffaa49a0fe264ab18a76f9f4fc33a608d60faf674ab8fb0df7f88d59c56fce1d14ec96419b3098a1b1232bcf3baf859b45472078771dfe1db721a966f1

data/lib/dns_one/backend/http_bell.rb

@@ -1,4 +1,9 @@
 
+# HTTPBell
+# At initialization:
+# 1) Fetches all domains from @conf[:http_bell_url] and keeps in memory
+# 2) Open TCP port @conf[:http_bell_port] and fetches new domains incrementally upon connect(2)
+
 module DnsOne; module Backend; class HTTPBell < Base
 
     def initialize conf
@@ -20,26 +25,55 @@ module DnsOne; module Backend; class HTTPBell < Base
     private
 
     def update
-        last_id = @last_id || 0
+        log_update :start
 
-        url = @conf[:http_bell_url].sub '$id', last_id.to_s
-
-        recs = `curl #{url}`
-            .split("\n")
-            .map{ |r| 
-                r.strip.split /\s+/
-            }
+        recs = fetch
 
         recs.each do |rec|
             id, domain = rec
-            id = id.to_i
             @domains[domain] = @conf[:http_bell_record_set]
             if !@last_id || @last_id < id
                 @last_id = id
             end
         end
 
-        Log.d "#{recs.size} new domains added."
+        log_update :end, recs
+    end
+
+    def fetch
+        last_id = @last_id || 0
+
+        url = @conf[:http_bell_url].sub '$id', last_id.to_s
+
+        recs = `curl #{url}`
+            .split(/\n+/)
+            .map{ |r| 
+                id, domain = r.strip.split /\s+/
+                if id !~ /^\d+$/ || domain !~ Util::DOM_REGEX
+                    Log.w "invalid line '#{r}'"
+                    nil
+                else
+                    [id.to_i, domain.downcase]
+                end
+            }.compact
+
+        recs
+    end
+
+    def log_update point, recs = nil
+        case point
+        when :start
+            @log_update_t0 = Time.now
+            Log.i "update`ing..."
+        when :end
+            show_num = 10
+            dots = '...' if recs.size > show_num
+            zones = recs[0, show_num].map(&:first).join(', ')
+            dt = '%.2f' % (Time.now - @log_update_t0)
+            Log.d "#{recs.size} zone(s) added in #{dt}s: #{zones}#{dots}"
+        else
+            Log.e "Wrong param #{point} for log_update"
+        end
     end
 
     def listen_updater_bell
@@ -48,14 +82,18 @@ module DnsOne; module Backend; class HTTPBell < Base
         end
         require "socket"  
         dts = TCPServer.new '0.0.0.0', @conf[:http_bell_port]
+        allow_ips = @conf[:http_bell_allow_ips]
         Thread.new do
             loop do  
-                Thread.start(dts.accept) do |s|
-                    s.close
-                    Log.i "update`ing..."
-                    update
-                end  
-            end  
+                Thread.start(dts.accept) do |client|
+                    client.close
+                    if !allow_ips || allow_ips.include?(client.peeraddr)
+                        update
+                    else
+                        Log.w "Ignoring bell ring from #{client.peeraddr}."
+                    end
+                end
+            end
         end
     end
   

data/lib/dns_one/util.rb

@@ -1,5 +1,7 @@
 module DnsOne; class Util; class << self
 
+  DOM_REGEX = /^[a-z0-9]+([\-\.][a-z0-9]+)*\.[a-z]{2,32}$/i
+
   def die msg
     Log.f msg
     exit 1

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.52"
+    VERSION = "0.4.53"
 end

data/lib/dns_one/zone_search.rb

@@ -8,7 +8,6 @@ require 'dns_one/backend/db'
 module DnsOne; class ZoneSearch
     include Singleton
     
-    DOM_REGEX = /^[a-z0-9]+([\-\.][a-z0-9]+)*\.[a-z]{2,32}$/i
     Name = Resolv::DNS::Name
     IN = Resolv::DNS::Resource::IN
 
@@ -27,7 +26,7 @@ module DnsOne; class ZoneSearch
     end
 
     def query dom_name, res_class, ip_address
-        return unless dom_name =~ DOM_REGEX
+        return unless dom_name =~ Util::DOM_REGEX
 
         dom_name = dom_name.dup
         res_class_short = Util.last_mod res_class # :A, :NS, found in conf.yml:record_sets items
@@ -99,10 +98,6 @@ module DnsOne; class ZoneSearch
         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, '' 
-        end
-
         enabled_cache = use_cache && @backend.allow_cache
 
         if enabled_cache and rec_set = @cache.find(dom_name)
@@ -117,8 +112,13 @@ module DnsOne; class ZoneSearch
     end
 
     def normalize_domain dom_name
-        dom_name.downcase
-                .sub(/\.home$/i, '')
+        dom_name = dom_name.dup
+
+        dom_name.sub! @ignore_subdomains_re, '' if @ignore_subdomains_re
+        dom_name.downcase!
+        dom_name.sub! /\.home$/i, ''
+
+        dom_name
     end
 
     def check_debug_tags dom_name

data/util/sample_conf.yml

@@ -31,7 +31,10 @@ backend:
   http_bell_url: https://dnsapi.mysite.com/dns/fetch_since?id=$id
   http_bell_record_set: my_set_1
   http_bell_port: 27861
-
+  http_bell_allow_ips: 
+    - 1.2.3.4 
+    - 2.3.4.5
+    
   ################
   # File backend #
 

metadata

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