X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbind.c;h=91fe75896155b8bc55f4ab4cd8a32395d5bcebc7;hb=2ece0ee378a47df99a05a0dd0db3763bdf9bb125;hp=ba6b0f847996ee82c5e24c48e31f46b81ad60fe3;hpb=129ee42f370799f6d80a305a01b4d9c96c86c1bf;p=openldap

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index ba6b0f8479..91fe758961 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -1,4 +1,9 @@
 /* bind.c - decode an ldap bind operation and pass it to a backend db */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
@@ -19,9 +24,10 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
+#include "ldap_pvt.h"
 #include "slap.h"
 
-void
+int
 do_bind(
     Connection	*conn,
     Operation	*op
@@ -31,13 +37,52 @@ do_bind(
 	ber_int_t		version;
 	ber_tag_t method;
 	char		*mech;
-	char		*cdn, *ndn;
-	ber_tag_t	rc;
+	char		*dn;
+	char *ndn;
+	ber_tag_t	tag;
+	int			rc = LDAP_SUCCESS;
+	const char	*text;
 	struct berval	cred;
 	Backend		*be;
 
 	Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
 
+	dn = NULL;
+	ndn = NULL;
+	mech = NULL;
+	cred.bv_val = NULL;
+
+	ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+
+	/*
+	 * Force to connection to "anonymous" until bind succeeds.
+	 */
+
+	if ( conn->c_cdn != NULL ) {
+		free( conn->c_cdn );
+		conn->c_cdn = NULL;
+	}
+
+	if ( conn->c_dn != NULL ) {
+		free( conn->c_dn );
+		conn->c_dn = NULL;
+	}
+
+	conn->c_authc_backend = NULL;
+	conn->c_authz_backend = NULL;
+
+	ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+	if ( op->o_dn != NULL ) {
+		free( op->o_dn );
+		op->o_dn = ch_strdup( "" );
+	}
+
+	if ( op->o_ndn != NULL ) {
+		free( op->o_ndn );
+		op->o_ndn = ch_strdup( "" );
+	}
+
 	/*
 	 * Parse the bind request.  It looks like this:
 	 *
@@ -47,138 +92,212 @@ do_bind(
 	 *		authentication	CHOICE {
 	 *			simple		[0] OCTET STRING -- passwd
 	 *			krbv42ldap	[1] OCTET STRING
-	 *			krbv42dsa	[1] OCTET STRING
+	 *			krbv42dsa	[2] OCTET STRING
+	 *			SASL		[3] SaslCredentials
 	 *		}
+	 *	}
+	 *
+	 *	SaslCredentials ::= SEQUENCE {
+     *		mechanism           LDAPString,
+     *		credentials         OCTET STRING OPTIONAL
 	 *	}
 	 */
 
-	rc = ber_scanf( ber, "{iat" /*}*/, &version, &cdn, &method );
+	tag = ber_scanf( ber, "{iat" /*}*/, &version, &dn, &method );
 
-	if ( rc == LBER_ERROR ) {
+	if ( tag == LBER_ERROR ) {
 		Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-		    "decoding error" );
-		return;
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR, "decoding error" );
+		rc = -1;
+		goto cleanup;
 	}
 
-	mech = NULL;
-	cred.bv_val = NULL;
+	op->o_protocol = version;
 
 	if( method != LDAP_AUTH_SASL ) {
-		rc = ber_scanf( ber, /*{*/ "o}", &cred );
+		tag = ber_scanf( ber, /*{*/ "o}", &cred );
 
 	} else {
-		rc = ber_scanf( ber, "{a" /*}*/, &mech );
+		tag = ber_scanf( ber, "{a" /*}*/, &mech );
 
-		if ( rc != LBER_ERROR ) {
+		if ( tag != LBER_ERROR ) {
 			ber_len_t len;
-			rc = ber_peek_tag( ber, &len );
+			tag = ber_peek_tag( ber, &len );
 
-			if ( rc == LDAP_TAG_LDAPCRED ) { 
-				rc = ber_scanf( ber, "o", &cred );
+			if ( tag == LDAP_TAG_LDAPCRED ) { 
+				tag = ber_scanf( ber, "o", &cred );
 			}
 
-			if ( rc != LBER_ERROR ) {
-				rc = ber_scanf( ber, /*{{*/ "}}" );
+			if ( tag != LBER_ERROR ) {
+				tag = ber_scanf( ber, /*{{*/ "}}" );
 			}
 		}
 	}
 
-	if ( rc == LBER_ERROR ) {
-		if ( cdn != NULL ) {
-			free( cdn );
-		}
-		if ( mech != NULL ) {
-			free( mech );
-		}
-		if ( cred.bv_val != NULL ) {
-			free( cred.bv_val );
-		}
-
-		Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
+	if ( tag == LBER_ERROR ) {
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR,
     		"decoding error" );
-
-		return;
+		rc = SLAPD_DISCONNECT;
+		goto cleanup;
 	}
 
-#ifdef GET_CTRLS
-	if( get_ctrls( conn, op, 1 ) == -1 ) {
-		if ( cdn != NULL ) {
-			free( cdn );
-		}
-		if ( mech != NULL ) {
-			free( mech );
-		}
-		if ( cred.bv_val != NULL ) {
-			free( cred.bv_val );
-		}
-		Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
-		return;
+	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+		Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
+		goto cleanup;
 	} 
-#endif
 
-	Debug( LDAP_DEBUG_TRACE, "do_bind: version %d dn (%s) method %d\n",
-	    version, cdn, method );
+	ndn = ch_strdup( dn );
 
-	ndn = dn_normalize_case( ch_strdup( cdn ) );
+	if ( dn_normalize( ndn ) == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n", dn, 0, 0 );
+		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+		    "invalid DN", NULL, NULL );
+		goto cleanup;
+	}
+
+	if( method == LDAP_AUTH_SASL ) {
+		Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
+			dn, mech, NULL );
+	} else {
+		Debug( LDAP_DEBUG_TRACE, "do_bind: version=%ld dn=\"%s\" method=%ld\n",
+			(unsigned long) version, dn, (unsigned long) method );
+	}
 
-	Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d BIND dn=\"%s\" method=%d\n",
-	    conn->c_connid, op->o_opid, ndn, method, 0 );
+	Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
+	    op->o_connid, op->o_opid, ndn, (unsigned long) method, 0 );
 
 	if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
-		if ( cdn != NULL ) {
-			free( cdn );
-		}
-		if ( ndn != NULL ) {
-			free( ndn );
+		Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
+			(unsigned long) version, 0, 0 );
+		send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+			NULL, "requested protocol version not supported", NULL, NULL );
+		goto cleanup;
+	}
+
+	/* we set connection version regardless of whether bind succeeds
+	 * or not.
+	 */
+	ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+	conn->c_protocol = version;
+	ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+	if ( method == LDAP_AUTH_SASL ) {
+		char *edn;
+
+		if ( version < LDAP_VERSION3 ) {
+			Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
+				(unsigned long) version, 0, 0 );
+			send_ldap_disconnect( conn, op,
+				LDAP_PROTOCOL_ERROR, "SASL bind requires LDAPv3" );
+			rc = SLAPD_DISCONNECT;
+			goto cleanup;
 		}
-		if ( mech != NULL ) {
-			free( mech );
+
+		if( mech == NULL || *mech == '\0' ) {
+			Debug( LDAP_DEBUG_ANY,
+				"do_bind: no sasl mechanism provided\n",
+				0, 0, 0 );
+			send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED,
+				NULL, "no SASL mechanism provided", NULL, NULL );
+			goto cleanup;
 		}
-		if ( cred.bv_val != NULL ) {
-			free( cred.bv_val );
+
+		if( !charray_inlist( supportedSASLMechanisms, mech ) ) {
+			Debug( LDAP_DEBUG_ANY,
+				"do_bind: sasl mechanism=\"%s\" not supported.\n",
+				mech, 0, 0 );
+			send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED,
+				NULL, "SASL mechanism not supported", NULL, NULL );
+			goto cleanup;
 		}
 
-		Debug( LDAP_DEBUG_ANY, "unknown version %d\n", version, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-		    "version not supported" );
-		return;
-	}
+		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
-	/* accept null binds */
-	if ( ndn == NULL || *ndn == '\0' ) {
-		if ( cdn != NULL ) {
-			free( cdn );
-		}
-		if ( ndn != NULL ) {
-			free( ndn );
-		}
-		if ( mech != NULL ) {
-			free( mech );
+		if ( conn->c_sasl_bind_mech != NULL ) {
+			if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
+				/* mechanism changed, cancel in progress bind */
+#ifdef HAVE_CYRUS_SASL
+				sasl_dispose(&conn->c_sasl_bind_context);
+				conn->c_sasl_bind_context = NULL;
+#endif
+			}
+			free( conn->c_sasl_bind_mech );
+			conn->c_sasl_bind_mech = NULL;
+
+#ifdef LDAP_DEBUG
+#ifdef HAVE_CYRUS_SASL
+		} else {
+			assert( conn->c_sasl_bind_context == NULL );
+#endif
+#endif
 		}
-		if ( cred.bv_val != NULL ) {
-			free( cred.bv_val );
+
+		ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+		edn = NULL;
+		rc = sasl_bind( conn, op, dn, ndn, mech, &cred, &edn );
+
+		if( rc == LDAP_SUCCESS ) {
+			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+#ifdef HAVE_CYRUS_SASL
+			assert( conn->c_sasl_bind_context == NULL );
+#endif
+			conn->c_dn = edn;
+			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+		} else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {
+#ifdef HAVE_CYRUS_SASL
+			assert( conn->c_sasl_bind_context != NULL );
+#endif
+			conn->c_sasl_bind_mech = mech;
+			mech = NULL;
+
+#ifdef HAVE_CYRUS_SASL
+		} else {
+			assert( conn->c_sasl_bind_context != NULL );
+#endif
 		}
 
+		goto cleanup;
+
+	} else {
+		/* Not SASL, cancel any in-progress bind */
 		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
-		conn->c_protocol = version;
+		if ( conn->c_sasl_bind_mech != NULL ) {
+			assert( conn->c_sasl_bind_in_progress );
 
-		if ( conn->c_cdn != NULL ) {
-			free( conn->c_cdn );
-			conn->c_cdn = NULL;
-		}
+			free(conn->c_sasl_bind_mech);
+			conn->c_sasl_bind_mech = NULL;
 
-		if ( conn->c_dn != NULL ) {
-			free( conn->c_dn );
-			conn->c_dn = NULL;
+#ifdef HAVE_CYRUS_SASL
+			assert( conn->c_sasl_bind_context != NULL );
+			sasl_dispose(&conn->c_sasl_bind_context);
+			conn->c_sasl_bind_context = NULL;
+#endif
+		} else {
+			assert( !conn->c_sasl_bind_in_progress );
+#ifdef HAVE_CYRUS_SASL
+			assert( conn->c_sasl_bind_context == NULL );
+#endif
 		}
 
 		ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+	}
 
-		send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL );
-		return;
+	/* accept "anonymous" binds */
+	if ( cred.bv_len == 0 || ndn == NULL || *ndn == '\0' ) {
+		/*
+		 * we already forced connection to "anonymous",
+		 * just need to send success
+		 */
+		send_ldap_result( conn, op, LDAP_SUCCESS,
+			NULL, NULL, NULL, NULL );
+		Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
+	   		version, 0, 0 );
+		goto cleanup;
 	}
 
 	/*
@@ -188,61 +307,46 @@ do_bind(
 	 */
 
 	if ( (be = select_backend( ndn )) == NULL ) {
-		free( cdn );
-		free( ndn );
-		if ( cred.bv_val != NULL ) {
-			free( cred.bv_val );
-		}
-		if ( cred.bv_len == 0 ) {
-			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+		if ( default_referral ) {
+			send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+				NULL, NULL, default_referral, NULL );
 
-			conn->c_protocol = version;
+		} else {
+			/* noSuchObject is not allowed to be returned by bind */
+			send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
+				NULL, NULL, NULL, NULL );
+		}
 
-			if ( conn->c_cdn != NULL ) {
-				free( conn->c_cdn );
-				conn->c_cdn = NULL;
-			}
+		goto cleanup;
+	}
 
-			if ( conn->c_dn != NULL ) {
-				free( conn->c_dn );
-				conn->c_dn = NULL;
-			}
+	conn->c_authz_backend = be;
 
-			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+	/* make sure this backend recongizes critical controls */
+	rc = backend_check_controls( be, conn, op, &text ) ;
 
-			send_ldap_result( conn, op, LDAP_SUCCESS,
-				NULL, NULL );
-		} else if ( default_referral && *default_referral ) {
-			send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS,
-				NULL, default_referral );
-		} else {
-			send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-				NULL, default_referral );
-		}
-		return;
+	if( rc != LDAP_SUCCESS ) {
+		send_ldap_result( conn, op, rc,
+			NULL, text, NULL, NULL );
+		goto cleanup;
 	}
 
 	if ( be->be_bind ) {
+		int ret;
 		/* alias suffix */
-		char *edn;
-
-		ndn = suffixAlias( ndn, op, be );
-
-		if ( (*be->be_bind)( be, conn, op, ndn, method, mech, &cred, &edn ) == 0 ) {
-			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+		char *edn = NULL;
 
-			conn->c_protocol = version;
+		/* deref suffix alias if appropriate */
+		ndn = suffix_alias( be, ndn );
 
-			if ( conn->c_cdn != NULL ) {
-				free( conn->c_cdn );
-			}
+		ret = (*be->be_bind)( be, conn, op, dn, ndn,
+			method, &cred, &edn );
 
-			conn->c_cdn = cdn;
-			cdn = NULL;
+		if ( ret == 0 ) {
+			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
-			if ( conn->c_dn != NULL ) {
-				free( conn->c_dn );
-			}
+			conn->c_cdn = dn;
+			dn = NULL;
 
 			if(edn != NULL) {
 				conn->c_dn = edn;
@@ -251,25 +355,27 @@ do_bind(
 				ndn = NULL;
 			}
 
-			Debug( LDAP_DEBUG_TRACE, "do_bind: bound \"%s\" to \"%s\"\n",
-	    		conn->c_cdn, conn->c_dn, method );
+			Debug( LDAP_DEBUG_TRACE, "do_bind: v%d bind: \"%s\" to \"%s\"\n",
+	    		version, conn->c_cdn, conn->c_dn );
 
 			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
 			/* send this here to avoid a race condition */
-			send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL );
+			send_ldap_result( conn, op, LDAP_SUCCESS,
+				NULL, NULL, NULL, NULL );
 
 		} else if (edn != NULL) {
 			free( edn );
 		}
 
 	} else {
-		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-		    "Function not implemented" );
+		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+			NULL, "operation not supported within namingContext", NULL, NULL );
 	}
 
-	if( cdn != NULL ) {
-		free( cdn );
+cleanup:
+	if( dn != NULL ) {
+		free( dn );
 	}
 	if( ndn != NULL ) {
 		free( ndn );
@@ -280,4 +386,6 @@ do_bind(
 	if ( cred.bv_val != NULL ) {
 		free( cred.bv_val );
 	}
+
+	return rc;
 }