X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbind.c;h=34d617e6273b876232b1622cdc8a74b4b85bc653;hb=48b63d4f165269f29c35f89cceddd880c3966ef5;hp=8a11db02b0b5a024edd5264a9c9a3b088e1891ea;hpb=b7bbc7504d14e2d1c18f5e9392f644d94bf91f08;p=openldap diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c index 8a11db02b0..34d617e627 100644 --- a/servers/slapd/bind.c +++ b/servers/slapd/bind.c @@ -21,12 +21,6 @@ #include "slap.h" -char *supportedSASLMechanisms[] = { - "X-CRAM-MD5", - "X-DIGEST-MD5", - NULL -}; - int do_bind( Connection *conn, @@ -37,7 +31,7 @@ do_bind( ber_int_t version; ber_tag_t method; char *mech; - char *cdn, *ndn; + char *dn, *ndn; ber_tag_t tag; int rc = LDAP_SUCCESS; struct berval cred; @@ -45,7 +39,7 @@ do_bind( Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 ); - cdn = NULL; + dn = NULL; ndn = NULL; mech = NULL; cred.bv_val = NULL; @@ -69,6 +63,16 @@ do_bind( 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: * @@ -89,15 +93,27 @@ do_bind( * } */ - tag = ber_scanf( ber, "{iat" /*}*/, &version, &cdn, &method ); + tag = ber_scanf( ber, "{iat" /*}*/, &version, &dn, &method ); if ( tag == LBER_ERROR ) { Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL, - "decoding error" ); + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding error" ); + rc = -1; goto cleanup; } + ndn = ch_strdup( dn ); + + if ( dn_normalize_case( 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 ) { tag = ber_scanf( ber, /*{*/ "o}", &cred ); @@ -119,35 +135,33 @@ do_bind( } if ( tag == LBER_ERROR ) { - send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL, + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding error" ); + rc = -1; goto cleanup; } -#ifdef GET_CTRLS 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 if( method == LDAP_AUTH_SASL ) { Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n", - cdn, mech, NULL ); + dn, mech, NULL ); } else { Debug( LDAP_DEBUG_TRACE, "do_bind: version %d dn (%s) method %d\n", - version, cdn, method ); + version, dn, method ); } - ndn = dn_normalize_case( ch_strdup( cdn ) ); - Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d BIND dn=\"%s\" method=%d\n", - conn->c_connid, op->o_opid, ndn, method, 0 ); + op->o_connid, op->o_opid, ndn, method, 0 ); if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) { Debug( LDAP_DEBUG_ANY, "unknown version %d\n", version, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL, - "version not supported" ); + send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, + NULL, "version not supported", NULL, NULL ); goto cleanup; } @@ -155,8 +169,9 @@ do_bind( if ( version < LDAP_VERSION3 ) { Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%d\n", version, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL, - "sasl bind requires LDAPv3" ); + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "sasl bind requires LDAPv3" ); + rc = -1; goto cleanup; } @@ -165,7 +180,7 @@ do_bind( "do_bind: no sasl mechanism provided\n", version, 0, 0 ); send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED, - NULL, "no sasl mechanism provided" ); + NULL, "no sasl mechanism provided", NULL, NULL ); goto cleanup; } @@ -174,7 +189,7 @@ do_bind( "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, "sasl mechanism not supported", NULL, NULL ); goto cleanup; } @@ -229,7 +244,8 @@ do_bind( * we already forced connection to "anonymous", we just * need to send success */ - send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL ); + send_ldap_result( conn, op, LDAP_SUCCESS, + NULL, NULL, NULL, NULL ); goto cleanup; } @@ -242,15 +258,15 @@ do_bind( if ( (be = select_backend( ndn )) == NULL ) { if ( cred.bv_len == 0 ) { send_ldap_result( conn, op, LDAP_SUCCESS, - NULL, NULL ); + NULL, NULL, NULL, NULL ); - } else if ( default_referral && *default_referral ) { - send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, - NULL, default_referral ); + } else if ( default_referral ) { + send_ldap_result( conn, op, rc = LDAP_REFERRAL, + NULL, NULL, default_referral, NULL ); } else { send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS, - NULL, default_referral ); + NULL, NULL, NULL, NULL ); } goto cleanup; @@ -260,13 +276,14 @@ do_bind( /* alias suffix */ char *edn; - ndn = suffixAlias( ndn, op, be ); + /* deref suffix alias if appropriate */ + ndn = suffix_alias( be, ndn ); if ( (*be->be_bind)( be, conn, op, ndn, method, mech, &cred, &edn ) == 0 ) { ldap_pvt_thread_mutex_lock( &conn->c_mutex ); - conn->c_cdn = cdn; - cdn = NULL; + conn->c_cdn = dn; + dn = NULL; if(edn != NULL) { conn->c_dn = edn; @@ -281,20 +298,21 @@ do_bind( 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, rc = LDAP_UNWILLING_TO_PERFORM, NULL, - "Function not implemented" ); + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "Function not implemented", NULL, NULL ); } cleanup: - if( cdn != NULL ) { - free( cdn ); + if( dn != NULL ) { + free( dn ); } if( ndn != NULL ) { free( ndn );