net-http-paranoid 0.0.1 → 0.0.2

data/ChangeLog

@@ -1,2 +1,9 @@
 ChangeLog of http://svn.coderepos.org/share/lang/ruby/net-http-paranoid/trunk
 
+2008-02-14 cho45
+
+	* [new] @6699:
+		Change whitelist/blacklist reader method to accessor method.
+		Change initialize accepting opts.
+		
+

data/lib/net/http/paranoid.rb

@@ -1,18 +1,20 @@
 
 require "net/http"
+require "ostruct"
 
 class Net::HTTP::Paranoid
-	VERSION = "0.0.1"
+	VERSION = "0.0.2"
 
 	class ParanoidError < StandardError; end
 	class NotAllowedHostError < ParanoidError; end
 
-	attr_reader :blacklist
-	attr_reader :whitelist
+	attr_accessor :blacklist
+	attr_accessor :whitelist
 
-	def initialize
-		@blacklist = []
-		@whitelist = []
+	def initialize(opts={})
+		opts = OpenStruct.new(opts)
+		@blacklist = opts.blacklist || []
+		@whitelist = opts.whitelist || []
 	end
 
 	def wrap(http)
@@ -23,13 +25,14 @@ class Net::HTTP::Paranoid
 	end
 
 	def allow?(address)
+		name, _, _, ip = TCPSocket.gethostbyname(address)
+
 		[
 			[@whitelist, true], [@blacklist, false]
 		].each do |list, ret|
-			list.each do |a|
+			(list || []).each do |a|
 				return ret if a === address
 
-				name, _, _, ip = TCPSocket.gethostbyname(address)
 				return ret if a === name
 				return ret if a === ip
 			end
@@ -49,14 +52,14 @@ class Net::HTTP::Paranoid
 
 		ret = false
 		# From LWPx::ParanoidAgent written by Brad Fitzpatrick.
-		if (address & 0xFF000000) == 0x00000000 || # 0.0.0.0/8
-		   (address & 0xFF000000) == 0x0A000000 || # 10.0.0.0/8
-		   (address & 0xFF000000) == 0x7F000000 || # 127.0.0.0/8
-		   (address & 0xFFF00000) == 0xAC100000 || # 172.16.0.0/12
-		   (address & 0xFFFF0000) == 0xA9FE0000 || # 169.254.0.0/16
-		   (address & 0xFFFF0000) == 0xC0A80000 || # 192.168.0.0/16
-		    address               == 0xFFFFFFFF || # 255.255.255.255
-		   (address & 0xF0000000) == 0xE0000000    # multicast addresses
+		if (address & 0xFF000000) == 0x00000000 || # 0.0.0.0/8 "This" network
+		   (address & 0xFF000000) == 0x0A000000 || # 10.0.0.0/8 Class A private
+		   (address & 0xFF000000) == 0x7F000000 || # 127.0.0.0/8 Loopback
+		   (address & 0xFFF00000) == 0xAC100000 || # 172.16.0.0/12 Class B private
+		   (address & 0xFFFF0000) == 0xA9FE0000 || # 169.254.0.0/16 Link local
+		   (address & 0xFFFF0000) == 0xC0A80000 || # 192.168.0.0/16 Class C private
+		   (address & 0xFFFFFF00) == 0xC0000200 || # 192.0.2.0/24 TEST-NET
+		   (address & 0xE0000000) == 0xE0000000    # 224.0.0.0/3 Multicast and Reserved for future use
 
 			ret = true
 		end

data/spec/net-http-paranoid_spec.rb

@@ -9,13 +9,12 @@ require "net/http/paranoid"
 
 describe Net::HTTP::Paranoid do
 
-	before do
-		@paranoid = Net::HTTP::Paranoid.new
-	end
-
 	it "should not allow to access LAN" do
+		@paranoid = Net::HTTP::Paranoid.new
 		should_be_blocked = %w(
-			localhost 127.0.0.1 192.168.0.1
+			localhost
+			0.0.0.0 10.0.0.1 127.0.0.1 169.254.0.1 172.16.0.1
+			192.0.2.1 192.168.0.1 224.0.0.1 255.255.255.255
 			::1
 		)
 
@@ -31,6 +30,7 @@ describe Net::HTTP::Paranoid do
 	end
 
 	it "shoud allow global IP address" do
+		@paranoid = Net::HTTP::Paranoid.new
 		host = "64.233.187.99"
 		proc {
 			@paranoid.wrap(Net::HTTP.new(host))
@@ -38,6 +38,7 @@ describe Net::HTTP::Paranoid do
 	end
 
 	it "should treat blacklist/whitelist" do
+		@paranoid = Net::HTTP::Paranoid.new
 		@paranoid.whitelist << "localhost"
 		@paranoid.blacklist << "google.com"
 
@@ -53,5 +54,31 @@ describe Net::HTTP::Paranoid do
 			@paranoid.wrap(http)
 		}.should raise_error(Net::HTTP::Paranoid::NotAllowedHostError)
 	end
+
+	it "should accept opts for initialize" do
+		@paranoid = Net::HTTP::Paranoid.new({
+			:whitelist  => "localhost",
+			"blacklist" => "google.com",
+		})
+		proc {
+			@paranoid.wrap(Net::HTTP.new("localhost"))
+		}.should_not raise_error(Net::HTTP::Paranoid::NotAllowedHostError)
+
+		proc {
+			@paranoid.wrap(Net::HTTP.new("google.com"))
+		}.should raise_error(Net::HTTP::Paranoid::NotAllowedHostError)
+	end
+
+	it "should accept nil for list" do
+		@paranoid = Net::HTTP::Paranoid.new
+		@paranoid.whitelist = nil
+		@paranoid.blacklist = nil
+
+		proc {
+			uri  = URI("http://localhost/")
+			http = Net::HTTP.new(uri.host, uri.port)
+			@paranoid.wrap(http)
+		}.should raise_error(Net::HTTP::Paranoid::NotAllowedHostError)
+	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - cho45
@@ -9,7 +9,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2008-02-10 00:00:00 +09:00
+date: 2008-05-04 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lowreal
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Safety Net::HTTP