gssapi 0.1.5 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.1.5
+1.0.0

data/lib/gssapi.rb

@@ -17,6 +17,15 @@
 # You should have received a copy of the GNU General Public License along
 # with GSSAPI.  If not, see <http://www.gnu.org/licenses/>.
 #############################################################################
+require 'ffi'
+module GSSAPI
+  module LibGSSAPI
+    extend FFI::Library
+
+    GSSAPI_LIB_TYPE = :mit unless defined?(GSSAPI_LIB_TYPE)
+  end
+end
+
 require 'gssapi/exceptions'
 require 'gssapi/lib_gssapi'
 require 'gssapi/simple'

data/lib/gssapi/heimdal.rb

@@ -0,0 +1,24 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dan.wanek@gmail.com>
+#
+#
+# This file is part of the Ruby GSSAPI library.
+# 
+# GSSAPI is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# GSSAPI is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with GSSAPI.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+module GSSAPI
+  module LibGSSAPI
+    GSSAPI_LIB_TYPE = :heimdal
+  end
+end

data/lib/gssapi/lib_gssapi.rb

@@ -17,38 +17,20 @@
 # You should have received a copy of the GNU General Public License along
 # with GSSAPI.  If not, see <http://www.gnu.org/licenses/>.
 #############################################################################
-require 'ffi'
-
+require 'gssapi/lib_gssapi_loader'
 module GSSAPI
   module LibGSSAPI
-    extend FFI::Library
-    
-    case RUBY_PLATFORM
-    when /linux/
-      # Some Ubuntu ship only with libgssapi_krb5, hence this hackery.
-      # MIT is the only supported GSSAPI/Kerberos library at this time.
-      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
-    else
-      raise LoadError, "This platform (#{RUBY_PLATFORM}) is not supported by ruby gssapi."
-    end
 
     # Libc functions
 
     # void *malloc(size_t size);
-    attach_function :malloc, [:size_t], :pointer
+    attach_function :malloc, [:uint32], :pointer
 
     # void *memcpy(void *dest, const void *src, size_t n);
-    attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
-
+    attach_function :memcpy, [:pointer, :pointer, :uint32], :pointer
 
     typedef :uint32, :OM_uint32
 
-
     class GssOID < FFI::Struct
       layout  :length   =>  :OM_uint32,
         :elements => :pointer # pointer of :void
@@ -138,7 +120,7 @@ module GSSAPI
           self[:length] = val.length
           self[:value] = buff
         elsif(val.is_a?(Fixnum))
-          buff = FFI::MemoryPointer.new :uint32
+          buff = FFI::MemoryPointer.new :OM_uint32
           buff.write_int val
           self[:length] = val.to_s.length
           self[:value] = buff
@@ -164,7 +146,7 @@ module GSSAPI
 
       def self.release(ptr)
         puts "Releasing ManagedGssBufferDesc at #{ptr.address.to_s(16)}" if $DEBUG
-        min_stat = FFI::MemoryPointer.new :uint32
+        min_stat = FFI::MemoryPointer.new :OM_uint32
         maj_stat = LibGSSAPI.gss_release_buffer(min_stat, ptr)
       end
     end
@@ -214,14 +196,14 @@ module GSSAPI
     class GssNameT < GssPointer
       def self.release_ptr(name_ptr)
         puts "Releasing gss_name_t at #{name_ptr.address.to_s(16)}" if $DEBUG
-        min_stat = FFI::MemoryPointer.new :uint32
+        min_stat = FFI::MemoryPointer.new :OM_uint32
         maj_stat = LibGSSAPI.gss_release_name(min_stat, name_ptr)
       end
     end
 
     class GssCtxIdT < GssPointer
       def self.release_ptr(context_ptr)
-        min_stat = FFI::MemoryPointer.new :uint32
+        min_stat = FFI::MemoryPointer.new :OM_uint32
         # FIXME: change to GSS_C_NO_BUFFER
         empty_buff = LibGSSAPI::UnManagedGssBufferDesc.new
         empty_buff[:length] = 0
@@ -237,7 +219,7 @@ module GSSAPI
     # gss_cred_id_t
     class GssCredIdT < GssPointer
       def self.release_ptr(cred_ptr)
-        min_stat = FFI::MemoryPointer.new :uint32
+        min_stat = FFI::MemoryPointer.new :OM_uint32
         maj_stat = LibGSSAPI.gss_release_cred(min_stat, cred_ptr)
       end
     end
@@ -255,7 +237,7 @@ module GSSAPI
     #   buff_str[:length] = host_str.length
     #   buff_str[:value] = FFI::MemoryPointer.from_string(host_str)
     #   name = FFI::MemoryPointer.new :pointer # gss_name_t
-    #   min_stat = FFI::MemoryPointer.new :uint32
+    #   min_stat = FFI::MemoryPointer.new :OM_uint32
     #   maj_stat = GSSAPI::LibGSSAPI.gss_import_name(min_stat, buff_str.pointer, GSSAPI::LibGSSAPI.GSS_C_NT_HOSTBASED_SERVICE, name)
     #   name = name.get_pointer(0)
     # Remember to free the allocated name (gss_name_t) space with gss_release_name
@@ -267,27 +249,30 @@ module GSSAPI
     # OM_uint32 gss_canonicalize_name(OM_uint32 * minor_status, const gss_name_t input_name, const gss_OID mech_type, gss_name_t * output_name)
     attach_function :gss_canonicalize_name, [:pointer, :pointer, :pointer, :pointer], :OM_uint32
 
-    # OM_uint32 gss_oid_to_str(OM_uint32 *minor_status, const gss_OID oid, gss_buffer_t oid_str);
-    # @example:
-    #   min_stat = FFI::MemoryPointer.new :uint32
-    #   oidstr = GSSAPI::LibGSSAPI::ManagedGssBufferDesc.new
-    #   maj_stat = GSSAPI::LibGSSAPI.gss_oid_to_str(min_stat, GSSAPI::LibGSSAPI.GSS_C_NT_HOSTBASED_SERVICE, oidstr.pointer)
-    #   oidstr[:value].read_string
-    attach_function :gss_oid_to_str, [:pointer, :pointer, :pointer], :OM_uint32
-
-    # TODO: Missing from Heimdal
-    # OM_uint32 gss_str_to_oid(OM_uint32 *minor_status, const gss_buffer_t oid_str, gss_OID *oid);
-    # @example: Simulate GSS_C_NT_HOSTBASED_SERVICE
-    #   min_stat = FFI::MemoryPointer.new :uint32
-    #   str = "{ 1 2 840 113554 1 2 1 4 }"
-    #   oidstr = GSSAPI::LibGSSAPI::UnManagedGssBufferDesc.new
-    #   oidstr[:length] = str.length
-    #   oidstr[:value] = FFI::MemoryPointer.from_string str
-    #   oid = FFI::MemoryPointer.new :pointer
-    #   min_stat = FFI::MemoryPointer.new :uint32
-    #   maj_stat = GSSAPI::LibGSSAPI.gss_str_to_oid(min_stat, oidstr.pointer, oid)
-    #   oid = GSSAPI::LibGSSAPI::GssOID.new(oid.get_pointer(0))
-    #attach_function :gss_str_to_oid, [:pointer, :pointer, :pointer], :OM_uint32
+    begin
+      # OM_uint32 gss_oid_to_str(OM_uint32 *minor_status, const gss_OID oid, gss_buffer_t oid_str);
+      # @example:
+      #   min_stat = FFI::MemoryPointer.new :OM_uint32
+      #   oidstr = GSSAPI::LibGSSAPI::ManagedGssBufferDesc.new
+      #   maj_stat = GSSAPI::LibGSSAPI.gss_oid_to_str(min_stat, GSSAPI::LibGSSAPI.GSS_C_NT_HOSTBASED_SERVICE, oidstr.pointer)
+      #   oidstr[:value].read_string
+      attach_function :gss_oid_to_str, [:pointer, :pointer, :pointer], :OM_uint32
+
+      # OM_uint32 gss_str_to_oid(OM_uint32 *minor_status, const gss_buffer_t oid_str, gss_OID *oid);
+      # @example: Simulate GSS_C_NT_HOSTBASED_SERVICE
+      #   min_stat = FFI::MemoryPointer.new :OM_uint32
+      #   str = "{ 1 2 840 113554 1 2 1 4 }"
+      #   oidstr = GSSAPI::LibGSSAPI::UnManagedGssBufferDesc.new
+      #   oidstr[:length] = str.length
+      #   oidstr[:value] = FFI::MemoryPointer.from_string str
+      #   oid = FFI::MemoryPointer.new :pointer
+      #   min_stat = FFI::MemoryPointer.new :OM_uint32
+      #   maj_stat = GSSAPI::LibGSSAPI.gss_str_to_oid(min_stat, oidstr.pointer, oid)
+      #   oid = GSSAPI::LibGSSAPI::GssOID.new(oid.get_pointer(0))
+      attach_function :gss_str_to_oid, [:pointer, :pointer, :pointer], :OM_uint32
+    rescue FFI::NotFoundError => ex
+      warn "WARNING: Could not load OID conversion methods. Check your GSSAPI C library for an update"
+    end
 
     # OM_uint32  gss_init_sec_context(OM_uint32  *  minor_status, const gss_cred_id_t initiator_cred_handle,
     #   gss_ctx_id_t * context_handle, const gss_name_t target_name, const gss_OID mech_type, OM_uint32 req_flags,
@@ -307,30 +292,44 @@ module GSSAPI
     # OM_uint32  gss_wrap(OM_uint32  *  minor_status, const gss_ctx_id_t context_handle, int conf_req_flag,
     #   gss_qop_t qop_req, const gss_buffer_t input_message_buffer, int * conf_state, gss_buffer_t output_message_buffer);
     # @example:
-    #   min_stat = FFI::MemoryPointer.new :uint32
+    #   min_stat = FFI::MemoryPointer.new :OM_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
     
-    # 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 );
+    # Some versions of GSSAPI might not have support for IOV yet.
+    begin
+      # 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
+
+      # OM_uint32 GSSAPI_LIB_CALL gss_wrap_iov_length ( 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_length, [:pointer, :pointer, :int, :OM_uint32, :pointer, :pointer, :int], :OM_uint32
+    rescue FFI::NotFoundError => ex
+      warn "WARNING: Could not load IOV methods. Check your GSSAPI C library for an update"
     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);
-    #attach_function :gss_wrap_aead, [:pointer, :pointer, :int, :OM_uint32, :pointer, :pointer, :pointer, :pointer], :OM_uint32
+    begin
+      # 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);
+      attach_function :gss_wrap_aead, [:pointer, :pointer, :int, :OM_uint32, :pointer, :pointer, :pointer, :pointer], :OM_uint32
+
+      # OM_uint32 gss_unwrap_aead(OM_uint32 * minor_status, gss_ctx_id_t context_handle, gss_buffer_t input_message_buffer,
+      #   gss_buffer_t input_assoc_buffer, gss_buffer_t output_payload_buffer, int * conf_state, gss_qop_t * qop_state);
+      attach_function :gss_unwrap_aead, [:pointer,:pointer,:pointer,:pointer,:pointer,:pointer,:pointer], :OM_uint32
+    rescue FFI::NotFoundError => ex
+      warn "WARNING: Could not load AEAD methods. Check your GSSAPI C library for an update"
+    end
 
     # OM_uint32  gss_unwrap(OM_uint32  *  minor_status, const gss_ctx_id_t context_handle,
     #   const gss_buffer_t input_message_buffer, gss_buffer_t output_message_buffer, int * conf_state, gss_qop_t * qop_state);
     # @example:
-    #   min_stat = FFI::MemoryPointer.new :uint32
+    #   min_stat = FFI::MemoryPointer.new :OM_uint32
     # Remember to free the allocated output_message_buffer with gss_release_buffer
     attach_function :gss_unwrap, [:pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :OM_uint32
 

data/lib/gssapi/lib_gssapi_loader.rb

@@ -0,0 +1,53 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dan.wanek@gmail.com>
+#
+#
+# This file is part of the Ruby GSSAPI library.
+# 
+# GSSAPI is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# GSSAPI is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with GSSAPI.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+module GSSAPI
+  module LibGSSAPI
+
+    # Heimdal supported the *_iov functions befor MIT did so in some OS distributions if
+    # you need IOV support and MIT does not provide it try the Heimdal libs and then
+    # before doing a "require 'gssapi'" do a "require 'gssapi/heimdal'" and that will attempt
+    # to load the Heimdal libs
+    case RUBY_PLATFORM
+    when /linux/
+      case GSSAPI_LIB_TYPE
+      when :mit
+        GSSAPI_LIB = 'libgssapi_krb5.so.2'
+      when :heimdal
+        GSSAPI_LIB = 'libgssapi.so.2'
+      end
+      ffi_lib GSSAPI_LIB, FFI::Library::LIBC
+    when /darwin/
+      case GSSAPI_LIB_TYPE
+      when :mit
+        GSSAPI_LIB = '/usr/lib/libgssapi_krb5.dylib'
+      when :heimdal
+        # use Heimdal Kerberos since Mac MIT Kerberos is OLD. Do a "require 'gssapi/heimdal'" first
+        GSSAPI_LIB = '/usr/heimdal/lib/libgssapi.dylib'
+      end
+      ffi_lib GSSAPI_LIB, FFI::Library::LIBC
+    when /mswin|mingw32|windows/
+      ffi_lib 'gssapi32'  # Required the MIT Kerberos libraries to be installed
+      ffi_convention :stdcall
+    else
+      raise LoadError, "This platform (#{RUBY_PLATFORM}) is not supported by ruby gssapi."
+    end
+
+  end
+end

data/lib/gssapi/simple.rb

@@ -73,7 +73,7 @@ module GSSAPI
       if(opts[:flags])
         flags = opts[:flags]
       else
-        flags = (LibGSSAPI::GSS_C_MUTUAL_FLAG | LibGSSAPI::GSS_C_SEQUENCE_FLAG)
+        flags = (LibGSSAPI::GSS_C_MUTUAL_FLAG | LibGSSAPI::GSS_C_SEQUENCE_FLAG | LibGSSAPI::GSS_C_CONF_FLAG | LibGSSAPI::GSS_C_INTEG_FLAG)
         flags |= LibGSSAPI::GSS_C_DELEG_FLAG  if opts[:delegate]
         flags |= LibGSSAPI::GSS_C_DELEG_POLICY_FLAG  if opts[:delegate]
       end

metadata

@@ -2,7 +2,7 @@
 name: gssapi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 1.0.0
 platform: ruby
 authors: 
 - Dan Wanek
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -06:00
+date: 2011-04-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,9 @@ files:
 - gssapi.gemspec
 - lib/gssapi.rb
 - lib/gssapi/exceptions.rb
+- lib/gssapi/heimdal.rb
 - lib/gssapi/lib_gssapi.rb
+- lib/gssapi/lib_gssapi_loader.rb
 - lib/gssapi/simple.rb
 - preamble
 has_rdoc: true