Changeset 2397 for lang/ruby/ssb

Timestamp:

12/04/07 13:22:59 (13 months ago)

Author:

lchin

Message:

lang/ruby/ssb: support http proxy

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb/request.rb (modified) (3 diffs)
• test/request_test.rb (modified) (2 diffs)

lang/ruby/ssb/trunk/libs/ssb/request.rb

@@ -29 +29 @@
       end
       @term = SSB::Misc.load_terminal_info(in_cookie)
+      @http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
       parse_query(in_query)
     end
@@ -36 +37 @@
                   cgi.query,
                   cgi.cookies)
+    end
+
+    def http_class(http_proxy = nil)
+      return Net::HTTP unless http_proxy
+      uri = URI.parse(http_proxy)
+      user, pass = uri.userinfo.split(/:/) if uri.userinfo
+      address = uri.host.untaint
+      port = uri.port.untaint
+      Net::HTTP.Proxy(address, port, user, pass)
     end
 
@@ -48 +58 @@
     def execute
       response = nil
-      Net::HTTP.start(@uri.host.untaint, @uri.port.untaint) do |http|
+      http_class(@http_proxy).start(@uri.host.untaint, @uri.port.untaint) do |http|
         case method
         when 'GET'

lang/ruby/ssb/trunk/test/request_test.rb

@@ -32 +32 @@
 
   def setup
+    @http_proxy, @HTTP_PROXY = ENV['HTTP_PROXY'], ENV['http_proxy']
+    ENV['HTTP_PROXY'], ENV['http_proxy'] = nil, nil
     @request = SSB::Request.new('GET', request_params, cookie)
+  end
+
+  def teardown
+    ENV['HTTP_PROXY'], ENV['http_proxy'] = @http_proxy, @HTTP_PROXY
   end
 
@@ -121 +127 @@
     mock_server.shutdown
   end
+
+  test 'no proxy' do
+    http_class = @request.http_class
+    connection = http_class.new("http://www.google.com")
+    assert(!connection.proxy?)
+  end
+
+  test 'regular http proxy' do
+    http_class = @request.http_class("http://my.proxy:1234")
+    connection = http_class.new("http://www.google.com")
+    assert(connection.proxy?)
+    assert_equal(connection.proxy_port, 1234)
+    assert_equal(connection.proxy_address, "my.proxy")
+  end
+
+  test 'http proxy with authorization' do
+    http_class = @request.http_class("http://benjamin:secret999@my.proxy:1234")
+    connection = http_class.new("http://www.google.com")
+    assert(connection.proxy?)
+    assert_equal(connection.proxy_user, "benjamin")
+    assert_equal(connection.proxy_pass, "secret999")
+  end
 end
-