gssapi 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/gssapi/exceptions.rb

@@ -11,6 +11,14 @@ module GSSAPI
     def message; to_s + ": " + @s; end
 
     def initialize(maj_stat = nil, min_stat = nil)
+
+      # If raised as class (raise GssApiError, "msg) the error message is given
+      # as the first parameter.
+      if maj_stat.class == String
+        @s = maj_stat
+        return super maj_stat
+      end
+
       if(maj_stat.nil? && min_stat.nil?)
         @s = '(no error info)'
       else

data/lib/gssapi/lib_gssapi.rb

@@ -257,6 +257,9 @@ module GSSAPI
     #   gss_buffer_t output_token, OM_uint32 *ret_flags, OM_uint32 *time_rec, gss_cred_id_t *delegated_cred_handle);
     attach_function :gss_accept_sec_context, [:pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :OM_uint32
 
+    # OM_uint32 gss_display_name(OM_uint32 * minor_status, gss_name_t input_name, gss_buffer_t output_name_buffer, gss_OID * output_name_type);
+    attach_function :gss_display_name, [:pointer, :pointer, :pointer, :pointer], :OM_uint32
+
     # OM_uint32 gss_acquire_cred(OM_uint32 *minor_status, const gss_name_t desired_name, OM_uint32 time_req, const gss_OID_set desired_mechs,
     #   gss_cred_usage_t cred_usage, gss_cred_id_t *output_cred_handle, gss_OID_set *actual_mechs, OM_uint32 *time_rec);
     attach_function :gss_acquire_cred, [:pointer, :pointer, :OM_uint32, :pointer, :OM_uint32, :pointer, :pointer, :pointer], :OM_uint32

data/lib/gssapi/simple.rb

@@ -107,7 +107,7 @@ module GSSAPI
       min_stat = FFI::MemoryPointer.new :OM_uint32
       ctx = (@context.nil? ? LibGSSAPI::GssCtxIdT.gss_c_no_context.address_of : @context.address_of)
       no_chn_bind = LibGSSAPI::GSS_C_NO_CHANNEL_BINDINGS
-      client = FFI::MemoryPointer.new :pointer  # Will hold the initiating client name after the call
+      @client = FFI::MemoryPointer.new :pointer  # Will hold the initiating client name after the call
       mech = FFI::MemoryPointer.new :pointer  # Will hold the mech being used after the call
       in_tok = GSSAPI::LibGSSAPI::UnManagedGssBufferDesc.new
       in_tok.value = in_token
@@ -119,7 +119,7 @@ module GSSAPI
                                                   @scred,
                                                   in_tok.pointer,
                                                   no_chn_bind,
-                                                  client,
+                                                  @client,
                                                   mech,
                                                   out_tok.pointer,
                                                   ret_flags,
@@ -131,6 +131,26 @@ module GSSAPI
       out_tok.length > 0 ? out_tok.value : true
     end
 
+    # Get textual representation of internal GSS name
+    # @return [String] textual representation of internal GSS name
+    def display_name
+      raise GssApiError.new(), "No context accepted yet. Call #{self.class.name}#accept_context(in_token) first" if @client.nil?
+
+      output_name = GSSAPI::LibGSSAPI::ManagedGssBufferDesc.new
+
+      min_stat = FFI::MemoryPointer.new :OM_uint32
+      maj_stat = LibGSSAPI.gss_display_name(min_stat,
+                                            @client.get_pointer(0),
+                                            output_name.pointer,
+                                            nil)
+
+      if maj_stat != GSSAPI::LibGSSAPI::GSS_S_COMPLETE
+        raise GssApiError.new(maj_stat, min_stat),
+          "gss_display_name did not return GSS_S_COMPLETE but #{ maj_stat }"
+      end
+
+      output_name.value
+    end
 
     # 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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gssapi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &17171140 !ruby/object:Gem::Requirement
+  requirement: &6301300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *17171140
+  version_requirements: *6301300
 description: ! "    A FFI wrapper around the system GSSAPI library. Please make sure
   and read the\n    Yard docs or standard GSSAPI documentation if you have any questions.\n
   \   \n    There is also a class called GSSAPI::Simple that wraps many of the common
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A FFI wrapper around the system GSSAPI library.