X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Flibldap%2Fsasl.c;h=2d47636b7c175e6dca2c4ad209451228ae2d26e9;hb=966616b274d24c45b1f3a71ff35ddd502153b4a1;hp=00656001d9cbec9f2bb8331e2984d07f3bb89eb0;hpb=4e5992c190a020c6be21ea3ccb54d7dd12e57297;p=openldap

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index 00656001d9..2d47636b7c 100644
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -27,15 +27,16 @@
 
 #include "portable.h"
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
+#include <ac/errno.h>
 
 #include "ldap-int.h"
 
-
 /*
  * ldap_sasl_bind - bind to the ldap server (and X.500).
  * The dn (usually NULL), mechanism, and credentials are provided.
@@ -66,6 +67,10 @@ ldap_sasl_bind(
 	assert( LDAP_VALID( ld ) );
 	assert( msgidp != NULL );
 
+	/* check client controls */
+	rc = ldap_int_client_controls( ld, cctrls );
+	if( rc != LDAP_SUCCESS ) return rc;
+
 	if( msgidp == NULL ) {
 		ld->ld_errno = LDAP_PARAM_ERROR;
 		return ld->ld_errno;
@@ -92,25 +97,25 @@ ldap_sasl_bind(
 		return ld->ld_errno;
 	}
 
-	assert( BER_VALID( ber ) );
+	assert( LBER_VALID( ber ) );
 
 	if( mechanism == LDAP_SASL_SIMPLE ) {
 		/* simple bind */
-		rc = ber_printf( ber, "{it{istO}" /*}*/,
+		rc = ber_printf( ber, "{it{istON}" /*}*/,
 			++ld->ld_msgid, LDAP_REQ_BIND,
 			ld->ld_version, dn, LDAP_AUTH_SIMPLE,
 			cred );
 		
-	} else if ( cred == NULL ) {
+	} else if ( cred == NULL || !cred->bv_len ) {
 		/* SASL bind w/o creditials */
-		rc = ber_printf( ber, "{it{ist{s}}" /*}*/,
+		rc = ber_printf( ber, "{it{ist{sN}N}" /*}*/,
 			++ld->ld_msgid, LDAP_REQ_BIND,
 			ld->ld_version, dn, LDAP_AUTH_SASL,
 			mechanism );
 
 	} else {
 		/* SASL bind w/ creditials */
-		rc = ber_printf( ber, "{it{ist{sO}}" /*}*/,
+		rc = ber_printf( ber, "{it{ist{sON}N}" /*}*/,
 			++ld->ld_msgid, LDAP_REQ_BIND,
 			ld->ld_version, dn, LDAP_AUTH_SASL,
 			mechanism, cred );
@@ -128,7 +133,7 @@ ldap_sasl_bind(
 		return ld->ld_errno;
 	}
 
-	if ( ber_printf( ber, /*{*/ "}" ) == -1 ) {
+	if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
 		ld->ld_errno = LDAP_ENCODING_ERROR;
 		ber_free( ber, 1 );
 		return ld->ld_errno;
@@ -344,201 +349,6 @@ ldap_parse_sasl_bind_result(
 	return( ld->ld_errno );
 }
 
-#ifdef HAVE_CYRUS_SASL
-/*
-* Various Cyrus SASL related stuff.
-*/
-
-static int sasl_setup( Sockbuf *sb, void *arg );
-static int sasl_remove( Sockbuf *sb );
-static ber_slen_t sasl_read( Sockbuf *sb, void *buf, ber_len_t len );
-static ber_slen_t sasl_write( Sockbuf *sb, void *buf, ber_len_t len );
-static int sasl_close( Sockbuf *sb );
-
-static Sockbuf_IO sasl_io=
-{
-sasl_setup,
-sasl_remove,
-sasl_read,
-sasl_write,
-sasl_close
-}; 
-
-#define HAS_SASL( sb ) ((sb)->sb_io==&sasl_io)
-
-static char *
-array2str( char **a )
-{
-	char *s, **v, *p;
-	int len = 0;
-
-	for ( v = a; *v != NULL; v++ ) {
-		len += strlen( *v ) + 1; /* for a space */
-	}
-
-	if ( len == 0 ) {
-		return NULL;
-	}
-
-	s = LDAP_MALLOC ( len ); /* last space holds \0 */
-
-	if ( s == NULL ) {
-		return NULL;	
-	}
-
-	p = s;
-	for ( v = a; *v != NULL; v++ ) {
-		int len;
-
-		if ( v != a ) {
-			strncpy( p, " ", 1 );
-			++p;
-		}
-		len = strlen( *v );
-		strncpy( p, *v, len );
-		p += len;
-	}
-
-	*p = '\0';
-
-	return s;
-}
-
-int ldap_pvt_sasl_init( void )
-{
-	/* XXX not threadsafe */
-	static int sasl_initialized = 0;
-
-	if ( sasl_initialized ) {
-		return 0;
-	}
-#ifndef CSRIMALLOC
-	sasl_set_alloc( ber_memalloc, ber_memcalloc, ber_memrealloc, ber_memfree );
-#endif /* CSRIMALLOC */
-
-	if ( sasl_client_init( NULL ) == SASL_OK ) {
-		sasl_initialized = 1;
-		return 0;
-	}
-
-	return -1;
-}
-
-int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg )
-{
-	/* don't install the stuff unless security has been negotiated */
-
-	if ( !HAS_SASL( sb ) ) {
-		ber_pvt_sb_clear_io( sb );
-		ber_pvt_sb_set_io( sb, &sasl_io, ctx_arg );
-	}
-
-	return 0;
-}
-
-static int sasl_setup( Sockbuf *sb, void *arg )
-{
-	sb->sb_iodata = arg;
-	return 0;
-}
-
-static int sasl_remove( Sockbuf *sb )
-{
-	return 0;
-}
-
-static ber_slen_t sasl_read( Sockbuf *sb, void *buf, ber_len_t buflen )
-{
-	char *recv_tok;
-	unsigned recv_tok_len;
-	sasl_conn_t *conn = (sasl_conn_t *)sb->sb_iodata;
-
-	if ((ber_pvt_sb_io_tcp.sbi_read)( sb, buf, buflen ) != buflen ) {
-		return -1;
-	}
-
-	if ( sasl_decode( conn, buf, buflen, &recv_tok, &recv_tok_len ) != SASL_OK ) {
-		return -1;
-	}
-
-	if ( recv_tok_len > buflen ) {
-		LDAP_FREE( recv_tok );
-		return -1;
-	}
-
-	memcpy( buf, recv_tok, recv_tok_len );	
-
-	LDAP_FREE( recv_tok );
-
-	return recv_tok_len;
-}
-
-static ber_slen_t sasl_write( Sockbuf *sb, void *buf, ber_len_t len )
-{
-	char *wrapped_tok;
-	unsigned wrapped_tok_len;
-	sasl_conn_t *conn = (sasl_conn_t *)sb->sb_iodata;
-
-	if ( sasl_encode( conn, (const char *)buf, len,
-		&wrapped_tok, &wrapped_tok_len ) != SASL_OK ) {
-		return -1;
-	}
-
-	if ((ber_pvt_sb_io_tcp.sbi_write)( sb, wrapped_tok, wrapped_tok_len ) != wrapped_tok_len ) {
-		LDAP_FREE( wrapped_tok );
-		return -1;
-	}
-
-	LDAP_FREE( wrapped_tok );
-
-	return len;
-}
-
-static int sasl_close( Sockbuf *sb )
-{
-	return (ber_pvt_sb_io_tcp.sbi_close)( sb );
-}
-
-static int
-sasl_err2ldap( int saslerr )
-{
-	int rc;
-
-	switch (saslerr) {
-		case SASL_CONTINUE:
-			rc = LDAP_MORE_RESULTS_TO_RETURN;
-			break;
-		case SASL_OK:
-			rc = LDAP_SUCCESS;
-			break;
-		case SASL_FAIL:
-			rc = LDAP_LOCAL_ERROR;
-			break;
-		case SASL_NOMEM:
-			rc = LDAP_NO_MEMORY;
-			break;
-		case SASL_NOMECH:
-			rc = LDAP_AUTH_UNKNOWN;
-			break;
-		case SASL_BADAUTH:
-			rc = LDAP_AUTH_UNKNOWN;
-			break;
-		case SASL_NOAUTHZ:
-			rc = LDAP_PARAM_ERROR;
-			break;
-		case SASL_TOOWEAK:
-		case SASL_ENCRYPT:
-			rc = LDAP_AUTH_UNKNOWN;
-			break;
-		default:
-			rc = LDAP_LOCAL_ERROR;
-			break;
-	}
-
-	assert( rc == LDAP_SUCCESS || LDAP_API_ERROR( rc ) );
-	return rc;
-}
-
 int
 ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist )
 {
@@ -550,7 +360,7 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist )
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
 
-	rc = ldap_search_s( ld, NULL, LDAP_SCOPE_BASE,
+	rc = ldap_search_s( ld, "", LDAP_SCOPE_BASE,
 		NULL, attrs, 0, &res );
 
 	if ( rc != LDAP_SUCCESS ) {
@@ -559,28 +369,29 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist )
 		
 	e = ldap_first_entry( ld, res );
 	if ( e == NULL ) {
+		ldap_msgfree( res );
 		if ( ld->ld_errno == LDAP_SUCCESS ) {
-			ld->ld_errno = LDAP_UNAVAILABLE;
+			ld->ld_errno = LDAP_NO_SUCH_OBJECT;
 		}
 		return ld->ld_errno;
 	}
 
 	values = ldap_get_values( ld, e, "supportedSASLMechanisms" );
 	if ( values == NULL ) {
-		ld->ld_errno = LDAP_NO_SUCH_ATTRIBUTE;
 		ldap_msgfree( res );
+		ld->ld_errno = LDAP_NO_SUCH_ATTRIBUTE;
 		return ld->ld_errno;
 	}
 
-	mechlist = array2str( values );
+	mechlist = ldap_charray2str( values, " " );
 	if ( mechlist == NULL ) {
-		ld->ld_errno = LDAP_NO_MEMORY;
-		ldap_value_free( values );
+		LDAP_VFREE( values );
 		ldap_msgfree( res );
+		ld->ld_errno = LDAP_NO_MEMORY;
 		return ld->ld_errno;
 	} 
 
-	ldap_value_free( values );
+	LDAP_VFREE( values );
 	ldap_msgfree( res );
 
 	*pmechlist = mechlist;
@@ -588,327 +399,60 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist )
 	return LDAP_SUCCESS;
 }
 
-int
-ldap_pvt_sasl_bind(
-	LDAP			*ld,
-	LDAP_CONST char		*dn,
-	LDAP_CONST char		*mechs,
-	LDAP_CONST sasl_callback_t	*callbacks,
-	LDAPControl		**sctrls,
-	LDAPControl		**cctrls )
-{
-	const char *mech;
-	int	saslrc, rc, ssf = 0;
-	unsigned credlen;
-	struct berval ccred, *scred;
-	char *host;
-	sasl_interact_t *client_interact = NULL;
-
-	Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_bind\n", 0, 0, 0 );
-
-	/* do a quick !LDAPv3 check... ldap_sasl_bind will do the rest. */
-	if (ld->ld_version < LDAP_VERSION3) {
-		ld->ld_errno = LDAP_NOT_SUPPORTED;
-		return ld->ld_errno;
-	}
-
-	if( ! ber_pvt_sb_in_use( &ld->ld_sb ) ) {
- 		/* not connected yet */
- 		int rc = ldap_open_defconn( ld );
-  
-		if( rc < 0 ) return ld->ld_errno;
-	}   
-
-	/* XXX this doesn't work with PF_LOCAL hosts */
-	host = ldap_host_connected_to( &ld->ld_sb );
-
-	if ( host == NULL ) {
-		ld->ld_errno = LDAP_UNAVAILABLE;
-		return ld->ld_errno;
-	}
-
-	if ( ld->ld_sasl_context != NULL ) {
-		sasl_dispose( &ld->ld_sasl_context );
-	}
-
-	saslrc = sasl_client_new( "ldap", host, callbacks, 0, &ld->ld_sasl_context );
-
-	LDAP_FREE( host );
-
-	if ( (saslrc != SASL_OK) && (saslrc != SASL_CONTINUE) ) {
-		ld->ld_errno = sasl_err2ldap( rc );
-		sasl_dispose( &ld->ld_sasl_context );
-		return ld->ld_errno;
-	}
-
-	ccred.bv_val = NULL;
-	ccred.bv_len = 0;
-
-	saslrc = sasl_client_start( ld->ld_sasl_context,
-		mechs,
-		NULL,
-		&client_interact,
-		&ccred.bv_val,
-		&credlen,
-		&mech );
-
-	ccred.bv_len = credlen;
-
-	if ( (saslrc != SASL_OK) && (saslrc != SASL_CONTINUE) ) {
-		ld->ld_errno = sasl_err2ldap( saslrc );
-		sasl_dispose( &ld->ld_sasl_context );
-		return ld->ld_errno;
-	}
-
-	scred = NULL;
-
-	do {
-		unsigned credlen;
-		sasl_interact_t *client_interact = NULL;
-
-		rc = ldap_sasl_bind_s( ld, dn, mech, &ccred, sctrls, cctrls, &scred );
-		if ( rc == LDAP_SUCCESS ) {
-			break;
-		} else if ( rc != LDAP_SASL_BIND_IN_PROGRESS ) {
-			if ( ccred.bv_val != NULL ) {
-				LDAP_FREE( ccred.bv_val );
-			}
-			sasl_dispose( &ld->ld_sasl_context );
-			return ld->ld_errno;
-		}
-
-		if ( ccred.bv_val != NULL ) {
-			LDAP_FREE( ccred.bv_val );
-			ccred.bv_val = NULL;
-		}
-
-		saslrc = sasl_client_step( ld->ld_sasl_context,
-			(scred == NULL) ? NULL : scred->bv_val,
-			(scred == NULL) ? 0 : scred->bv_len,
-			&client_interact,
-			&ccred.bv_val,
-			&credlen );
-
-		ccred.bv_len = credlen;
-		ber_bvfree( scred );
-
-		if ( (saslrc != SASL_OK) && (saslrc != SASL_CONTINUE) ) {
-			ld->ld_errno = sasl_err2ldap( saslrc );
-			sasl_dispose( &ld->ld_sasl_context );
-			return ld->ld_errno;
-		}
-	} while ( rc == LDAP_SASL_BIND_IN_PROGRESS );
-
-	assert ( rc == LDAP_SUCCESS );
-
-	if ( sasl_getprop( ld->ld_sasl_context, SASL_SSF, (void **)&ssf )
-		== SASL_OK && ssf ) {
-		ldap_pvt_sasl_install( &ld->ld_sb, ld->ld_sasl_context );
-	}
-
-	return rc;
-}
-
-/* based on sample/sample-client.c */
-static int
-ldap_pvt_sasl_getsecret(sasl_conn_t *conn,
-	void *context, int id, sasl_secret_t **psecret)
-{
-	struct berval *passphrase = (struct berval *)context;
-	size_t len;           
-
-	if ( conn == NULL || psecret == NULL || id != SASL_CB_PASS ) {
-		return SASL_BADPARAM;
-	}
-
-	len = (passphrase != NULL) ? (size_t)passphrase->bv_len: 0;
-
-	*psecret = (sasl_secret_t *) LDAP_MALLOC( sizeof( sasl_secret_t ) + len );
-	if ( *psecret == NULL ) {
-		return SASL_NOMEM;
-	}
-
-	(*psecret)->len = passphrase->bv_len;
-
-	if ( passphrase != NULL ) {
-		memcpy((*psecret)->data, passphrase->bv_val, len);
-	}
-
-	return SASL_OK;
-}
-
-static int
-ldap_pvt_sasl_getsimple(void *context, int id, const char **result, int *len)
-{
-	const char *value = (const char *)context;
-
-	if ( result == NULL ) {
-		return SASL_BADPARAM;
-	}
-
-	switch ( id ) {
-		case SASL_CB_USER:
-		case SASL_CB_AUTHNAME:
-			*result = value;
-			if ( len )
-				*len = value ? strlen( value ) : 0;
-			break;
-		case SASL_CB_LANGUAGE:
-			*result = NULL;
-			if ( len )
-				*len = 0;
-			break;
-		default:
-			return SASL_BADPARAM;
-	}
-
-	return SASL_OK;
-}
-
-int
-ldap_pvt_sasl_get_option( LDAP *ld, int option, void *arg )
-{
-	sasl_ssf_t	*ssf;
-	
-	if ( ld == NULL )
-		return -1;
-
-	switch ( option ) {
-		case LDAP_OPT_X_SASL_MINSSF:
-			*(int *)arg = ld->ld_options.ldo_sasl_minssf;
-			break;
-		case LDAP_OPT_X_SASL_MAXSSF:
-			*(int *)arg = ld->ld_options.ldo_sasl_maxssf;
-			break;
-		case LDAP_OPT_X_SASL_ACTSSF:
-			if ( ld->ld_sasl_context == NULL ) {
-				*(int *)arg = -1;
-				break;
-			}
-			if ( sasl_getprop( ld->ld_sasl_context, SASL_SSF,
-				(void **) &ssf ) != SASL_OK )
-			{
-				return -1;
-			}
-			*(int *)arg = *ssf;
-			break;
-		default:
-			return -1;
-	}
-	return 0;
-}
-
-int
-ldap_pvt_sasl_set_option( LDAP *ld, int option, void *arg )
-{
-	if ( ld == NULL )
-		return -1;
-
-	switch ( option ) {
-		case LDAP_OPT_X_SASL_MINSSF:
-			ld->ld_options.ldo_sasl_minssf = *(int *)arg;
-			break;
-		case LDAP_OPT_X_SASL_MAXSSF:
-			ld->ld_options.ldo_sasl_maxssf = *(int *)arg;
-			break;
-		case LDAP_OPT_X_SASL_ACTSSF:
-			/* This option is read-only */
-		default:
-			return -1;
-	}
-	return 0;
-}
-
 /*
- * ldap_negotiated_sasl_bind_s - bind to the ldap server (and X.500)
- * using SASL authentication.
+ * ldap_sasl_interactive_bind_s - interactive SASL authentication
  *
- * This routine attempts to authenticate the user referred by the
- * authentication id using the provided password.  An optional
- * authorization identity may be provided.  An DN is generally not
- * provided [see AuthMethod].
+ * This routine uses interactive callbacks.
  *
- * If the mechanism negotiated does not require a password, the
- * passwd field is ignored.  [A callback mechanism should really
- * be used].
- * 
  * LDAP_SUCCESS is returned upon success, the ldap error code
  * otherwise.
- *
- * Examples:
- *	ldap_negotiated_sasl_bind_s( ld, NULL,
- *	    NULL, NULL, NULL,
- *		NULL, NULL, NULL, NULL );
- *
- *	ldap_negotiated_sasl_bind_s( ld, NULL,
- *	    "user@OPENLDAP.ORG", NULL, NULL,
- *		"GSSAPI", NULL, NULL, NULL );
- *
- *	ldap_negotiated_sasl_bind_s( ld, NULL,
- *	    "manager", "dn:cn=user,dc=openldap,dc=org", NULL,
- *		"DIGEST-MD5", NULL, NULL, NULL );
- *
- *	ldap_negotiated_sasl_bind_s( ld, NULL,
- *	    "root@OPENLDAP.ORG", "u:user@OPENLDAP.ORG", NULL,
- *		"GSSAPI", NULL, NULL, NULL );
- *
- *	ldap_negotiated_sasl_bind_s( ld, NULL,
- *	    "manager", "dn:cn=user,dc=openldap,dc=org", NULL,
- *		"DIGEST-MD5", NULL, NULL, NULL );
  */
 int
-ldap_negotiated_sasl_bind_s(
+ldap_sasl_interactive_bind_s(
 	LDAP *ld,
 	LDAP_CONST char *dn, /* usually NULL */
-	LDAP_CONST char *authenticationId,
-	LDAP_CONST char *authorizationId, /* commonly NULL */
-	LDAP_CONST char *saslMechanism,
-	struct berval *passPhrase,
+	LDAP_CONST char *mechs,
 	LDAPControl **serverControls,
-	LDAPControl **clientControls)
+	LDAPControl **clientControls,
+	unsigned flags,
+	LDAP_SASL_INTERACT_PROC *interact,
+	void *defaults )
 {
-	int n;
-	sasl_callback_t callbacks[4];
 	int rc;
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_negotiated_sasl_bind_s\n", 0, 0, 0 );
+#if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
+	ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );
+#endif
+
+	if( mechs == NULL || *mechs == '\0' ) {
+		char *smechs;
 
-	if( saslMechanism == NULL || *saslMechanism == '\0' ) {
-		char *mechs;
-		rc = ldap_pvt_sasl_getmechs( ld, &mechs );
+		rc = ldap_pvt_sasl_getmechs( ld, &smechs );
 
 		if( rc != LDAP_SUCCESS ) {
-			return rc;
+			goto done;
 		}
 
-		saslMechanism = mechs;
-	}
+		Debug( LDAP_DEBUG_TRACE,
+			"ldap_interactive_sasl_bind_s: server supports: %s\n",
+			smechs, 0, 0 );
 
-	/* SASL Authentication Identity */
-	callbacks[n=0].id = SASL_CB_AUTHNAME;
-	callbacks[n].proc = ldap_pvt_sasl_getsimple;
-	callbacks[n].context = (void *)authenticationId;
+		mechs = smechs;
 
-	/* SASL Authorization Identity (userid) */
-	if( authorizationId != NULL ) {
-		callbacks[++n].id = SASL_CB_USER;
-		callbacks[n].proc = ldap_pvt_sasl_getsimple;
-		callbacks[n].context = (void *)authorizationId;
+	} else {
+		Debug( LDAP_DEBUG_TRACE,
+			"ldap_interactive_sasl_bind_s: user selected: %s\n",
+			mechs, 0, 0 );
 	}
 
-	callbacks[++n].id = SASL_CB_PASS;
-	callbacks[n].proc = ldap_pvt_sasl_getsecret;
-	callbacks[n].context = (void *)passPhrase;
-
-	callbacks[++n].id = SASL_CB_LIST_END;
-	callbacks[n].proc = NULL;
-	callbacks[n].context = NULL;
+	rc = ldap_int_sasl_bind( ld, dn, mechs,
+		serverControls, clientControls,
+		flags, interact, defaults );
 
-	assert( n * sizeof(sasl_callback_t) < sizeof(callbacks) );
-
-	rc = ldap_pvt_sasl_bind(ld, dn, saslMechanism, callbacks,
-		serverControls, clientControls);
+done:
+#if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
+	ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex );
+#endif
 
 	return rc;
 }
-#endif /* HAVE_CYRUS_SASL */