eventmachine-dnsbl 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b769f5b225813cbc47239bbb19ffc340a0f65dd
-  data.tar.gz: 4d68ffc2ddcdf8173817b9e668a4219b33a5bc0d
+  metadata.gz: 055d3633c5ab9e36ecbcfb2d1c1a4b5e1235c2c1
+  data.tar.gz: dc7d0ea98482377933a5902d1df430308377f4e1
 SHA512:
-  metadata.gz: 879d99f241a220a447cb26e711438b0e96e0ac610755124eca90f1bc822c4494c619739ea7de1591d88f2b062d02764b0be1d65ccd314c36d449d7bcb96907fb
-  data.tar.gz: 287aaab5c82b67ffd9911b9ecb165318be2ed5ce474ddb2194c44c4984a060179cab1ca0eb52e1f489b986f975bc4e5872b01927cada6c77dc949f9d7f741718
+  metadata.gz: 2bb8588e0d189807f46a0b8867c24436630cba9901753551c3053c48f9af9545d58ab6fca016670622f009be528167f6aa2e389307ee387d03c9e0a08c0eb23e
+  data.tar.gz: 0ce2a851cdae3cf498c547680d281e87e7bf45b710b0058cc56e6a711dad18ea30d84a68cb1857ec202b06652a02a8c41ecf06ad96d25e0feced9a390eb59929

data/lib/eventmachine/dnsbl/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module DNSBL
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/eventmachine/dnsbl/zone/abstract_zone.rb

@@ -4,7 +4,7 @@ module EventMachine
   		class DNSBLResourceRecord < Struct.new(:zone, :label_regex, :ttl, :answer, :valid_until); end
       
       class AbstractZone
-        def get_records(query, qtype)
+        def get_records(query, qtype = Resolv::DNS::Resource::IN::A)
           records = Array.new
           # A queries are all that I support right now
           if qtype != Resolv::DNS::Resource::IN::A
@@ -14,14 +14,16 @@ module EventMachine
           zone = label = nil
           @zones.each do |z|
             if query.end_with?(z)
-              label = query[0, query.length - z.length]
+              label = query[0, query.length - z.length - 1]
               zone = z
             end
           end
           
           if zone
             get_all_records_for_zone(zone).each do |rec|
-              if rec[:label_regex].match(label)
+              if rec[:valid_until] and rec[:valid_until] < Time.now.to_i
+                next
+              elsif rec[:label_regex].match(label)
                 records << rec
               end
             end

data/lib/eventmachine/dnsbl/zone/sqlite3_zone.rb

@@ -42,6 +42,11 @@ module EventMachine
           rs.each do |row|
             row[1] = Regexp.new(row[1])
             row[3] = Resolv::DNS::Resource::IN::A.new(row[3])
+            if row[4] =~ /\d/
+              row[4] = row[4].to_i
+            else
+              row[4] = nil
+            end
             records << DNSBLResourceRecord.new(*row)
           end
           records

data/test/test_dnsbl_client.rb

@@ -16,7 +16,6 @@ class TestDNSBLClient < Minitest::Test
   def run_test(item, expected_result)
     EM.run do
       EventMachine::DNSBL::Client.check(item) do |results|
-        pp results
         assert_equal(expected_result, EventMachine::DNSBL::Client.blacklisted?(results))
         EM.stop
       end

data/test/test_dnsbl_server.rb

@@ -42,14 +42,42 @@ class TestDNSBLServer < Minitest::Test
         Time.now.to_i + 3600
       )
     )
+    zone.add_dnsblresource(
+      EventMachine::DNSBL::Zone::DNSBLResourceRecord.new(
+        "example.com", 
+        /\d+\.0\.0\.127$/, 
+        300, 
+        Resolv::DNS::Resource::IN::A.new("127.0.0.4"),
+        Time.now.to_i + 3600
+      )
+    )
+    zone.add_dnsblresource(
+      EventMachine::DNSBL::Zone::DNSBLResourceRecord.new(
+        "example.com", 
+        /\d+\.0\.168\.192$/, 
+        300, 
+        Resolv::DNS::Resource::IN::A.new("127.0.0.5"),
+        Time.now.to_i - 10
+      )
+    )
   end
   
   def zone_test(zone)
     zone_add_test_resources(zone)
-    recs = zone.get_records("viagrapillz.example.com", Resolv::DNS::Resource::IN::A)
-    assert(2, recs.length)
-    recs = zone.get_records("cialispillz.example.com", Resolv::DNS::Resource::IN::A)
-    assert(1, recs.length)
+    recs = zone.get_records("viagrapillz.example.com")
+    assert_equal(2, recs.length)
+    assert_equal("127.0.0.2", recs[0].answer.address.to_s)
+    assert_equal("127.0.0.3", recs[1].answer.address.to_s)
+    recs = zone.get_records("cialispillz.example.com")
+    assert_equal(1, recs.length)
+    assert_equal("127.0.0.3", recs[0].answer.address.to_s)
+    recs = zone.get_records("www.example.com")
+    assert_equal(0, recs.length)
+    recs = zone.get_records("1.0.0.127.example.com")
+    assert_equal(1, recs.length)
+    assert_equal("127.0.0.4", recs[0].answer.address.to_s)
+    recs = zone.get_records("5.0.168.192.example.com")
+    assert_equal(0, recs.length)
   end
     
   def test_memory_zone

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-dnsbl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine