ruby-ldap 0.9.10 → 0.9.11

data/ChangeLog

@@ -1,9 +1,13 @@
+Mon Mar 15 19:15:49 UTC 2010 Alexey Chebotar <alexey.chebotar@gmail.com>
+  * Version 0.9.11
+  * Allow passing SASL interaction options.
+    Thanks to Anthony M. Martinez.
+
 Fri Jan 29 07:50:30 UTC 2010 Alexey Chebotar <alexey.chebotar@gmail.com>
   * Version 0.9.10
   * Added controls and referral extraction to #search_ext and 
     #search_ext2. Thanks to Michael Granger.
 
-
 Thu Jun 11 06:51:30 UTC 2009 Alexey Chebotar <alexey.chebotar@gmail.com>
   * Version 0.9.9
   * Fixed LDAP::VERSION. Thanks to Kouhei Sutou

data/NOTES

@@ -1,4 +1,17 @@
-$Id: NOTES,v 1.4 2006/08/09 11:22:25 ianmacd Exp $
+0.9.11
+-----
+
+Allow passing SASL interaction options
+    
+This adds a hash parameter "options" to LDAP::Conn.sasl_bind, which
+can take :authzid, :authcid, and :realm (and corresponding strings),
+for SASL authentication.
+    
+Also, refactored the rb_scan_args inside rb_ldap_conn_sasl_bind to use
+C's case fallthrough, leading to less code repetition.
+
+Tnahks to Anthony M. Martinez.
+
 
 0.9.10
 -----

data/README

@@ -1,7 +1,5 @@
                  Ruby/LDAP -- A Ruby extension library for LDAP
 
-$Id: README,v 1.19 2009/03/19 15:25:20 alexey.chebotar Exp $
-
 Copyright (C) 2000-2004 Takaaki Tateishi <ttate@users.sourceforge.net>      
 Copyright (C) 2005-2006 Ian Macdonald <ian@caliban.org>
 Copyright (C) 2009 Alexey Chebotar <alexey.chebotar@gmail.com>
@@ -265,3 +263,4 @@ This list maybe not correct. If you notice mistakes of this list, please point o
 * S. Potter [mbbx6spp]: Gem Packaging Support
 * Kouhei Sutou
 * Michael Granger: Patch.
+* Anthony M. Martinez: Patch.

data/rbldap.h

@@ -27,8 +27,8 @@
 
 #define RB_LDAP_MAJOR_VERSION 0
 #define RB_LDAP_MINOR_VERSION 9
-#define RB_LDAP_PATCH_VERSION 10
-#define RB_LDAP_VERSION "0.9.10"
+#define RB_LDAP_PATCH_VERSION 11
+#define RB_LDAP_VERSION "0.9.11"
 
 #define LDAP_GET_OPT_MAX_BUFFER_SIZE    (1024)	/* >= sizeof(LDAPAPIInfo) */
 

data/saslconn.c

@@ -16,17 +16,76 @@ extern VALUE rb_ldap_conn_initialize (int argc, VALUE argv[], VALUE self);
 extern VALUE rb_ldap_conn_rebind (VALUE self);
 
 #if defined(HAVE_LDAP_SASL_BIND_S)
+#include <sasl/sasl.h>
+VALUE
+rb_ldap_indifferent_hash_aref(VALUE hash, const char *key)
+{
+  VALUE symval = rb_hash_aref(hash, ID2SYM(rb_intern(key)));
+  if (!NIL_P(symval))
+    {
+      return symval;
+    }
+  return rb_hash_aref(hash, rb_str_new2(key)); /* this could be Qnil */
+}
+
 int
-rb_ldap_sasl_interaction (LDAP * ld, unsigned flags, void *defaults, void *in)
+rb_ldap_sasl_interaction (LDAP * ld, unsigned flags, void *de, void *in)
 {
-  /* not implemented */
+  sasl_interact_t *interact = in;
+  VALUE options   = (VALUE)de;
+
+  VALUE defvalue;
+  const char *dflt = NULL;
+
+  if (ld == NULL)
+    {
+      return LDAP_PARAM_ERROR;
+    }
+  if (flags == LDAP_SASL_INTERACTIVE)
+    {
+      rb_raise (rb_eLDAP_Error, "interactive bind not supported.");
+    }
+  while (!NIL_P(options) && interact->id != SASL_CB_LIST_END)
+    {
+      dflt = interact->defresult;
+      switch (interact->id)
+        {
+          case SASL_CB_GETREALM:
+            if (!NIL_P(defvalue = rb_ldap_indifferent_hash_aref(options, "realm")))
+            {
+              dflt = StringValuePtr(defvalue);
+            }
+            break;
+          case SASL_CB_AUTHNAME:
+            if (!NIL_P(defvalue = rb_ldap_indifferent_hash_aref(options, "authcid")))
+            {
+              dflt = StringValuePtr(defvalue);
+            }
+            break;
+          case SASL_CB_USER:
+            if (!NIL_P(defvalue = rb_ldap_indifferent_hash_aref(options, "authzid")))
+            {
+              dflt = StringValuePtr(defvalue);
+            }
+            break;
+          default:
+            /* Nothing. */
+            break;
+        }
+      if (dflt != NULL)
+        {
+          interact->result = dflt;
+          interact->len    = strlen(dflt);
+        }
+      interact++;
+    }
   return LDAP_SUCCESS;
 }
 
 /*
  * call-seq:
- * conn.sasl_bind(dn=nil, mech=nil, cred=nil, sctrls=nil, cctrls=nil)  => self
- * conn.sasl_bind(dn=nil, mech=nil, cred=nil, sctrls=nil, cctrls=nil)
+ * conn.sasl_bind(dn=nil, mech=nil, cred=nil, sctrls=nil, cctrls=nil, sasl_options=nil)  => self
+ * conn.sasl_bind(dn=nil, mech=nil, cred=nil, sctrls=nil, cctrls=nil, sasl_options=nil)
  *   { |conn| }  => nil
  *
  * Bind an LDAP connection, using the DN, +dn+, the mechanism, +mech+, and the
@@ -35,15 +94,19 @@ rb_ldap_sasl_interaction (LDAP * ld, unsigned flags, void *defaults, void *in)
  * +sctrls+ is an array of server controls, whilst +cctrls+ is an array of
  * client controls.
  *
- * and the bind method, +method+. If a block is given, +self+ is yielded to
- * the block.
+ * sasl_options is a hash which should have the following keys:
+ *
+ * - +:authcid+ and +:authzid+ for alternate SASL authentication
+ * - +realm+ to specify the SASL realm
+ *
+ * If a block is given, +self+ is yielded to the block.
  */
 VALUE
 rb_ldap_conn_sasl_bind (int argc, VALUE argv[], VALUE self)
 {
   RB_LDAP_DATA *ldapdata;
 
-  VALUE arg1, arg2, arg3, arg4, arg5;
+  VALUE arg1, arg2, arg3, arg4, arg5, sasl_options = Qnil;
   int version;
   char *dn = NULL;
   char *mechanism = NULL;
@@ -81,36 +144,26 @@ rb_ldap_conn_sasl_bind (int argc, VALUE argv[], VALUE self)
     {
       rb_raise (rb_eLDAP_Error, "already bound.");
     };
-  switch (rb_scan_args (argc, argv, "23", &arg1, &arg2, &arg3, &arg4, &arg5))
+
+  switch (rb_scan_args (argc, argv, "24", &arg1, &arg2, &arg3, &arg4, &arg5, &sasl_options))
     {
-    case 2:			/* don't need the cred for GSSAPI */
-      dn = StringValuePtr (arg1);
-      mechanism = StringValuePtr (arg2);
-      serverctrls = NULL;
-      clientctrls = NULL;
-      if (rb_iv_get (self, "@sasl_quiet") == Qtrue)
-	sasl_flags = LDAP_SASL_QUIET;
-      break;
-    case 3:
-      dn = StringValuePtr (arg1);
-      mechanism = StringValuePtr (arg2);
-      cred->bv_val = StringValueCStr (arg3);
-      cred->bv_len = RSTRING_LEN (arg3);
-      break;
+    case 6:
+      /* nothing. this requires credentials to be parsed first. we'll get defaults after arg-scanning */
+    case 5:
+      clientctrls = rb_ldap_get_controls (arg5);
+      /* down seems more likely */
     case 4:
-      dn = StringValuePtr (arg1);
-      mechanism = StringValuePtr (arg2);
+      serverctrls = rb_ldap_get_controls (arg4);
+      /* down seems more likely */
+    case 3:
       cred->bv_val = StringValueCStr (arg3);
       cred->bv_len = RSTRING_LEN (arg3);
-      serverctrls = rb_ldap_get_controls (arg4);
-      break;
-    case 5:
+      /* down seems more likely */
+    case 2:			/* don't need the cred for GSSAPI */
       dn = StringValuePtr (arg1);
       mechanism = StringValuePtr (arg2);
-      cred->bv_val = StringValueCStr (arg3);
-      cred->bv_len = RSTRING_LEN (arg3);
-      serverctrls = rb_ldap_get_controls (arg4);
-      clientctrls = rb_ldap_get_controls (arg5);
+      if (rb_iv_get (self, "@sasl_quiet") == Qtrue)
+        sasl_flags = LDAP_SASL_QUIET;
       break;
     default:
       rb_bug ("rb_ldap_conn_bind_s");
@@ -129,7 +182,7 @@ rb_ldap_conn_sasl_bind (int argc, VALUE argv[], VALUE self)
   ldapdata->err =
     ldap_sasl_interactive_bind_s (ldapdata->ldap, dn, mechanism,
 				  serverctrls, clientctrls, sasl_flags,
-				  rb_ldap_sasl_interaction, NULL);
+				  rb_ldap_sasl_interaction, (void*)sasl_options);
 
   if (ldapdata->err == LDAP_SASL_BIND_IN_PROGRESS)
     {

data/test/setup.rb

@@ -13,7 +13,7 @@ class TC_LDAPTest < Test::Unit::TestCase
   # Get the LDAP host and base DN from /etc/ldap.conf.
   def setup
     unless @@conn && @@conn.bound?
-      File.open( '/etc/ldap.conf' ) do |f|
+      File.open( '/etc/openldap/slapd.conf' ) do |f|
         while line = f.gets
           if line =~ /^host\s+(\S+)$/
             @@host = $1
@@ -33,6 +33,6 @@ class TC_LDAPTest < Test::Unit::TestCase
     end
   end
 
-  undef_method :default_test
+  #undef_method :default_test
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ldap
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Alexey Chebotar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +01:00
+date: 2010-03-15 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,44 +30,44 @@ files:
 - NOTES
 - README
 - TODO
-- extconf.rb
-- test/conf.rb
-- test/add3.rb
-- test/search2.rb
-- test/delete.rb
+- lib/ldap/schema.rb
+- lib/ldap/ldif.rb
+- lib/ldap/control.rb
+- test/add.rb
+- test/misc1.rb
+- test/modrdn.rb
+- test/search3.rb
+- test/add2.rb
 - test/ts_ldap.rb
-- test/setup.rb
+- test/delete.rb
 - test/bind-ldaps.rb
-- test/search3.rb
-- test/tc_search.rb
+- test/conf.rb
+- test/tc_conn.rb
+- test/search2.rb
+- test/bind-sasl.rb
 - test/tc_schema.rb
-- test/tc_ldif.rb
-- test/compare.rb
-- test/search.rb
 - test/ext.rb
-- test/tc_conn.rb
-- test/add2.rb
+- test/setup.rb
 - test/misc2.rb
+- test/bind.rb
 - test/subschema.rb
+- test/search.rb
+- test/tc_search.rb
+- test/tc_ldif.rb
+- test/compare.rb
+- test/add3.rb
 - test/bind-ssl.rb
-- test/bind.rb
-- test/misc1.rb
-- test/add.rb
-- test/bind-sasl.rb
-- test/modrdn.rb
-- lib/ldap/control.rb
-- lib/ldap/schema.rb
-- lib/ldap/ldif.rb
-- win/winldap.h
-- win/winlber.h
+- extconf.rb
 - rbldap.h
-- misc.c
+- win/winlber.h
+- win/winldap.h
+- sslconn.c
 - ldap.c
-- entry.c
 - conn.c
+- entry.c
 - mod.c
 - saslconn.c
-- sslconn.c
+- misc.c
 has_rdoc: true
 homepage: http://ruby-ldap.sourceforge.net/
 licenses: []