X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbind.c;h=6480cf7fb82b5fcaa375e44e08ab3e2a9737df07;hb=0f30fb0d8f0adbbb7b41fd455c57aa56d64c9853;hp=4d96e0431efc685f3020e22762a0880268f10b28;hpb=825c3c4c5cdb62a0dea93a23360f171283d38474;p=openldap

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 4d96e0431e..6480cf7fb8 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -37,7 +37,6 @@ do_bind(
 	ber_int_t		version;
 	ber_tag_t method;
 	char		*mech;
-	char		*saslmech;
 	char		*dn;
 	char *ndn;
 	ber_tag_t	tag;
@@ -46,7 +45,11 @@ do_bind(
 	struct berval	cred;
 	Backend		*be;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "do_bind: conn %d\n", conn->c_connid ));
+#else
 	Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
+#endif
 
 	dn = NULL;
 	ndn = NULL;
@@ -85,15 +88,20 @@ do_bind(
 	 *	}
 	 *
 	 *	SaslCredentials ::= SEQUENCE {
-     *		mechanism           LDAPString,
-     *		credentials         OCTET STRING OPTIONAL
+     *		mechanism	    LDAPString,
+     *		credentials	    OCTET STRING OPTIONAL
 	 *	}
 	 */
 
 	tag = ber_scanf( ber, "{iat" /*}*/, &version, &dn, &method );
 
 	if ( tag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+			   "do_bind: conn %d  ber_scanf failed\n", conn->c_connid ));
+#else
 		Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
+#endif
 		send_ldap_disconnect( conn, op,
 			LDAP_PROTOCOL_ERROR, "decoding error" );
 		rc = -1;
@@ -129,39 +137,67 @@ do_bind(
 	if ( tag == LBER_ERROR ) {
 		send_ldap_disconnect( conn, op,
 			LDAP_PROTOCOL_ERROR,
-    		"decoding error" );
+		"decoding error" );
 		rc = SLAPD_DISCONNECT;
 		goto cleanup;
 	}
 
 	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+			   "do_bind: conn %d  get_ctrls failed\n", conn->c_connid ));
+#else
 		Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
+#endif
 		goto cleanup;
 	} 
 
 	ndn = ch_strdup( dn );
 
 	if ( dn_normalize( ndn ) == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+			   "do_bind: conn %d  invalid dn (%s)\n", conn->c_connid, dn ));
+#else
 		Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n", dn, 0, 0 );
+#endif
 		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
 		    "invalid DN", NULL, NULL );
 		goto cleanup;
 	}
 
 	if( method == LDAP_AUTH_SASL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation",	 LDAP_LEVEL_DETAIL1,
+			   "do_sasl_bind: conn %d  dn (%s) mech %s\n", conn->c_connid,
+			   dn, mech ));
+#else
 		Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
 			dn, mech, NULL );
+#endif
 	} else {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+			   "do_bind: conn %d  version=%ld dn=\"%s\" method=%ld\n",
+			   conn->c_connid, (unsigned long) version, dn, (unsigned long)method ));
+#else
 		Debug( LDAP_DEBUG_TRACE, "do_bind: version=%ld dn=\"%s\" method=%ld\n",
 			(unsigned long) version, dn, (unsigned long) method );
+#endif
 	}
 
 	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 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+			   "do_bind: conn %d  unknown version = %ld\n",
+			   conn->c_connid, (unsigned long)version ));
+#else
 		Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
 			(unsigned long) version, 0, 0 );
+#endif
 		send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
 			NULL, "requested protocol version not supported", NULL, NULL );
 		goto cleanup;
@@ -186,8 +222,14 @@ do_bind(
 		slap_ssf_t ssf = 0;
 
 		if ( version < LDAP_VERSION3 ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+				   "do_bind: conn %d  sasl with LDAPv%ld\n",
+				   conn->c_connid, (unsigned long)version ));
+#else
 			Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
 				(unsigned long) version, 0, 0 );
+#endif
 			send_ldap_disconnect( conn, op,
 				LDAP_PROTOCOL_ERROR, "SASL bind requires LDAPv3" );
 			rc = SLAPD_DISCONNECT;
@@ -195,58 +237,72 @@ do_bind(
 		}
 
 		if( mech == NULL || *mech == '\0' ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+				   "do_bind: conn %d  no SASL mechanism provided\n",
+				   conn->c_connid ));
+#else
 			Debug( LDAP_DEBUG_ANY,
 				"do_bind: no sasl mechanism provided\n",
 				0, 0, 0 );
+#endif
 			send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED,
 				NULL, "no SASL mechanism provided", NULL, NULL );
 			goto cleanup;
 		}
 
-		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-
-		if ( conn->c_sasl_bind_mech != NULL ) {
-			/* SASL bind is in progress */
-			saslmech = NULL;
+		/* check restrictions */
+		rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+		if( rc != LDAP_SUCCESS ) {
+			send_ldap_result( conn, op, rc,
+				NULL, text, NULL, NULL );
+			goto cleanup;
+		}
 
+		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+		if ( conn->c_sasl_bind_in_progress ) {
 			if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
-				/* mechanism changed */
+				/* mechanism changed between bind steps */
 				slap_sasl_reset(conn);
 			}
-
-			free( conn->c_sasl_bind_mech );
-			conn->c_sasl_bind_mech = NULL;
-
-#ifdef LDAP_DEBUG
 		} else {
-			/* SASL bind is NOT in progress */
-			saslmech = mech;
-			assert( conn->c_sasl_bind_mech == NULL );
-#endif
+			conn->c_sasl_bind_mech = mech;
+			mech = NULL;
 		}
-
 		ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
 		edn = NULL;
-		rc = slap_sasl_bind( conn, op, dn, ndn, saslmech, &cred,
-			&edn, &ssf );
+		rc = slap_sasl_bind( conn, op, dn, ndn, &cred, &edn, &ssf );
 
+		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 		if( rc == LDAP_SUCCESS ) {
-			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 			conn->c_dn = edn;
-			conn->c_authmech = mech;
-			if( ssf ) conn->c_sasl_layers++;
+			conn->c_authmech = conn->c_sasl_bind_mech;
+			conn->c_sasl_bind_mech = NULL;
+			conn->c_sasl_bind_in_progress = 0;
+
 			conn->c_sasl_ssf = ssf;
 			if( ssf > conn->c_ssf ) {
 				conn->c_ssf = ssf;
 			}
-			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+			if( conn->c_dn != NULL ) {
+				ber_len_t max = sockbuf_max_incoming;
+				ber_sockbuf_ctrl( conn->c_sb,
+					LBER_SB_OPT_SET_MAX_INCOMING, &max );
+			}
 
 		} else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {
-			conn->c_sasl_bind_mech = mech;
-		}
+			conn->c_sasl_bind_in_progress = 1;
 
-		mech = NULL;
+		} else {
+			if ( conn->c_sasl_bind_mech ) {
+				free( conn->c_sasl_bind_mech );
+				conn->c_sasl_bind_mech = NULL;
+			}
+			conn->c_sasl_bind_in_progress = 0;
+		}
+		ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
 		goto cleanup;
 
@@ -255,14 +311,10 @@ do_bind(
 		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
 		if ( conn->c_sasl_bind_mech != NULL ) {
-			assert( conn->c_sasl_bind_in_progress );
-
 			free(conn->c_sasl_bind_mech);
 			conn->c_sasl_bind_mech = NULL;
-
-		} else {
-			assert( !conn->c_sasl_bind_in_progress );
 		}
+		conn->c_sasl_bind_in_progress = 0;
 
 		slap_sasl_reset( conn );
 		ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
@@ -291,6 +343,9 @@ do_bind(
 				/* disallow */
 				rc = LDAP_INAPPROPRIATE_AUTH;
 				text = "anonymous bind disallowed";
+
+			} else {
+				rc = backend_check_restrictions( NULL, conn, op, mech, &text );
 			}
 
 			/*
@@ -299,8 +354,14 @@ do_bind(
 			 */
 			send_ldap_result( conn, op, rc,
 				NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+				   "do_bind: conn %d  v%d anonymous bind\n",
+				   conn->c_connid, version ));
+#else
 			Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
-		   		version, 0, 0 );
+				version, 0, 0 );
+#endif
 			goto cleanup;
 
 		} else if ( global_disallows & SLAP_DISALLOW_BIND_SIMPLE ) {
@@ -310,9 +371,15 @@ do_bind(
 
 			send_ldap_result( conn, op, rc,
 				NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+				   "do_bind: conn %d  v%d simple bind(%s) disallowed\n",
+				   conn->c_connid, version, ndn ));
+#else
 			Debug( LDAP_DEBUG_TRACE,
 				"do_bind: v%d simple bind(%s) disallowed\n",
-		   		version, ndn, 0 );
+				version, ndn, 0 );
+#endif
 			goto cleanup;
 		}
 
@@ -325,21 +392,33 @@ do_bind(
 
 			send_ldap_result( conn, op, rc,
 				NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+				   "do_bind: conn %d  v%d Kerberos V4 bind\n",
+				   conn->c_connid, version ));
+#else
 			Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n",
 				version, 0, 0 );
+#endif
 			goto cleanup;
 		}
 #endif
 
 	} else {
-		rc = LDAP_AUTH_UNKNOWN;
+		rc = LDAP_AUTH_METHOD_NOT_SUPPORTED;
 		text = "unknown authentication method";
 
 		send_ldap_result( conn, op, rc,
 			NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+			   "do_bind: conn %d  v%d unknown authentication method (%d)\n",
+			   conn->c_connid, version, method ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"do_bind: v%d unknown authentication method (%d)\n",
 			version, method, 0 );
+#endif
 		goto cleanup;
 	}
 
@@ -349,10 +428,15 @@ do_bind(
 	 * if we don't hold it.
 	 */
 
-	if ( (be = select_backend( ndn )) == NULL ) {
+	if ( (be = select_backend( ndn, 0 )) == NULL ) {
 		if ( default_referral ) {
+			struct berval **ref = referral_rewrite( default_referral,
+				NULL, dn, LDAP_SCOPE_DEFAULT );
+
 			send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-				NULL, NULL, default_referral, NULL );
+				NULL, NULL, ref ? ref : default_referral, NULL );
+
+			ber_bvecfree( ref );
 
 		} else {
 			/* noSuchObject is not allowed to be returned by bind */
@@ -364,7 +448,7 @@ do_bind(
 	}
 
 	/* check restrictions */
-	rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
+	rc = backend_check_restrictions( be, conn, op, NULL, &text );
 	if( rc != LDAP_SUCCESS ) {
 		send_ldap_result( conn, op, rc,
 			NULL, text, NULL, NULL );
@@ -397,8 +481,20 @@ do_bind(
 				ndn = NULL;
 			}
 
+			if( conn->c_dn != NULL ) {
+				ber_len_t max = sockbuf_max_incoming;
+				ber_sockbuf_ctrl( conn->c_sb,
+					LBER_SB_OPT_SET_MAX_INCOMING, &max );
+			}
+
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+				   "do_bind: conn %d  v%d bind: \"%s\" to \"%s\" \n",
+				   conn->c_connid, version, conn->c_cdn, conn->c_dn ));
+#else
 			Debug( LDAP_DEBUG_TRACE, "do_bind: v%d bind: \"%s\" to \"%s\"\n",
-	    		version, conn->c_cdn, conn->c_dn );
+			version, conn->c_cdn, conn->c_dn );
+#endif
 
 			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
@@ -416,16 +512,6 @@ do_bind(
 	}
 
 cleanup:
-	if( rc != LDAP_SASL_BIND_IN_PROGRESS ) {
-		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-
-		/* dispose of mech */
-		free( conn->c_sasl_bind_mech );
-		conn->c_sasl_bind_mech = NULL;
-
-		ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-	}
-
 	if( dn != NULL ) {
 		free( dn );
 	}