gssapi 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/gssapi/lib_gssapi.rb

@@ -27,6 +27,8 @@ module GSSAPI
     when /linux/
       # Some Ubuntu ship only with libgssapi_krb5, hence this hackery.
       ffi_lib File.basename Dir.glob("/usr/lib/libgssapi*").sort.first, FFI::Library::LIBC
+    when /darwin/
+      ffi_lib '/usr/lib/libgssapi_krb5.dylib', FFI::Library::LIBC
     when /win/
       ffi_lib 'gssapi32'  # Required the MIT Kerberos libraries to be installed
       ffi_convention :stdcall
@@ -269,15 +271,18 @@ module GSSAPI
     #   min_stat = FFI::MemoryPointer.new :uint32
     # Remember to free the allocated output_message_buffer with gss_release_buffer
     attach_function :gss_wrap, [:pointer, :pointer, :int, :OM_uint32, :pointer, :pointer, :pointer], :OM_uint32
-
-    # OM_uint32 GSSAPI_LIB_FUNCTION gss_wrap_iov(	OM_uint32 * minor_status, gss_ctx_id_t 	context_handle,
-    #   int conf_req_flag, gss_qop_t 	qop_req, int * 	conf_state, gss_iov_buffer_desc * 	iov, int 	iov_count );
-    attach_function :gss_wrap_iov, [:pointer, :pointer, :int, :OM_uint32, :pointer, :pointer, :int], :OM_uint32
-
-    # OM_uint32 GSSAPI_LIB_FUNCTION gss_unwrap_iov ( OM_uint32 * minor_status, gss_ctx_id_t context_handle,
-    #   int * conf_state, gss_qop_t * qop_state, gss_iov_buffer_desc * iov, int iov_count )
-    attach_function :gss_unwrap_iov, [:pointer, :pointer, :pointer, :pointer, :pointer, :int], :OM_uint32
-
+    
+    # Mac version of krb5 does not support *_iov
+    unless RUBY_PLATFORM =~ /darwin/
+      # OM_uint32 GSSAPI_LIB_FUNCTION gss_wrap_iov(	OM_uint32 * minor_status, gss_ctx_id_t 	context_handle,
+      #   int conf_req_flag, gss_qop_t 	qop_req, int * 	conf_state, gss_iov_buffer_desc * 	iov, int 	iov_count );
+      attach_function :gss_wrap_iov, [:pointer, :pointer, :int, :OM_uint32, :pointer, :pointer, :int], :OM_uint32
+
+      # OM_uint32 GSSAPI_LIB_FUNCTION gss_unwrap_iov ( OM_uint32 * minor_status, gss_ctx_id_t context_handle,
+      #   int * conf_state, gss_qop_t * qop_state, gss_iov_buffer_desc * iov, int iov_count )
+      attach_function :gss_unwrap_iov, [:pointer, :pointer, :pointer, :pointer, :pointer, :int], :OM_uint32
+    end
+    
     # TODO: Missing from Heimdal
     # OM_uint32 gss_wrap_aead(OM_uint32 * minor_status, gss_ctx_id_t context_handle, int conf_req_flag, gss_qop_t qop_req, gss_buffer_t input_assoc_buffer,
     #  gss_buffer_t input_payload_buffer, int * conf_state, gss_buffer_t output_message_buffer);

data/lib/gssapi/simple.rb

@@ -23,6 +23,8 @@ module GSSAPI
   #   something a bit more advanced you may want to check out the LibGSSAPI module.
   class Simple
 
+    attr_reader :context
+
     # Initialize a new GSSAPI::Simple object
     # @param [String] host_name the fully qualified host name
     # @param [String] service_name the service name. This can either be in the form svc@example.org 
@@ -43,10 +45,12 @@ module GSSAPI
     def import_name(str)
       buff_str = LibGSSAPI::GssBufferDesc.new
       buff_str.value = str
+      mech = LibGSSAPI::GssOID.gss_c_no_oid
+      #mech = LibGSSAPI.GSS_C_NT_HOSTBASED_SERVICE
       name = FFI::MemoryPointer.new :pointer # gss_name_t
       min_stat = FFI::MemoryPointer.new :uint32
 
-      maj_stat = LibGSSAPI.gss_import_name(min_stat, buff_str.pointer, LibGSSAPI.GSS_C_NT_HOSTBASED_SERVICE, name)
+      maj_stat = LibGSSAPI.gss_import_name(min_stat, buff_str.pointer, mech, name)
       raise GssApiError, "gss_import_name did not return GSS_S_COMPLETE.  Error code: maj: #{maj_stat}, min: #{min_stat.read_int}" if maj_stat != 0
 
       LibGSSAPI::GssNameT.new(name.get_pointer(0))
@@ -139,26 +143,26 @@ module GSSAPI
 
     # Acquire security credentials. This does not log you in. It grabs the credentials from a cred cache or keytab.
     # @param [Hash] opts options to pass to the gss_acquire_cred function.
-    # @option opts [String] :usage The credential usage type ('accept', 'initiate', 'both').  It defaults to 'accept' since
+    # @option opts [String] :usage The credential usage type (:accept, :initiate, :both).  It defaults to 'accept' since
     #   this method is most usually called on the server only.
     # @return [true] It will return true if everything succeeds and the @scred variable will be set for future methods. If
     #   an error ocurrs an exception will be raised.
-    def acquire_credentials(opts = {:usage => 'accept'})
+    def acquire_credentials(princ = @int_svc_name, opts = {:usage => :accept})
       min_stat = FFI::MemoryPointer.new :uint32
       scred = FFI::MemoryPointer.new :pointer
 
       case opts[:usage]
-      when 'accept'
+      when :accept
         usage = LibGSSAPI::GSS_C_ACCEPT
-      when 'initiate'
+      when :initiate
         usage = LibGSSAPI::GSS_C_INITIATE
-      when 'both'
+      when :both
         usage = LibGSSAPI::GSS_C_BOTH
       else
         raise GssApiError, "Bad option passed to #{self.class.name}#acquire_credentials"
       end
 
-      maj_stat = LibGSSAPI.gss_acquire_cred(min_stat, @int_svc_name, 0, LibGSSAPI::GSS_C_NO_OID_SET, usage, scred, nil, nil)
+      maj_stat = LibGSSAPI.gss_acquire_cred(min_stat, princ, 0, LibGSSAPI::GSS_C_NO_OID_SET, usage, scred, nil, nil)
       raise GssApiError, "gss_acquire_cred did not return GSS_S_COMPLETE.  Error code: maj: #{maj_stat}, min: #{min_stat.read_int}" if maj_stat != 0
 
       @scred = LibGSSAPI::GssCredIdT.new(scred.get_pointer(0))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Dan Wanek
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -06:00
+date: 2011-01-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency