/* bind.c - decode an ldap bind operation and pass it to a backend db */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
BerElement *ber = op->o_ber;
ber_int_t version;
ber_tag_t method;
- char *mech = NULL;
+ struct berval mech = { 0, NULL };
struct berval dn = { 0, NULL };
- struct berval *pdn = NULL;
- struct berval *ndn = NULL;
+ struct berval pdn = { 0, NULL };
+ struct berval ndn = { 0, NULL };
+ struct berval edn = { 0, NULL };
ber_tag_t tag;
int rc = LDAP_SUCCESS;
const char *text;
connection2anonymous( conn );
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_dn.bv_val != NULL ) {
+ free( op->o_dn.bv_val );
+ op->o_dn.bv_val = ch_strdup( "" );
+ op->o_dn.bv_len = 0;
}
- if ( op->o_ndn != NULL ) {
- free( op->o_ndn );
- op->o_ndn = ch_strdup( "" );
+ if ( op->o_ndn.bv_val != NULL ) {
+ free( op->o_ndn.bv_val );
+ op->o_ndn.bv_val = ch_strdup( "" );
+ op->o_ndn.bv_len = 0;
}
/*
* }
*/
- tag = ber_scanf( ber, "{iot" /*}*/, &version, &dn, &method );
+ tag = ber_scanf( ber, "{imt" /*}*/, &version, &dn, &method );
if ( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
op->o_protocol = version;
if( method != LDAP_AUTH_SASL ) {
- tag = ber_scanf( ber, /*{*/ "o}", &cred );
+ tag = ber_scanf( ber, /*{*/ "m}", &cred );
} else {
- tag = ber_scanf( ber, "{a" /*}*/, &mech );
+ tag = ber_scanf( ber, "{o" /*}*/, &mech );
if ( tag != LBER_ERROR ) {
ber_len_t len;
tag = ber_peek_tag( ber, &len );
if ( tag == LDAP_TAG_LDAPCRED ) {
- tag = ber_scanf( ber, "o", &cred );
+ tag = ber_scanf( ber, "m", &cred );
} else {
tag = LDAP_TAG_LDAPCRED;
cred.bv_val = NULL;
goto cleanup;
}
- rc = dnPretty( NULL, &dn, &pdn );
- if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "do_bind: conn %d invalid dn (%s)\n",
- conn->c_connid, dn.bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n",
- dn.bv_val, 0, 0 );
-#endif
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid DN", NULL, NULL );
- goto cleanup;
- }
-
- rc = dnNormalize( NULL, &dn, &ndn );
+ rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_sasl_bind: conn %d dn (%s) mech %s\n", conn->c_connid,
- pdn->bv_val, mech ));
+ pdn.bv_val, mech.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
- pdn->bv_val, mech, NULL );
+ pdn.bv_val, mech.bv_val, NULL );
#endif
} else {
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d version=%ld dn=\"%s\" method=%ld\n",
conn->c_connid, (unsigned long) version,
- pdn->bv_val, (unsigned long)method ));
+ pdn.bv_val, (unsigned long)method ));
#else
Debug( LDAP_DEBUG_TRACE,
"do_bind: version=%ld dn=\"%s\" method=%ld\n",
(unsigned long) version,
- pdn->bv_val, (unsigned long) method );
+ pdn.bv_val, (unsigned long) method );
#endif
}
Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
- op->o_connid, op->o_opid, pdn->bv_val, (unsigned long) method, 0 );
+ op->o_connid, op->o_opid, pdn.bv_val, (unsigned long) method, 0 );
if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
#ifdef NEW_LOGGING
conn->c_protocol = version;
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+ /* check for inappropriate controls */
+ if( get_manageDSAit( op ) == SLAP_CRITICAL_CONTROL ) {
+ send_ldap_result( conn, op,
+ rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
+ NULL, "manageDSAit control inappropriate",
+ NULL, NULL );
+ goto cleanup;
+ }
+
if ( method == LDAP_AUTH_SASL ) {
- char *edn;
slap_ssf_t ssf = 0;
if ( version < LDAP_VERSION3 ) {
goto cleanup;
}
- if( mech == NULL || *mech == '\0' ) {
+ if( mech.bv_len == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d no SASL mechanism provided\n",
}
/* check restrictions */
- rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+ rc = backend_check_restrictions( NULL, conn, op, mech.bv_val, &text );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
if ( conn->c_sasl_bind_in_progress ) {
- if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
+ if((ber_bvcmp(&conn->c_sasl_bind_mech, &mech) != 0)) {
/* mechanism changed between bind steps */
slap_sasl_reset(conn);
}
} else {
conn->c_sasl_bind_mech = mech;
- mech = NULL;
+ mech.bv_val = NULL;
+ mech.bv_len = 0;
}
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
- edn = NULL;
rc = slap_sasl_bind( conn, op,
- pdn->bv_val, ndn->bv_val,
+ &pdn, &ndn,
&cred, &edn, &ssf );
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
if( rc == LDAP_SUCCESS ) {
conn->c_dn = edn;
- if( edn != NULL ) {
- conn->c_ndn = ch_strdup( edn );
- dn_normalize( conn->c_ndn );
+ if( edn.bv_len != 0 ) {
+ /* edn is always normalized already */
+ ber_dupbv( &conn->c_ndn, &conn->c_dn );
}
conn->c_authmech = conn->c_sasl_bind_mech;
- conn->c_sasl_bind_mech = NULL;
+ conn->c_sasl_bind_mech.bv_val = NULL;
+ conn->c_sasl_bind_mech.bv_len = 0;
conn->c_sasl_bind_in_progress = 0;
conn->c_sasl_ssf = ssf;
conn->c_ssf = ssf;
}
- if( conn->c_dn != NULL ) {
+ if( conn->c_dn.bv_len != 0 ) {
ber_len_t max = sockbuf_max_incoming;
ber_sockbuf_ctrl( conn->c_sb,
LBER_SB_OPT_SET_MAX_INCOMING, &max );
conn->c_sasl_bind_in_progress = 1;
} else {
- if ( conn->c_sasl_bind_mech ) {
- free( conn->c_sasl_bind_mech );
- conn->c_sasl_bind_mech = NULL;
+ if ( conn->c_sasl_bind_mech.bv_val ) {
+ free( conn->c_sasl_bind_mech.bv_val );
+ conn->c_sasl_bind_mech.bv_val = NULL;
+ conn->c_sasl_bind_mech.bv_len = 0;
}
conn->c_sasl_bind_in_progress = 0;
}
/* Not SASL, cancel any in-progress bind */
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- if ( conn->c_sasl_bind_mech != NULL ) {
- free(conn->c_sasl_bind_mech);
- conn->c_sasl_bind_mech = NULL;
+ if ( conn->c_sasl_bind_mech.bv_val != NULL ) {
+ free(conn->c_sasl_bind_mech.bv_val);
+ conn->c_sasl_bind_mech.bv_val = NULL;
+ conn->c_sasl_bind_mech.bv_len = 0;
}
conn->c_sasl_bind_in_progress = 0;
if ( method == LDAP_AUTH_SIMPLE ) {
/* accept "anonymous" binds */
- if ( cred.bv_len == 0 || ndn->bv_len == 0 ) {
+ if ( cred.bv_len == 0 || ndn.bv_len == 0 ) {
rc = LDAP_SUCCESS;
text = NULL;
/* cred is not empty, disallow */
rc = LDAP_INVALID_CREDENTIALS;
- } else if ( ndn->bv_len &&
+ } else if ( ndn.bv_len &&
!( global_allows & SLAP_ALLOW_BIND_ANON_DN ))
{
/* DN is not empty, disallow */
text = "anonymous bind disallowed";
} else {
- rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+ rc = backend_check_restrictions( NULL, conn, op, mech.bv_val, &text );
}
/*
#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 ));
+ conn->c_connid, version, ndn.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d simple bind(%s) disallowed\n",
- version, ndn, 0 );
+ version, ndn.bv_val, 0 );
#endif
goto cleanup;
}
* if we don't hold it.
*/
- if ( (be = select_backend( ndn->bv_val, 0, 0 )) == NULL ) {
+ if ( (be = select_backend( &ndn, 0, 0 )) == NULL ) {
if ( default_referral ) {
- struct berval **ref = referral_rewrite( default_referral,
- NULL, pdn->bv_val, LDAP_SCOPE_DEFAULT );
+ BerVarray ref = referral_rewrite( default_referral,
+ NULL, &pdn, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
NULL, NULL, ref ? ref : default_referral, NULL );
- ber_bvecfree( ref );
+ ber_bvarray_free( ref );
} else {
/* noSuchObject is not allowed to be returned by bind */
if ( be->be_bind ) {
int ret;
- /* alias suffix */
- char *edn = NULL;
/* deref suffix alias if appropriate */
- ndn->bv_val = suffix_alias( be, ndn->bv_val );
- ndn->bv_len = strlen( ndn->bv_val );
+ suffix_alias( be, &ndn );
ret = (*be->be_bind)( be, conn, op,
- pdn->bv_val, ndn->bv_val,
- method, &cred, &edn );
+ &pdn, &ndn, method, &cred, &edn );
if ( ret == 0 ) {
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- conn->c_cdn = pdn->bv_val;
- dn.bv_val = NULL;
- dn.bv_len = 0;
-
- if(edn != NULL) {
+ if(edn.bv_len) {
conn->c_dn = edn;
} else {
- conn->c_dn = ch_strdup( conn->c_cdn );
+ ber_dupbv( &conn->c_dn, &pdn );
}
- conn->c_ndn = ndn->bv_val;
- ndn->bv_val = NULL;
- ndn->bv_len = 0;
+ conn->c_cdn = pdn;
+ pdn.bv_val = NULL;
+ pdn.bv_len = 0;
- if( conn->c_dn != NULL ) {
+ conn->c_ndn = ndn;
+ ndn.bv_val = NULL;
+ ndn.bv_len = 0;
+
+ if( conn->c_dn.bv_len != 0 ) {
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 ));
+ conn->c_connid, version, conn->c_cdn.bv_val, conn->c_dn.bv_val ));
#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.bv_val, conn->c_dn.bv_val );
#endif
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
send_ldap_result( conn, op, LDAP_SUCCESS,
NULL, NULL, NULL, NULL );
- } else if (edn != NULL) {
- free( edn );
+ } else if (edn.bv_val != NULL) {
+ free( edn.bv_val );
}
} else {
}
cleanup:
- free( dn.bv_val );
- if( pdn != NULL ) {
- ber_bvfree( pdn );
- }
- if( ndn != NULL ) {
- ber_bvfree( ndn );
+ if( pdn.bv_val != NULL ) {
+ free( pdn.bv_val );
}
- if ( mech != NULL ) {
- free( mech );
+ if( ndn.bv_val != NULL ) {
+ free( ndn.bv_val );
}
- if ( cred.bv_val != NULL ) {
- free( cred.bv_val );
+ if ( mech.bv_val != NULL ) {
+ free( mech.bv_val );
}
return rc;
projects / openldap / blobdiff