rubysspi 0.0.1-i386-mswin32 → 0.0.2-i386-mswin32

data/README.txt

@@ -8,6 +8,18 @@ This project can be found on rubyforge at:
 
 http://rubyforge.org/projects/rubysspi
 
+= Using with rubygems (and other libraries)
+
+If RubyGems is not working because of proxy authorization errors, the rubysspi library can be used to solve the problem. The gem includes a file called <tt>spa.rb</tt> in the root directory. Copy this file to your site_ruby directory and then run the gem script directly:
+
+  ruby -rspa 'C:\Program Files\ruby\gem' 
+
+For example, to list remote gems that match "sspi" this command can be used  
+
+  ruby -rspa 'C:\Program Files\ruby\gem' list --remote sspi
+
+You must copy the <tt></tt> file yourself, however. Rubygems is not able to do it for you on install.
+
 = Using with open-uri
 
 To use the library with open-uri, make sure to set the environment variable +http_proxy+ to your proxy server. This must be a hostname and port in URL form. E.g.:
@@ -16,10 +28,10 @@ To use the library with open-uri, make sure to set the environment variable +htt
   
 The library will grab your current username and domain from the environment variables +USERNAME+ and +USERDOMAIN+. This should be set for you by Windows already.
 
-The library implements a patch on top of Net::HTTP, which means open-uri gets it too. At the top of your script, make sure to require the patch after +open-uri+:
+The library implements a patch on top of Net::HTTP, which means open-uri gets it too. At the top of your script, make sure to require the patch after <tt>open-uri</tt>:
 
-  require +open-uri+
-  require +rubysspi/proxy_auth+
+  require open-uri
+  require rubysspi/proxy_auth
   
   open("http://www.google.com") { |f| puts(f.gets(nil)) }
 
@@ -30,7 +42,7 @@ Note that this patch does NOT work with the +http_proxy_user+ and +http_proxy_pa
 Net::HTTP will not use the proxy server supplied in the environment variable automatically, so you have to supply the proxy address yourself. Otherwise, it's exactly the same:
 
   require 'net/http'
-  require 'rubysspi/proxy_auth+
+  require 'rubysspi/proxy_auth'
   
   Net::HTTP::Proxy("proxy.corp.com", 8080).start("www.google.com") do |http|
     resp = http.request_get "/"

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
 	s.name = "rubysspi"
 	s.summary = "A library which adds implements Ruby bindings to the Win32 SSPI library. Also includes a module to add Negotate authentication support to Net::HTTP."
-	s.version = "0.0.1"
+	s.version = "0.0.2"
 	s.author = "Justin Bailey"
 	s.email = "jgbailey @nospan@ gmail.com"
 	s.homepage = "http://rubyforge.org/projects/rubysspi/"
@@ -22,7 +22,7 @@ is set.
 EOS
 
 	s.platform = Gem::Platform::CURRENT
-	s.files = FileList["lib/**/*", "test/*", "*.txt", "Rakefile"].to_a
+	s.files = FileList["lib/**/*", "test/*", "*.txt", "Rakefile", "spa.rb"].to_a
 
 	s.require_path = "lib"
 	s.autorequire = "rubysspi"

data/lib/rubysspi.rb

@@ -1,4 +1,4 @@
-require 'dl/win32'
+require 'Win32API'
 require 'base64'
 
 # Implements bindings to Win32 SSPI functions, focused on authentication to a proxy server over HTTP.
@@ -24,13 +24,13 @@ module SSPI
   # Win32 API Functions. Uses dl/win32 to bind methods to constants contained in class. 
   module API
     # Can be called with AcquireCredentialsHandle.call()
-    AcquireCredentialsHandle = Win32API.new("secur32", "AcquireCredentialsHandle", ['ppLpppppp'], 'L')
-    # Can be called with AcquireCredentialsHandle.call()
-    InitializeSecurityContext = Win32API.new("secur32", "InitializeSecurityContext", [ 'pppLLLpLpppp'], 'L')
-    # Can be called with AcquireCredentialsHandle.call()
-    DeleteSecurityContext = Win32API.new("secur32", "DeleteSecurityContext", ['P'], 'L')
-    # Can be called with AcquireCredentialsHandle.call()
-    FreeCredentialsHandle = Win32API.new("secur32", "FreeCredentialsHandle", ['P'], 'L')
+    AcquireCredentialsHandle = Win32API.new("secur32", "AcquireCredentialsHandle", 'ppLpppppp', 'L')
+    # Can be called with InitializeSecurityContext.call()
+    InitializeSecurityContext = Win32API.new("secur32", "InitializeSecurityContext", 'pppLLLpLpppp', 'L')
+    # Can be called with DeleteSecurityContext.call()
+    DeleteSecurityContext = Win32API.new("secur32", "DeleteSecurityContext", 'P', 'L')
+    # Can be called with FreeCredentialsHandle.call()
+    FreeCredentialsHandle = Win32API.new("secur32", "FreeCredentialsHandle", 'P', 'L')
   end
   
   # SecHandle struct
@@ -291,7 +291,8 @@ module SSPI
       @credentials = CredHandle.new
       ts = TimeStamp.new
       @identity = Identity.new @user, @domain
-      result = SSPIResult.new(API::AcquireCredentialsHandle.call(nil, "Negotiate", SECPKG_CRED_OUTBOUND, nil, @identity.to_p, nil, nil, @credentials.to_p, ts.to_p))
+      result = SSPIResult.new(API::AcquireCredentialsHandle.call(nil, "Negotiate", SECPKG_CRED_OUTBOUND, nil, @identity.to_p, 
+        nil, nil, @credentials.to_p, ts.to_p))
       raise "Error acquire credentials: #{result}" unless result.ok?
     end
 

data/spa.rb

@@ -0,0 +1,19 @@
+# Copy this file to site_ruby directory to enable inclusion of Negotiate authoritation on arbitrary scripts. 
+# For example, to run gems w/ the library use:
+#
+#  ruby -rspa 'C:\Program Files\ruby\bin\gem'
+#
+# Notice the gem script is executed directly, instead of executing the gem.cmd file.
+#
+
+require 'pathname'
+if (Pathname.new(__FILE__).dirname + "/lib/rubysspi.rb").exist? 
+  # If running directly from root of gem, load rubysspi directly
+  $: << (Pathname.new(__FILE__).dirname + "/lib").to_s
+  require 'rubysspi/proxy_auth'
+else
+  # Production require - must be running from site_ruby. Use rubygems to get
+  # to rubysspi 
+  require 'rubygems'
+  require 'rubysspi/proxy_auth'
+end

data/test/test_gem_list.rb

@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'net/http'
+require 'rubygems'
+$: << (File.dirname(__FILE__) << "/../lib")
+require 'rubysspi/proxy_auth'
+
+class NTLMTest < Test::Unit::TestCase
+  def setup
+    assert ENV["http_proxy"], "http_proxy must be set before running tests."
+  end
+  
+  # Previous implementation of rubysspi used dl/win32 and a
+  # bug occurred when gem list was executed. This tests to ensure
+  # bug does not come back.
+  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"])
+    end
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rubysspi
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-07-14 00:00:00 -07:00
+  version: 0.0.2
+date: 2006-07-17 00:00:00 -07:00
 summary: A library which adds implements Ruby bindings to the Win32 SSPI library. Also includes a module to add Negotate authentication support to Net::HTTP.
 require_paths: 
 - lib
@@ -33,9 +33,11 @@ files:
 - lib/rubysspi.rb
 - lib/rubysspi/proxy_auth.rb
 - test/ruby_sspi_test.rb
+- test/test_gem_list.rb
 - test/test_net_http.rb
 - README.txt
 - Rakefile
+- spa.rb
 test_files: []
 
 rdoc_options: