dnsbl-client 0.2.4 → 0.3.0

data.tar.gz.sig

@@ -1,2 +1 @@
-bb����/1����p-���$���k0�V�9�hnΓ9&�_	$���
-�0�
+��TH�nC�bfz�
�(&
:���@'��@�\��i�:���Yd�,h�l/2�r�}�,v���Rzj

data/lib/dnsbl-client/dnsbl-client.rb

@@ -27,11 +27,17 @@ module DNSBL
 		# initialize a new DNSBL::Client object
 		# the config file automatically points to a YAML file containing the list of DNSBLs and their return codes
 		# the two-level-tlds file lists most of the two level tlds, needed for hostname to domain normalization
-		def initialize(configfile = File.dirname(__FILE__)+"/dnsbl.yaml", ttldfile = File.dirname(__FILE__)+"/two-level-tlds")
+		def initialize(configfile = File.dirname(__FILE__)+"/dnsbl.yaml", 
+									 two_level_tldfile = File.dirname(__FILE__)+"/two-level-tlds",
+									 three_level_tldfile = File.dirname(__FILE__)+"/three-level-tlds")
 			@dnsbls = YAML.load(File.open(configfile).read)
-			@ttld = []
-			File.open(ttldfile).readlines.each do |l|
-				@ttld << l.strip
+			@two_level_tld = []
+			@three_level_tld = []
+			File.open(two_level_tldfile).readlines.each do |l|
+				@two_level_tld << l.strip
+			end
+			File.open(three_level_tldfile).readlines.each do |l|
+				@three_level_tld << l.strip
 			end
 			@sockets = []
 			config = Resolv::DNS::Config.new
@@ -51,10 +57,13 @@ module DNSBL
 			parts = domain.gsub(/^\w{1,20}:\/\//,'').gsub(/[\/\?\:].*/,'').gsub(/.*?\@/,'').split(/\./)
 			# grab the last two parts of the domain
 			dom = parts[-2,2].join(".")
-			# if the dom is in the ttld list, then use three parts
-			if @ttld.index(dom)
+			# if the dom is in the two_level_tld list, then use three parts
+			if @two_level_tld.index(dom)
 				dom = parts[-3,3].join(".")
 			end
+			if @three_level_tld.index(dom)
+				dom = parts[-4,4].join(".")
+			end
 			dom
 		end
 		
@@ -169,4 +178,4 @@ module DNSBL
 			results
 		end
 	end
-end
+end

data/lib/dnsbl-client/three-level-tlds

@@ -0,0 +1,158 @@
+act.edu.au
+act.gov.au
+bay.livefilestore.com
+blog.friendster.com
+blu.livefilestore.com
+bo.nordland.no
+bo.telemark.no
+city.chiba.jp
+city.fukuoka.jp
+city.hiroshima.jp
+city.kawasaki.jp
+city.kitakyushu.jp
+city.kobe.jp
+city.kyoto.jp
+city.nagoya.jp
+city.niigata.jp
+city.okayama.jp
+city.osaka.jp
+city.saitama.jp
+city.sapporo.jp
+city.sendai.jp
+city.shizuoka.jp
+city.yokohama.jp
+cloud.prohosting.com
+co.at.lv
+co.at.pn
+co.at.tc
+co.uk.pn
+co.uk.tc
+com.au.ms
+com.au.pn
+com.au.tc
+com.sapo.pt
+do.sapo.pt
+docs.google.com
+en.alibaba.com
+groups.live.com
+gs.aa.no
+gs.ah.no
+gs.bu.no
+gs.fm.no
+gs.hl.no
+gs.hm.no
+gs.jan-mayen.no
+gs.mr.no
+gs.nl.no
+gs.nt.no
+gs.of.no
+gs.ol.no
+gs.oslo.no
+gs.rl.no
+gs.sf.no
+gs.st.no
+gs.svalbard.no
+gs.tm.no
+gs.tr.no
+gs.va.no
+gs.vf.no
+heroy.more-og-romsdal.no
+heroy.nordland.no
+home.sapo.pt
+homepage.t-online.de
+lkd.co.im
+ltd.co.im
+me.uk.tc
+metro.tokyo.jp
+nes.akershus.no
+nes.buskerud.no
+no.sapo.pt
+nsw.edu.au
+nsw.gov.au
+nt.edu.au
+nt.gov.au
+or.at.lv
+org.uk.tc
+os.hedmark.no
+os.hordaland.no
+pa.gov.pl
+paginas.sapo.pt
+perso.sfr.fr
+plc.co.im
+po.gov.pl
+pref.aichi.jp
+pref.akita.jp
+pref.aomori.jp
+pref.chiba.jp
+pref.ehime.jp
+pref.fukui.jp
+pref.fukuoka.jp
+pref.fukushima.jp
+pref.gifu.jp
+pref.gunma.jp
+pref.hiroshima.jp
+pref.hokkaido.jp
+pref.hyogo.jp
+pref.ibaraki.jp
+pref.ishikawa.jp
+pref.iwate.jp
+pref.kagawa.jp
+pref.kagoshima.jp
+pref.kanagawa.jp
+pref.kochi.jp
+pref.kumamoto.jp
+pref.kyoto.jp
+pref.mie.jp
+pref.miyagi.jp
+pref.miyazaki.jp
+pref.nagano.jp
+pref.nagasaki.jp
+pref.nara.jp
+pref.niigata.jp
+pref.oita.jp
+pref.okayama.jp
+pref.okinawa.jp
+pref.osaka.jp
+pref.saga.jp
+pref.saitama.jp
+pref.shiga.jp
+pref.shimane.jp
+pref.shizuoka.jp
+pref.tochigi.jp
+pref.tokushima.jp
+pref.tottori.jp
+pref.toyama.jp
+pref.wakayama.jp
+pref.yamagata.jp
+pref.yamaguchi.jp
+pref.yamanashi.jp
+privat.t-online.de
+profile.live.com
+qld.edu.au
+qld.gov.au
+sa.edu.au
+sa.gov.au
+sakura.ne.jp
+sande.more-og-romsdal.no
+sande.vestfold.no
+skydrive.live.com
+so.gov.pl
+spaces.live.com
+spaces.msn.com
+sr.gov.pl
+starostwo.gov.pl
+tas.edu.au
+tas.gov.au
+ug.gov.pl
+um.gov.pl
+upow.gov.pl
+uw.gov.pl
+valer.hedmark.no
+valer.ostfold.no
+vic.edu.au
+vic.gov.au
+wa.edu.au
+wa.gov.au
+web.aplus.net
+web.fc2.com
+web.officelive.com

data/test/test_dnsbl-client.rb

@@ -16,4 +16,29 @@ class TestDnsblClient < Test::Unit::TestCase
 		res = c.lookup("pfizer.viagra.aqybasej.gurdoctor.com")
 		assert(res.length >= 0)
 	end
+
+	should "normalize domains to two levels if it's neither in two-level nor three-level list" do
+		c = DNSBL::Client.new
+
+		assert_equal("example.org", c.normalize("example.org"))
+		assert_equal("example.org", c.normalize("www.example.org"))
+		assert_equal("example.org", c.normalize("foo.bar.baz.example.org"))
+	end
+
+	should "normaize domains to three levels if it's in two-level list" do
+		c = DNSBL::Client.new
+
+		assert_equal("example.co.uk", c.normalize("example.co.uk"))
+		assert_equal("example.co.uk", c.normalize("www.example.co.uk"))
+		assert_equal("example.co.uk", c.normalize("foo.bar.baz.example.co.uk"))
+		assert_equal("example.blogspot.com", c.normalize("example.blogspot.com"))
+	end
+
+	should "normalize domains to four levels if it's in three-level list" do
+		c = DNSBL::Client.new
+
+		assert_equal("example.act.edu.au", c.normalize("example.act.edu.au"))
+		assert_equal("example.act.edu.au", c.normalize("www.example.act.edu.au"))
+		assert_equal("example.act.edu.au", c.normalize("foo.bar.example.act.edu.au"))
+	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnsbl-client
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chris Lee
@@ -37,7 +37,7 @@ cert_chain:
   6yhklP75
   -----END CERTIFICATE-----
 
-date: 2011-07-15 00:00:00 Z
+date: 2011-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -113,6 +113,7 @@ files:
 - lib/dnsbl-client.rb
 - lib/dnsbl-client/dnsbl-client.rb
 - lib/dnsbl-client/dnsbl.yaml
+- lib/dnsbl-client/three-level-tlds
 - lib/dnsbl-client/two-level-tlds
 - LICENSE.txt
 - README.rdoc