rubysspi 1.2.3 → 1.2.4

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+== 1.2.4
+ * Compatibility updates for rubygems 1.2.0
+ 
 == 1.2.2
  * Fixed incompatibility with RubyGems >= 0.9.2 and RubySSPI Net::HTTP patch. Patch now directly requires the SSPI files, rather than relying on RubyGems to load it.
  * Updated gem tests for compatibility with RubyGems >= 0.9.2.

data/Rakefile

@@ -6,7 +6,7 @@ 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 Negotiate authentication support to Net::HTTP."
-	s.version = "1.2.3"
+	s.version = "1.2.4"
 	s.author = "Justin Bailey"
 	s.email = "jgbailey @nospam@ gmail.com"
 	s.homepage = "http://rubyforge.org/projects/rubysspi/"

data/bin/apply_sspi_patch

@@ -62,7 +62,7 @@ unless spec
 	exit
 end
 
-gem_path = Pathname.new(spec.full_gem_path) + spec.require_path
+gem_path = Pathname.new(spec.full_gem_path) + "lib"
 
 # Write patch file. 
 puts "Creating patch file to replace #{orig_file}"

data/lib/win32/sspi/http_proxy_patch.rb

@@ -30,6 +30,27 @@ module Net
 		# Suppress warnings about redefining request
 		@old_verbose = $VERBOSE
 		$VERBOSE = nil
+
+    # Determines if authorization is required and returns
+    # the expected type ("NTLM" or "Negotiate"). Otherwise,
+    # returns nil.
+		def sspi_auth_required?(res)
+      header = 
+        if proxy? && res.kind_of?(HTTPProxyAuthenticationRequired)
+          "Proxy-Authenticate"
+        elsif res.kind_of?(HTTPUnauthorized)
+          "WWW-Authenticate"
+        else
+          nil
+        end
+        
+      if header
+        # Critical to start with Negotiate. NTLM is fallback.
+        ["Negotiate", "NTLM"].find { |tok| res[header].include? tok }
+      else
+        nil
+      end
+		end
 		
     def request(req, body = nil, &block) # :yield: +response+
       unless started?
@@ -50,37 +71,46 @@ module Net
         begin
           res = HTTPResponse.read_new(@socket)
         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")
+        if tok = sspi_auth_required?(res)
           begin
             n = Win32::SSPI::NegotiateAuth.new
             res.reading_body(@socket, req.response_body_permitted?) { }
             end_transport req, res
             begin_transport req
-            req["Proxy-Authorization"] = "Negotiate #{n.get_initial_token}"
+            if proxy?
+              req["Proxy-Authorization"] = "#{tok} #{n.get_initial_token}"
+              req["Proxy-Connection"] = "Keep-Alive"
+            else
+              req["Authorization"] = "#{tok} #{n.get_initial_token}"
+            end
             # Some versions of ISA will close the connection if this isn't present.
             req["Connection"] = "Keep-Alive"
-            req["Proxy-Connection"] = "Keep-Alive"
             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"]
+            if (proxy? && res["Proxy-Authenticate"]) || (! proxy? && res["WWW-Authenticate"])
               res.reading_body(@socket, req.response_body_permitted?) { }
-              req["Proxy-Authorization"] = "Negotiate #{n.complete_authentication res["Proxy-Authenticate"]}"
+              if proxy?
+                req["Proxy-Authorization"] = "#{tok} #{n.complete_authentication res["Proxy-Authenticate"]}"
+                req["Proxy-Connection"] = "Keep-Alive"
+              else
+                token = res["WWW-Authenticate"].split(" ").last
+                req["Authorization"] = "#{tok} #{n.complete_authentication token}"
+              end
               req["Connection"] = "Keep-Alive"
-              req["Proxy-Connection"] = "Keep-Alive"
               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 = $!.exception("Error occurred during proxy negotiation. req: #{req["Proxy-Authorization"].inspect}; res: #{res.inspect}; Original message: #{$!.message}")
             exc.set_backtrace $!.backtrace
             raise exc
           end
         end
+
         res.reading_body(@socket, req.response_body_permitted?) {
           yield res if block_given?
         }

data/test/test_gem_list.rb

@@ -10,6 +10,13 @@
 # Ruby Distribution License or GNU General Public License.
 #
 
+# Ruby gems > 0.9 loads patch automatically so DISABLE_RUBY_SSPI_PATCH doesn't do any good.
+# Therefore, need to ensure ruby gems isn't loaded automatically.
+if ENV["RUBYOPT"]
+	puts "Unset RUBYOPT environment variable before running these tests."
+	exit!
+end
+
 # Magic constant will ensure that, if the SSPI patch has been applied, it won't break these tests
 DISABLE_RUBY_SSPI_PATCH = true
 
@@ -28,16 +35,24 @@ class NTLMTest < Test::Unit::TestCase
   # bug occurred when gem list was executed. This tests to ensure
   # bug does not come back.
   def test_gem_list
-		Gem.manage_gems
 		
-		if Gem::Version.new(Gem::RubyGemsVersion) < Gem::Version.new("0.9.2")
-			assert_nothing_raised "'gem list --remote rubysspi' failed to execute"  do
-				Gem::GemRunner.new.run(%w(list rubysspi --remote --http-proxy ))
+		if Gem::Version.new(Gem::RubyGemsVersion) < Gem::Version.new("1.2")
+			Gem.manage_gems
+			if Gem::Version.new(Gem::RubyGemsVersion) < Gem::Version.new("0.9.2")
+				assert_nothing_raised "'gem list --remote rubysspi' failed to execute"  do
+					Gem::GemRunner.new.run(%w(list rubysspi --remote --http-proxy ))
+				end
+			else 
+				# --http-proxy  option not needed after 0.9.2 (at least)
+				assert_nothing_raised "'gem list --remote rubysspi' failed to execute"  do
+					Gem::GemRunner.new.run(%w(list rubysspi --remote))
+				end
 			end
-		elsif Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new("0.9.2")
-			# --http-proxy  option not needed after 0.9.2 (at least)
+		elsif Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new("1.2")
+			require 'rubygems/command_manager'
+			# Gem::GemRunner not used after 1.2
 			assert_nothing_raised "'gem list --remote rubysspi' failed to execute"  do
-				Gem::GemRunner.new.run(%w(list rubysspi --remote))
+				Gem::CommandManager.instance.run(%w(list rubysspi --remote))
 			end
 		end
   end

data/test/test_net_http.rb

@@ -10,6 +10,13 @@
 # Ruby Distribution License or GNU General Public License.
 #
 
+# Ruby gems > 0.9 loads patch automatically so DISABLE_RUBY_SSPI_PATCH doesn't do any good.
+# Therefore, need to ensure ruby gems isn't loaded automatically.
+if ENV["RUBYOPT"]
+	puts "Unset RUBYOPT environment variable before running these tests."
+	exit!
+end
+
 DISABLE_RUBY_SSPI_PATCH = true
 
 require 'test/unit'

metadata

@@ -1,33 +1,28 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: rubysspi
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
-date: 2007-07-10 00:00:00 -07:00
-summary: A library which implements Ruby bindings to the Win32 SSPI library. Also includes a module to add Negotiate authentication support to Net::HTTP.
-require_paths: 
-- lib
-email: jgbailey @nospam@ gmail.com
-homepage: http://rubyforge.org/projects/rubysspi/
-rubyforge_project: http://rubyforge.org/projects/rubysspi/
-description: This gem provides bindings to the Win32 SSPI libraries, primarily to support Negotiate (i.e. SPNEGO, NTLM) authentication with a proxy server. Enough support is implemented to provide the necessary support for the authentication.  A module is also provided which overrides Net::HTTP and adds support for Negotiate authentication to it.  This implies that open-uri automatically gets support for it, as long as the http_proxy environment variable is set.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.2.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Justin Bailey
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-08-01 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: This gem provides bindings to the Win32 SSPI libraries, primarily to support Negotiate (i.e. SPNEGO, NTLM) authentication with a proxy server. Enough support is implemented to provide the necessary support for the authentication.  A module is also provided which overrides Net::HTTP and adds support for Negotiate authentication to it.  This implies that open-uri automatically gets support for it, as long as the http_proxy environment variable is set.
+email: jgbailey @nospam@ gmail.com
+executables: 
+- apply_sspi_patch
+extensions: []
+
+extra_rdoc_files: 
+- README.txt
+- CHANGELOG.txt
+- LICENSE.txt
 files: 
 - lib/win32
 - lib/win32/sspi
@@ -43,23 +38,35 @@ files:
 - README.txt
 - Rakefile
 - spa.rb
-test_files: []
-
+has_rdoc: true
+homepage: http://rubyforge.org/projects/rubysspi/
+post_install_message: 
 rdoc_options: 
 - --title
 - Ruby SSPI -- Win32 SSPI Bindings for Ruby
 - --main
 - README.txt
 - --line-numbers
-extra_rdoc_files: 
-- README.txt
-- CHANGELOG.txt
-- LICENSE.txt
-executables: 
-- apply_sspi_patch
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: http://rubyforge.org/projects/rubysspi/
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A library which implements Ruby bindings to the Win32 SSPI library. Also includes a module to add Negotiate authentication support to Net::HTTP.
+test_files: []