/* bind.c - decode an ldap bind operation and pass it to a backend db */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
char *ndn;
ber_tag_t tag;
int rc = LDAP_SUCCESS;
+ const char *text;
struct berval cred;
Backend *be;
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- /* Force to connection to "anonymous" until bind succeeds.
- * This may need to be relocated or done on a case by case basis
- * to handle certain SASL mechanisms.
+ /*
+ * Force to connection to "anonymous" until bind succeeds.
*/
if ( conn->c_cdn != NULL ) {
conn->c_dn = NULL;
}
+ conn->c_authc_backend = NULL;
conn->c_authz_backend = NULL;
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
goto cleanup;
}
- ndn = ch_strdup( dn );
-
- 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;
- }
-
op->o_protocol = version;
if( method != LDAP_AUTH_SASL ) {
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR,
"decoding error" );
- rc = -1;
+ rc = SLAPD_DISCONNECT;
goto cleanup;
}
goto cleanup;
}
+ ndn = ch_strdup( dn );
+
+ 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 );
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, "version not supported", NULL, NULL );
+ 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 = -1;
+ LDAP_PROTOCOL_ERROR, "SASL bind requires LDAPv3" );
+ rc = SLAPD_DISCONNECT;
goto cleanup;
}
"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 );
+ NULL, "no SASL mechanism provided", NULL, NULL );
goto cleanup;
}
"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 );
+ NULL, "SASL mechanism not supported", NULL, NULL );
goto cleanup;
}
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- if ( conn->c_authmech != NULL ) {
- assert( conn->c_bind_in_progress );
-
- if((strcmp(conn->c_authmech, mech) != 0)) {
+ if ( conn->c_sasl_bind_mech != NULL ) {
+ if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
/* mechanism changed, cancel in progress bind */
- conn->c_bind_in_progress = 0;
- if( conn->c_authstate != NULL ) {
- free(conn->c_authstate);
- conn->c_authstate = NULL;
- }
- free(conn->c_authmech);
- conn->c_authmech = NULL;
+#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
+ }
+
+ 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_bind_in_progress );
- assert( conn->c_authmech == NULL );
- assert( conn->c_authstate == NULL );
+ 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 );
- if ( conn->c_authmech != NULL ) {
- assert( conn->c_bind_in_progress );
+ if ( conn->c_sasl_bind_mech != NULL ) {
+ assert( conn->c_sasl_bind_in_progress );
- /* cancel in progress bind */
- conn->c_bind_in_progress = 0;
+ free(conn->c_sasl_bind_mech);
+ conn->c_sasl_bind_mech = NULL;
- if( conn->c_authstate != NULL ) {
- free(conn->c_authstate);
- conn->c_authstate = NULL;
- }
- free(conn->c_authmech);
- conn->c_authmech = 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
}
- }
- conn->c_protocol = version;
- ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+ ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+ }
- /* accept null binds */
- if ( ndn == NULL || *ndn == '\0' ) {
+ /* accept "anonymous" binds */
+ if ( cred.bv_len == 0 || ndn == NULL || *ndn == '\0' ) {
/*
- * we already forced connection to "anonymous", we just
- * need to send success
+ * 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;
}
*/
if ( (be = select_backend( ndn )) == NULL ) {
- if ( cred.bv_len == 0 ) {
- send_ldap_result( conn, op, LDAP_SUCCESS,
- NULL, NULL, NULL, NULL );
-
- } else if ( default_referral ) {
+ if ( default_referral ) {
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
NULL, NULL, default_referral, NULL );
conn->c_authz_backend = be;
/* make sure this backend recongizes critical controls */
- rc = backend_check_controls( be, conn, op ) ;
+ rc = backend_check_controls( be, conn, op, &text ) ;
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
- NULL, NULL, NULL, NULL );
+ NULL, text, NULL, NULL );
+ goto cleanup;
}
if ( be->be_bind ) {
ndn = suffix_alias( be, ndn );
ret = (*be->be_bind)( be, conn, op, dn, ndn,
- method, mech, &cred, &edn );
+ method, &cred, &edn );
if ( ret == 0 ) {
-#ifdef HAVE_CYRUS_SASL
- int ssf = 0;
-#endif
-
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
conn->c_cdn = dn;
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_ldap_result( conn, op, LDAP_SUCCESS,
NULL, NULL, NULL, NULL );
-#ifdef HAVE_CYRUS_SASL
- if ( conn->c_sasl_context != NULL &&
- sasl_getprop( conn->c_sasl_context, SASL_SSF, (void **)&ssf )
- == SASL_OK && ssf ) {
- /* Enable encode/decode */
- ldap_pvt_sasl_install( conn->c_sb, conn->c_sasl_context );
- }
-#endif
} else if (edn != NULL) {
free( edn );
}
} else {
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "Function not implemented", NULL, NULL );
+ NULL, "operation not supported within namingContext", NULL, NULL );
}
cleanup:
projects / openldap / blobdiff