rldap 0.0.3 → 0.0.4

data/.gitignore

@@ -0,0 +1,9 @@
+*.o
+*.so
+*.bundle
+mkmf.log
+Makefile
+*.gem
+pkg/*
+.bundle
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,5 @@
+source :gemcutter
+
+gemspec
+
+gem 'rspec', '2.0.0.beta.22'

data/README.md

@@ -0,0 +1,16 @@
+RLDAP
+=====
+
+RLDAP is a Ruby wrapper for the C OpenLDAP API.
+
+Meta
+----
+
+* Code: `git clone git://github.com/dvyjones/rldap.git`
+* Home: <http://github.com/dvyjones/rldap/>
+* Bugs: <http://github.com/dvyjones/rldap/issues>
+* Gems: <http://rubygems.org/gems/rldap>
+
+The project uses [Semantic Versioning][sv].
+
+[sv]: http://semver.org

data/Rakefile

@@ -1,11 +1,2 @@
-desc "Push a new version to Gemcutter"
-task :publish do
-  require 'ldap/version'
-
-  sh "gem build rldap.gemspec"
-  sh "gem push rldap-#{LDAP::Version}.gem"
-  sh "git tag v#{LDAP::Version}"
-  sh "git push origin v#{LDAP::Version}"
-  sh "git push origin master"
-  sh "git clean -fd"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/ext/extconf.rb

@@ -1,9 +1,10 @@
 require 'mkmf'
 
-have_library('ldap')
-have_library('lber')
+unless have_library('ldap') && have_library('lber') && have_header('ldap.h') && have_header('lber.h')
+  abort 'You need to have libldap and liblber installed.'
+end
 
-have_header('ldap.h')
-have_header('lber.h')
+have_func('ldap_sasl_interactive_bind_s')
+have_header('sasl.h') || have_header('sasl/sasl.h')
 
 create_makefile('ldap')

data/ext/ldap.c

@@ -10,6 +10,12 @@
 #include <lber.h>
 #include <stdlib.h>
 
+#ifdef HAVE_SASL_H
+#include <sasl.h>
+#elif defined(HAVE_SASL_SASL_H)
+#include <sasl/sasl.h>
+#endif
+
 static VALUE cLDAP;
 static VALUE cLDAP_Message;
 static VALUE eLDAP;
@@ -18,11 +24,6 @@ typedef struct {
 	LDAP *ld;
 } RLDAP_WRAP;
 
-typedef struct {
-	LDAP *ld;
-	LDAPMessage *mesg;
-} RLDAP_MSG_WRAP;
-
 static RLDAP_WRAP *get_wrapper(VALUE obj)
 {
 	RLDAP_WRAP *wrapper;
@@ -30,27 +31,12 @@ static RLDAP_WRAP *get_wrapper(VALUE obj)
 	return wrapper;
 }
 
-static RLDAP_MSG_WRAP *get_msg_wrapper(VALUE obj)
-{
-	RLDAP_MSG_WRAP* wrapper;
-	Data_Get_Struct(obj, RLDAP_MSG_WRAP, wrapper);
-	return wrapper;
-}
-
 static void free_wrapper(RLDAP_WRAP *wrapper)
 {
 	ldap_memfree(wrapper->ld);
 	free(wrapper);
 }
 
-static void free_msg_wrapper(RLDAP_MSG_WRAP *wrapper)
-{
-	if (wrapper->mesg != NULL)
-		ldap_msgfree(wrapper->mesg);
-	wrapper->ld = NULL;
-	free(wrapper);
-}
-
 static void rldap_raise(int errno)
 {
 	VALUE e = rb_exc_new2(eLDAP, ldap_err2string(errno));
@@ -172,8 +158,6 @@ static VALUE rldap_search(int argc, VALUE *argv, VALUE obj)
 		msg = ldap_next_entry(wrapper->ld, msg);
 	}
 	
-	
-	
 	return ary;
 }
 
@@ -249,94 +233,233 @@ static VALUE rldap_inspect(VALUE obj)
 	return ret;
 }
 
+static VALUE rldap_bind(int argc, VALUE *argv, VALUE obj)
+{
+	RLDAP_WRAP *wrapper;
+	char *bind_dn = NULL, *bind_password = NULL;
+	int retval;
+	VALUE rdn, rpassword;
+	
+	rb_scan_args(argc, argv, "02", &rdn, &rpassword);
+	
+	if (NIL_P(rdn))
+		bind_dn = NULL;
+	else
+		bind_dn = StringValuePtr(rdn);
+	if (NIL_P(rpassword))
+		bind_password = NULL;
+	else
+		bind_password = StringValuePtr(rpassword);
+	
+	wrapper = get_wrapper(obj);
 
-/* class LDAP::Message */
+	retval = ldap_bind_s(wrapper->ld, bind_dn, bind_password, LDAP_AUTH_SIMPLE);
+	
+	if (retval != LDAP_SUCCESS)
+		rldap_raise(retval);
+	else
+		return Qtrue;
+}
 
-static VALUE ldapmessage2obj(LDAP* ld, LDAPMessage* msg)
+static VALUE rldap_unbind(VALUE obj)
 {
-	VALUE obj;
-	RLDAP_MSG_WRAP *wrapper;
+	RLDAP_WRAP *wrapper;
+	int retval;
+	
+	wrapper = get_wrapper(obj);
+	retval = ldap_unbind_s(wrapper->ld);
+	if (retval != LDAP_SUCCESS)
+		rldap_raise(retval);
+	else
+		return Qtrue;
+}
 
-	obj = Data_Make_Struct(cLDAP_Message, RLDAP_MSG_WRAP, 0, free_msg_wrapper, wrapper);
-	wrapper->mesg = msg;
-	wrapper->ld = ld;
+#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S
 
-	return obj;
+typedef struct {
+	char *mech;
+	char *realm;
+	char *authcid;
+	char *passwd;
+	char *authzid;
+} RLDAP_BICTX;
+
+static RLDAP_BICTX *_rldap_sasl_setdefs(LDAP *ld, char *sasl_mech, char *sasl_realm, char *sasl_authc_id, char *passwd, char *sasl_authz_id)
+{
+	RLDAP_BICTX *ctx;
+	
+	ctx = ber_memalloc(sizeof(RLDAP_BICTX));	
+	ctx->mech    = (sasl_mech) ? ber_strdup(sasl_mech) : NULL;
+	ctx->realm   = (sasl_realm) ? ber_strdup(sasl_realm) : NULL;
+	ctx->authcid = (sasl_authc_id) ? ber_strdup(sasl_authc_id) : NULL;
+	ctx->passwd  = (passwd) ? ber_strdup(passwd) : NULL;
+	ctx->authzid = (sasl_authz_id) ? ber_strdup(sasl_authz_id) : NULL;
+
+	if (ctx->mech == NULL) {
+		ldap_get_option(ld, LDAP_OPT_X_SASL_MECH, &ctx->mech);
+	}
+	if (ctx->realm == NULL) {
+		ldap_get_option(ld, LDAP_OPT_X_SASL_REALM, &ctx->realm);
+	}
+	if (ctx->authcid == NULL) {
+		ldap_get_option(ld, LDAP_OPT_X_SASL_AUTHCID, &ctx->authcid);
+	}
+	if (ctx->authzid == NULL) {
+		ldap_get_option(ld, LDAP_OPT_X_SASL_AUTHZID, &ctx->authzid);
+	}
+
+	return ctx;
 }
 
-static VALUE rldap_msg_dn(VALUE obj)
+static void _rldap_sasl_freedefs(RLDAP_BICTX *ctx)
 {
-	RLDAP_MSG_WRAP *wrapper;
-	char *dn;
-	VALUE rdn;
-	
-	wrapper = get_msg_wrapper(obj);
-	
-	dn = ldap_get_dn(wrapper->ld, wrapper->mesg);
-	rdn = rb_str_new2(dn);
-	ldap_memfree(dn);
-	
-	return rdn;
+	if (ctx->mech) ber_memfree(ctx->mech);
+	if (ctx->realm) ber_memfree(ctx->realm);
+	if (ctx->authcid) ber_memfree(ctx->authcid);
+	if (ctx->passwd) ber_memfree(ctx->passwd);
+	if (ctx->authzid) ber_memfree(ctx->authzid);
+	ber_memfree(ctx);
 }
 
-static VALUE rldap_msg_get_val(VALUE obj, VALUE key)
+static int _rldap_sasl_interact(LDAP *ld, unsigned flags, void *defaults, void *in)
 {
-	RLDAP_MSG_WRAP *wrapper;
-	char *attr, *strval;
-	BerValue **values;
-	VALUE ary, str;
-	int i, length;
-	BerValue *value;
+	sasl_interact_t *interact = in;
+	const char *p;
+	RLDAP_BICTX *ctx = defaults;
+
+	for (;interact->id != SASL_CB_LIST_END;interact++) {
+		p = interact->defresult;
+		switch(interact->id) {
+			case SASL_CB_GETREALM:
+				p = ctx->realm;
+				break;
+			case SASL_CB_AUTHNAME:
+				p = ctx->authcid;
+				break;
+			case SASL_CB_USER:
+				p = ctx->authzid;
+				break;
+			case SASL_CB_PASS:
+				p = ctx->passwd;
+				break;
+		}
+		if (p) {
+			interact->result = p;
+			interact->len = strlen(p);
+		}
+	}
+	return LDAP_SUCCESS;
+}
+
+static VALUE rldap_sasl_bind(int argc, VALUE *argv, VALUE obj)
+{
+	RLDAP_WRAP *wrapper;
+	char *bind_dn = NULL, *passwd = NULL, *sasl_mech = NULL,
+		*sasl_realm = NULL, *sasl_authz_id = NULL, *sasl_authc_id = NULL;
+	VALUE rbind_dn, rpasswd, rsasl_mech, rsasl_realm,
+		rsasl_authz_id, rsasl_authc_id, rprops;
+	int retval;
+	RLDAP_BICTX *ctx;
 	
-	wrapper = get_msg_wrapper(obj);
-	attr = StringValuePtr(key);
+	wrapper = get_wrapper(obj);
+	rb_scan_args(argc, argv, "07", &rbind_dn, &rpasswd, &rsasl_mech, &rsasl_realm, &rsasl_authz_id, &rsasl_authc_id, &rprops);
 	
-	values = ldap_get_values_len(wrapper->ld, wrapper->mesg, attr);
-
-	if (values == NULL) {
-		rldap_raise(rldap_errno_c(obj));
-	}
+	if (!NIL_P(rprops))
+		ldap_set_option(wrapper->ld, LDAP_OPT_X_SASL_SECPROPS, StringValuePtr(rprops));
 	
-	ary = rb_ary_new();
-	length = ldap_count_values_len(values);
+	if (!NIL_P(rbind_dn))
+		bind_dn = StringValuePtr(rbind_dn);
+	if (!NIL_P(rpasswd))
+		passwd = StringValuePtr(rpasswd);
+	if (!NIL_P(rsasl_mech))
+		sasl_mech = StringValuePtr(rsasl_mech);
+	if (!NIL_P(rsasl_realm))
+		sasl_realm = StringValuePtr(rsasl_realm);
+	if (!NIL_P(rsasl_authz_id))
+		sasl_authz_id = StringValuePtr(rsasl_authz_id);
+	if (!NIL_P(rsasl_authc_id))
+		sasl_authc_id = StringValuePtr(rsasl_authc_id);
 	
-	for (i=0; i<length; i++) {
-		value = values[i];
-		str = rb_str_new(value->bv_val, value->bv_len);
-		rb_ary_push(ary, str);
-	}
+	ctx = _rldap_sasl_setdefs(wrapper->ld, sasl_mech, sasl_realm, sasl_authc_id, passwd, sasl_authz_id);
 	
-	ldap_value_free_len(values);
+	retval = ldap_sasl_interactive_bind_s(wrapper->ld, bind_dn, ctx->mech, NULL, NULL, LDAP_SASL_AUTOMATIC, _rldap_sasl_interact, ctx);
 	
-	return ary;
+	_rldap_sasl_freedefs(ctx);
+	
+	if (retval != LDAP_SUCCESS)
+		rldap_raise(retval);
+	else
+		return Qtrue;
 }
 
-static VALUE rldap_msg_keys(VALUE obj)
+#endif
+
+/* class LDAP::Message */
+
+static VALUE ldapmessage2obj(LDAP *ld, LDAPMessage *msg)
 {
-	RLDAP_MSG_WRAP *wrapper;
-	char *attr;
+	VALUE obj;
+	
+	char *dn, *attr;
 	BerElement *ber;
-	VALUE ary;
+	BerValue **values;
+	BerValue *value;
+	VALUE rdn, attrs, ary, str;
+	int length, i;
 
-	ary = rb_iv_get(obj, "@keys");
+	obj = rb_class_new_instance(0, NULL, cLDAP_Message);
+	
+	// Set the DN
+	dn = ldap_get_dn(ld, msg);
+	rdn = rb_str_new2(dn);
+	ldap_memfree(dn);
+	rb_iv_set(obj, "@dn", rdn);
+	
+	// Set the attributes
+	attrs = rb_hash_new();
+	attr = ldap_first_attribute(ld, msg, &ber);
+	do {
+		values = ldap_get_values_len(ld, msg, attr);
 
-	if (ary != Qnil)
-		return ary;
+		if (values == NULL) {
+			rldap_raise(rldap_errno_c(obj));
+		}
 
-	wrapper = get_msg_wrapper(obj);
-	ary = rb_ary_new();
+		ary = rb_ary_new();
+		length = ldap_count_values_len(values);
 
-	attr = ldap_first_attribute(wrapper->ld, wrapper->mesg, &ber);
-	do {
-		rb_ary_push(ary, rb_str_new2(attr));
+		for (i=0; i<length; i++) {
+			value = values[i];
+			str = rb_str_new(value->bv_val, value->bv_len);
+			rb_ary_push(ary, str);
+		}
+		
+		rb_hash_aset(attrs, rb_str_new2(attr), ary);
+
+		ldap_value_free_len(values);
 		ldap_memfree(attr);
-	} while (attr = ldap_next_attribute(wrapper->ld, wrapper->mesg, ber));
+	} while (attr = ldap_next_attribute(ld, msg, ber));
 
 	ber_free(ber, 0);
 
-	rb_iv_set(obj, "@keys", ary);
+	rb_iv_set(obj, "@attrs", attrs);
 
-	return ary;
+	return obj;
+}
+
+static VALUE rldap_msg_dn(VALUE obj)
+{	
+	return rb_iv_get(obj, "@dn");
+}
+
+static VALUE rldap_msg_get_val(VALUE obj, VALUE key)
+{	
+	return rb_hash_aref(rb_iv_get(obj, "@attrs"), key);
+}
+
+static VALUE rldap_msg_keys(VALUE obj)
+{
+	return rb_funcall(rb_iv_get(obj, "@attrs"), rb_intern("keys"), 0);
 }
 
 
@@ -356,6 +479,9 @@ void Init_ldap()
 	rb_define_method(cLDAP, "errno", rldap_errno, 0);
 	rb_define_method(cLDAP, "uri", rldap_uri, 0);
 	rb_define_method(cLDAP, "inspect", rldap_inspect, 0);
+	rb_define_method(cLDAP, "bind", rldap_bind, -1);
+	rb_define_method(cLDAP, "unbind", rldap_unbind, 0);
+	rb_define_method(cLDAP, "sasl_bind", rldap_sasl_bind, -1);
 	
 	rb_define_method(cLDAP_Message, "dn", rldap_msg_dn, 0);
 	rb_define_method(cLDAP_Message, "[]", rldap_msg_get_val, 1);

data/lib/ldap/version.rb

@@ -1,3 +1,3 @@
 class LDAP
-  Version = VERSION = '0.0.3'
+  Version = VERSION = '0.0.4'
 end

data/rldap.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/ldap/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = 'rldap'
+  s.version = LDAP::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.date = Time.now.strftime('%Y-%m-%d')
+  s.summary = 'Ruby LDAP wrapper'
+  s.homepage = 'http://github.com/dvyjones/rldap'
+  s.email = 'dvyjones@binaryhex.com'
+  s.authors = [ 'Henrik Hodne' ]
+
+  s.files = `git ls-files`.split("\n")
+  s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
+  
+  s.extensions << 'ext/extconf.rb'
+  
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Henrik Hodne
@@ -14,10 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 -07:00
+date: 2010-11-27 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id001
 description: 
 email: dvyjones@binaryhex.com
 executables: []
@@ -27,12 +41,16 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- Rakefile
+- .gitignore
+- Gemfile
 - LICENSE
-- lib/ldap/version.rb
+- README.md
+- Rakefile
 - ext/constants.h
 - ext/extconf.rb
 - ext/ldap.c
+- lib/ldap/version.rb
+- rldap.gemspec
 has_rdoc: true
 homepage: http://github.com/dvyjones/rldap
 licenses: []