rubysspi 1.0.0-i386-mswin32 → 1.0.3-i386-mswin32

data/Rakefile

@@ -1,11 +1,12 @@
 require 'rubygems'
 Gem::manage_gems
 require 'rake/gempackagetask'
+require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
 	s.name = "rubysspi"
 	s.summary = "A library which implements Ruby bindings to the Win32 SSPI library. Also includes a module to add Negotate authentication support to Net::HTTP."
-	s.version = "1.0.0"
+	s.version = "1.0.3"
 	s.author = "Justin Bailey"
 	s.email = "jgbailey @nospam@ gmail.com"
 	s.homepage = "http://rubyforge.org/projects/rubysspi/"

data/lib/rubysspi/proxy_auth.rb

@@ -1,7 +1,6 @@
 require 'net/http'
 require 'rubysspi'
 
-
 module Net 
   # Replaces Net::HTTP.request to understand Negotiate HTTP proxy authorization. Uses native Win32
   # libraries to authentic as the current user (as defined by the ENV["USERNAME"] and ENV["USERDOMAIN"]
@@ -28,20 +27,28 @@ module Net
         end while res.kind_of?(HTTPContinue)
         # If proxy was specified, and the server is demanding authentication, negotiate with it
         if res.kind_of?(HTTPProxyAuthenticationRequired) && proxy? && res["Proxy-Authenticate"].include?("Negotiate")
-          n = SSPI::NegotiateAuth.new
-          res.reading_body(@socket, req.response_body_permitted?) { }
-          req["Proxy-Authorization"] = "Negotiate #{n.get_initial_token}"
-          req.exec @socket, @curr_http_version, edit_path(req.path)
           begin
-            res = HTTPResponse.read_new(@socket)
-          end while res.kind_of?(HTTPContinue)
-          if res["Proxy-Authenticate"]
+            n = SSPI::NegotiateAuth.new
             res.reading_body(@socket, req.response_body_permitted?) { }
-            req["Proxy-Authorization"] = "Negotiate #{n.complete_authentication res["Proxy-Authenticate"]}"
+            end_transport req, res
+            begin_transport req
+            req["Proxy-Authorization"] = "Negotiate #{n.get_initial_token}"
             req.exec @socket, @curr_http_version, edit_path(req.path)
             begin
               res = HTTPResponse.read_new(@socket)
             end while res.kind_of?(HTTPContinue)
+            if res["Proxy-Authenticate"]
+              res.reading_body(@socket, req.response_body_permitted?) { }
+              req["Proxy-Authorization"] = "Negotiate #{n.complete_authentication res["Proxy-Authenticate"]}"
+              req.exec @socket, @curr_http_version, edit_path(req.path)
+              begin
+                res = HTTPResponse.read_new(@socket)
+              end while res.kind_of?(HTTPContinue)
+            end
+          rescue
+            exc = $!.exception("Error occurred during proxy negotiation. socket.io: #{@socket.inspect}; socket.closed? #{@socket.closed?}; req: #{req.inspect}; res: #{res.inspect}; Original message: #{$!.message}")
+            exc.set_backtrace $!.backtrace
+            raise exc
           end
         end
         res.reading_body(@socket, req.response_body_permitted?) {

data/test/ruby_sspi_test.rb

@@ -15,9 +15,11 @@ class NTLMTest < Test::Unit::TestCase
       nego_auth = SSPI::NegotiateAuth.new 
       sr = http.request_get "/", { "Proxy-Authorization" => "Negotiate " + nego_auth.get_initial_token }
       resp = http.get "/", { "Proxy-Authorization" => "Negotiate " + nego_auth.complete_authentication(sr["Proxy-Authenticate"].split(" ").last.strip) }
-      assert resp.code.to_i == 200, "Resposne code not as expected: #{resp.inspect}"
+      # Google redirects to country of origins domain if not US.
+      assert success_or_redirect(resp.code), "Response code not as expected: #{resp.inspect}"
       resp = http.get "/foobar.html"
-      assert resp.code.to_i == 404, "Response code not as expected: #{resp.inspect}"
+      # Some proxy servers don't return 404 but 407.
+      assert(resp.code.to_i == 404 || resp.code.to_i == 407, "Response code not as expected: #{resp.inspect}")
     end
   end
   
@@ -26,7 +28,7 @@ class NTLMTest < Test::Unit::TestCase
     
     Net::HTTP.Proxy(proxy.host, proxy.port).start("www.google.com") do |http|
       resp = SSPI::NegotiateAuth.proxy_auth_get http, "/"
-      assert resp.code.to_i == 200, "Response code not as expected: #{resp.inspect}"
+      assert success_or_redirect(resp.code), "Response code not as expected: #{resp.inspect}"
     end
   end
   
@@ -37,7 +39,7 @@ class NTLMTest < Test::Unit::TestCase
       nego_auth = SSPI::NegotiateAuth.new 
       sr = http.request_get "/", { "Proxy-Authorization" => "Negotiate " + nego_auth.get_initial_token }
       resp = http.get "/", { "Proxy-Authorization" => "Negotiate " + nego_auth.complete_authentication(sr["Proxy-Authenticate"].split(" ").last.strip) }
-      assert resp.code.to_i == 200, "Response code not as expected: #{resp.inspect}"
+      assert success_or_redirect(resp.code), "Response code not as expected: #{resp.inspect}"
       assert_raises(RuntimeError, "Should not be able to call complete_authentication again") do
         nego_auth.complete_authentication "foo"
       end
@@ -54,7 +56,7 @@ class NTLMTest < Test::Unit::TestCase
       token = Base64.decode64(sr["Proxy-Authenticate"].split(" ").last.strip)
       completed_token = nego_auth.complete_authentication(token)
       resp = http.get "/", { "Proxy-Authorization" => "Negotiate " + completed_token }
-      assert resp.code.to_i == 200, "Response code not as expected: #{resp.inspect}"
+      assert success_or_redirect(resp.code), "Response code not as expected: #{resp.inspect}"
     end
 
     # Test that token w/ "Negotiate" header included works
@@ -62,7 +64,7 @@ class NTLMTest < Test::Unit::TestCase
       nego_auth = SSPI::NegotiateAuth.new 
       sr = http.request_get "/", { "Proxy-Authorization" => "Negotiate " + nego_auth.get_initial_token }
       resp = http.get "/", { "Proxy-Authorization" => "Negotiate " + nego_auth.complete_authentication(sr["Proxy-Authenticate"]) }
-      assert resp.code.to_i == 200, "Response code not as expected: #{resp.inspect}"
+      assert success_or_redirect(resp.code), "Response code not as expected: #{resp.inspect}"
     end
   end
   
@@ -77,4 +79,9 @@ private
     return proxy
   end
   
+  # Returns true if code given is 200 or 302. I.e. if HTTP request was successful or resulted in redirect.
+  def success_or_redirect(code)
+    code.to_i == 200 || code.to_i == 302
+  end
+  
 end

data/test/test_gem_list.rb

@@ -15,7 +15,7 @@ class NTLMTest < Test::Unit::TestCase
   def test_gem_list
     Gem.manage_gems
     assert_nothing_raised "'gem list --remote rubysspi' failed to execute"  do
-      Gem::GemRunner.new.run(["list", "--remote", "rubysspi"])
+      Gem::GemRunner.new.run(%w(list rubysspi --remote --http-proxy ))
     end
   end
 end

data/test/test_net_http.rb

@@ -1,3 +1,5 @@
+DISABLE_RUBY_SSPI_PATCH = true
+
 require 'test/unit'
 require 'net/http'
 require 'pathname'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rubysspi
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-09-28 00:00:00 -07:00
+  version: 1.0.3
+date: 2006-10-16 00:00:00 -07:00
 summary: A library which implements Ruby bindings to the Win32 SSPI library. Also includes a module to add Negotate authentication support to Net::HTTP.
 require_paths: 
 - lib