dns_one 0.4.24 → 0.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77fd667f7117637e11933cd243928f1a0642220a
-  data.tar.gz: fcc9de0cf0843db0f7d76560bedabea8e5e13576
+  metadata.gz: 61b79c877f92aa27ce0f2a934564dbb6dfd5081e
+  data.tar.gz: d1a5fa9cf4fe59d40d94a0d37a94467781a5644a
 SHA512:
-  metadata.gz: f29ab0a236819c202ec1eec373fc24c3e7e4ddc49f06aa9f87a2600f056200b5721ed7fb1b9904cebe811beac0ad3c1664f0b9854b3a34adfc49087937798597
-  data.tar.gz: 22a61d2f79b2b1d89a1152e21ebe3f2af10b7367f22a2887670d6d0d323f9526ecdf45e08aacc92e887290c49184bd87157fbf85e53521fbbb04162a728aba22
+  metadata.gz: 0ba44dc2194fab4f8dda31969947e5589e4ea09f564df940f0548a3d6b41dc47d0cb55638f9e7ff20f5e2086e57eb0d2fa10943a1fc3d8b043e38fdf4b1112c9
+  data.tar.gz: a87d1bae6b44a3be9c79914aa4de83c0a09f86287a01a4b2db99cdf721ae30f4d5a356269f72207f541f5a570433f7662859fcaea34a8c11507b74d9935fbbd8

data/lib/dns_one/backend/db.rb

@@ -10,28 +10,24 @@ module DnsOne; module Backend; class DB
     def find dom_name, tries = 1
         return if tries > 3
 
-        res = nil
+        sql = build_query dom_name
     
-        begin
-            # http://jakeyesbeck.com/2016/02/14/ruby-threads-and-active-record-connections/
-            ActiveRecord::Base.connection_pool.with_connection do
-                sql = build_query dom_name
-                res = ActiveRecord::Base.connection.execute sql
-            end
-
-        rescue ActiveRecord::StatementInvalid => e
-            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)
-
-        rescue => e
-            Log.e "SQL query error. Details:\n#{e.desc}"
+        # http://jakeyesbeck.com/2016/02/14/ruby-threads-and-active-record-connections/
+        res = ActiveRecord::Base.connection_pool.with_connection do
+            ActiveRecord::Base.connection.execute sql
         end
 
         first_record = res&.first
         record_values = first_record&.values
         record_values&.first
+
+    rescue ActiveRecord::StatementInvalid => e
+        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)
+    rescue => e
+        Log.e "SQL query error. Details:\n#{e.desc}"
     end
 
     def allow_cache

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.24"
+    VERSION = "0.4.25"
 end

data/lib/dns_one/zone_search.rb

@@ -6,6 +6,7 @@ require 'dns_one/backend/db'
 module DnsOne; class ZoneSearch
     include Singleton
     
+    DOM_REGEX = /^[a-z0-9]+([\-\.][a-z0-9]+)*\.[a-z]{2,6}$/i
     Name = Resolv::DNS::Name
     IN = Resolv::DNS::Resource::IN
 
@@ -23,6 +24,8 @@ module DnsOne; class ZoneSearch
     end
 
     def query dom_name, res_class, ip_address
+        return unless dom_name =~ DOM_REGEX
+
         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}..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.24
+  version: 0.4.25
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: DNS server for many zones sharing only one or few records, written in Ruby.