/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <ac/socket.h>
#include "slap.h"
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-#endif
-
int
do_bind(
if ( op->o_conn->c_sasl_bind_in_progress ) {
be = op->o_conn->c_authz_backend;
}
- if ( op->o_conn->c_dn.bv_len ) {
+ if ( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
/* log authorization identity demotion */
Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu BIND anonymous mech=implicit ssf=0\n",
- op->o_connid, op->o_opid, 0, 0, 0 );
+ "%s BIND anonymous mech=implicit ssf=0\n",
+ op->o_log_prefix, 0, 0, 0, 0 );
}
connection2anonymous( op->o_conn );
if ( op->o_conn->c_sasl_bind_in_progress ) {
op->o_conn->c_authz_backend = be;
}
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
- if ( op->o_dn.bv_val != NULL ) {
- free( op->o_dn.bv_val );
- op->o_dn.bv_val = ch_strdup( "" );
+ if ( !BER_BVISNULL( &op->o_dn ) ) {
+ /* NOTE: temporarily wasting few bytes
+ * (until bind is completed), but saving
+ * a couple of ch_free() and ch_strdup("") */
+ op->o_dn.bv_val[0] = '\0';
op->o_dn.bv_len = 0;
}
- if ( op->o_ndn.bv_val != NULL ) {
- free( op->o_ndn.bv_val );
- op->o_ndn.bv_val = ch_strdup( "" );
+ if ( !BER_BVISNULL( &op->o_ndn ) ) {
+ op->o_ndn.bv_val[0] = '\0';
op->o_ndn.bv_len = 0;
}
(unsigned long) op->orb_method );
}
- Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu BIND dn=\"%s\" method=%ld\n",
- op->o_connid, op->o_opid, op->o_req_dn.bv_val,
- (unsigned long) op->orb_method, 0 );
+ Statslog( LDAP_DEBUG_STATS, "%s BIND dn=\"%s\" method=%ld\n",
+ op->o_log_prefix, op->o_req_dn.bv_val,
+ (unsigned long) op->orb_method, 0, 0 );
if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
op->o_conn->c_authtype = op->orb_method;
}
- op->o_conn->c_sasl_bindop = NULL;
-
- if( op->o_req_dn.bv_val != NULL ) {
+ if( !BER_BVISNULL( &op->o_req_dn ) ) {
slap_sl_free( op->o_req_dn.bv_val, op->o_tmpmemctx );
BER_BVZERO( &op->o_req_dn );
}
- if( op->o_req_ndn.bv_val != NULL ) {
+ if( !BER_BVISNULL( &op->o_req_ndn ) ) {
slap_sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx );
BER_BVZERO( &op->o_req_ndn );
}
fe_op_bind( Operation *op, SlapReply *rs )
{
struct berval mech = op->orb_tmp_mech;
+ BackendDB *bd = op->o_bd;
/* check for inappropriate controls */
- if( get_manageDSAit( op ) == SLAP_CRITICAL_CONTROL ) {
+ if( get_manageDSAit( op ) == SLAP_CONTROL_CRITICAL ) {
send_ldap_error( op, rs,
LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
"manageDSAit control inappropriate" );
goto cleanup;
}
- /* Set the bindop for the benefit of in-directory SASL lookups */
- op->o_conn->c_sasl_bindop = op;
-
if ( op->orb_method == LDAP_AUTH_SASL ) {
if ( op->o_protocol < LDAP_VERSION3 ) {
Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
goto cleanup;
}
- if( mech.bv_len == 0 ) {
+ if( BER_BVISNULL( &mech ) || BER_BVISEMPTY( &mech ) ) {
Debug( LDAP_DEBUG_ANY,
"do_bind: no sasl mechanism provided\n",
0, 0, 0 );
} else {
ber_dupbv(&op->o_conn->c_sasl_bind_mech, &mech);
}
+
+ /* Set the bindop for the benefit of in-directory SASL lookups */
+ op->o_conn->c_sasl_bindop = op;
+
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
rs->sr_err = slap_sasl_bind( op, rs );
- ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
- if( rs->sr_err == LDAP_SUCCESS ) {
- ber_dupbv(&op->o_conn->c_dn, &op->orb_edn);
- if( op->orb_edn.bv_len != 0 ) {
- /* edn is always normalized already */
- ber_dupbv( &op->o_conn->c_ndn, &op->o_conn->c_dn );
- }
- op->o_tmpfree( op->orb_edn.bv_val, op->o_tmpmemctx );
- BER_BVZERO( &op->orb_edn );
- op->o_conn->c_authmech = op->o_conn->c_sasl_bind_mech;
- BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
- op->o_conn->c_sasl_bind_in_progress = 0;
-
- op->o_conn->c_sasl_ssf = op->orb_ssf;
- if( op->orb_ssf > op->o_conn->c_ssf ) {
- op->o_conn->c_ssf = op->orb_ssf;
- }
-
- if( op->o_conn->c_dn.bv_len != 0 ) {
- ber_len_t max = sockbuf_max_incoming_auth;
- ber_sockbuf_ctrl( op->o_conn->c_sb,
- LBER_SB_OPT_SET_MAX_INCOMING, &max );
- }
-
- /* log authorization identity */
- Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu BIND dn=\"%s\" mech=%s ssf=%d\n",
- op->o_connid, op->o_opid,
- op->o_conn->c_dn.bv_val ? op->o_conn->c_dn.bv_val : "<empty>",
- op->o_conn->c_authmech.bv_val, op->orb_ssf );
-
- Debug( LDAP_DEBUG_TRACE,
- "do_bind: SASL/%s bind: dn=\"%s\" ssf=%d\n",
- op->o_conn->c_authmech.bv_val,
- op->o_conn->c_dn.bv_val ? op->o_conn->c_dn.bv_val : "<empty>",
- op->orb_ssf );
-
- } else if ( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS ) {
- op->o_conn->c_sasl_bind_in_progress = 1;
-
- } else {
- if ( op->o_conn->c_sasl_bind_mech.bv_val ) {
- free( op->o_conn->c_sasl_bind_mech.bv_val );
- BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
- }
- op->o_conn->c_sasl_bind_in_progress = 0;
- }
-
-#ifdef LDAP_SLAPI
-#define pb op->o_pb
- /*
- * Normally post-operation plugins are called only after the
- * backend operation. Because the front-end performs SASL
- * binds on behalf of the backend, we'll make a special
- * exception to call the post-operation plugins after a
- * SASL bind.
- */
- if ( pb ) {
- slapi_int_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)op->o_req_dn.bv_val );
- slapi_pblock_set( pb, SLAPI_BIND_METHOD, (void *)op->orb_method );
- slapi_pblock_set( pb,
- SLAPI_BIND_CREDENTIALS, (void *)&op->orb_cred );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(0) );
- (void) slapi_int_call_plugins( op->o_bd,
- SLAPI_PLUGIN_POST_BIND_FN, pb );
- }
-#endif /* LDAP_SLAPI */
-
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-
goto cleanup;
} else {
/* Not SASL, cancel any in-progress bind */
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
- if ( op->o_conn->c_sasl_bind_mech.bv_val != NULL ) {
- free(op->o_conn->c_sasl_bind_mech.bv_val);
+ if ( !BER_BVISNULL( &op->o_conn->c_sasl_bind_mech ) ) {
+ free( op->o_conn->c_sasl_bind_mech.bv_val );
BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
}
op->o_conn->c_sasl_bind_in_progress = 0;
}
if ( op->orb_method == LDAP_AUTH_SIMPLE ) {
- ber_str2bv( "SIMPLE", sizeof("SIMPLE")-1, 0, &mech );
+ BER_BVSTR( &mech, "SIMPLE" );
/* accept "anonymous" binds */
- if ( op->orb_cred.bv_len == 0 || op->o_req_ndn.bv_len == 0 ) {
+ if ( BER_BVISEMPTY( &op->orb_cred ) || BER_BVISEMPTY( &op->o_req_ndn ) ) {
rs->sr_err = LDAP_SUCCESS;
- if( op->orb_cred.bv_len &&
+ if( !BER_BVISEMPTY( &op->orb_cred ) &&
!( global_allows & SLAP_ALLOW_BIND_ANON_CRED ))
{
/* cred is not empty, disallow */
rs->sr_err = LDAP_INVALID_CREDENTIALS;
- } else if ( op->o_req_ndn.bv_len &&
+ } else if ( !BER_BVISEMPTY( &op->o_req_ndn ) &&
!( global_allows & SLAP_ALLOW_BIND_ANON_DN ))
{
/* DN is not empty, disallow */
op->o_protocol, 0, 0 );
goto cleanup;
}
- ber_str2bv( "KRBV4", sizeof("KRBV4")-1, 0, &mech );
+ BER_BVSTR( &mech, "KRBV4" );
} else if ( op->orb_method == LDAP_AUTH_KRBV42 ) {
rs->sr_err = LDAP_AUTH_METHOD_NOT_SUPPORTED;
send_ldap_result( op, rs );
Debug( LDAP_DEBUG_TRACE,
- "do_bind: v%d unknown authentication method (%ld)\n",
+ "do_bind: v%d unknown authentication method (%d)\n",
op->o_protocol, op->orb_method, 0 );
goto cleanup;
}
/*
* We could be serving multiple database backends. Select the
- * appropriate one, or send a referral to our "referral server"
- * if we don't hold it.
+ * appropriate one. If none, return invalid cred, not a referral.
*/
if ( (op->o_bd = select_backend( &op->o_req_ndn, 0, 0 )) == NULL ) {
/* don't return referral for bind requests */
/* noSuchObject is not allowed to be returned by bind */
rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ op->o_bd = bd;
send_ldap_result( op, rs );
goto cleanup;
}
goto cleanup;
}
-#ifdef LDAP_SLAPI
- if ( pb ) {
- int rc;
- slapi_int_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)op->o_req_dn.bv_val );
- slapi_pblock_set( pb, SLAPI_BIND_METHOD, (void *)op->orb_method );
- slapi_pblock_set( pb, SLAPI_BIND_CREDENTIALS, (void *)&op->orb_cred );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(0) );
- slapi_pblock_set( pb, SLAPI_CONN_DN, (void *)(0) );
-
- rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_BIND_FN, pb );
-
- Debug(LDAP_DEBUG_TRACE,
- "do_bind: Bind preoperation plugin returned %d.\n",
- rs->sr_err, 0, 0);
-
- switch ( rc ) {
- case SLAPI_BIND_SUCCESS:
- /* Continue with backend processing */
- break;
- case SLAPI_BIND_FAIL:
- /* Failure, server sends result */
- rs->sr_err = LDAP_INVALID_CREDENTIALS;
- send_ldap_result( op, rs );
- goto cleanup;
- break;
- case SLAPI_BIND_ANONYMOUS:
- /* SLAPI_BIND_ANONYMOUS is undocumented XXX */
- default:
- /* Authoritative, plugin sent result, or no plugins called. */
- if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE,
- (void *)&rs->sr_err) != 0 )
- {
- rs->sr_err = LDAP_OTHER;
- }
-
- BER_BVZERO( &op->orb_edn );
-
- if ( rs->sr_err == LDAP_SUCCESS ) {
- slapi_pblock_get( pb, SLAPI_CONN_DN,
- (void *)&op->orb_edn.bv_val );
- if ( BER_BVISNULL( &op->orb_edn ) ) {
- if ( rc == 1 ) {
- /* No plugins were called; continue. */
- break;
- }
- } else {
- op->orb_edn.bv_len = strlen( op->orb_edn.bv_val );
- }
- rs->sr_err = dnPrettyNormal( NULL, &op->orb_edn,
- &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
- ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
- ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn);
- ber_dupbv(&op->o_conn->c_ndn, &op->o_req_ndn);
- op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
- BER_BVZERO( &op->o_req_dn );
- op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
- BER_BVZERO( &op->o_req_ndn );
- if ( op->o_conn->c_dn.bv_len != 0 ) {
- ber_len_t max = sockbuf_max_incoming_auth;
- ber_sockbuf_ctrl( op->o_conn->c_sb,
- LBER_SB_OPT_SET_MAX_INCOMING, &max );
- }
- /* log authorization identity */
- Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu BIND dn=\"%s\" mech=%s (SLAPI) ssf=0\n",
- op->o_connid, op->o_opid,
- op->o_conn->c_dn.bv_val
- ? op->o_conn->c_dn.bv_val : "<empty>",
- mech.bv_val, 0 );
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
- }
- goto cleanup;
- break;
- }
- }
-#endif /* LDAP_SLAPI */
-
if( op->o_bd->be_bind ) {
+ op->o_conn->c_authz_cookie = NULL;
+
rs->sr_err = (op->o_bd->be_bind)( op, rs );
if ( rs->sr_err == 0 ) {
}
/* be_bind returns regular/global edn */
- if( op->orb_edn.bv_len ) {
+ if( !BER_BVISEMPTY( &op->orb_edn ) ) {
op->o_conn->c_dn = op->orb_edn;
} else {
ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn);
ber_dupbv( &op->o_conn->c_ndn, &op->o_req_ndn );
- if( op->o_conn->c_dn.bv_len != 0 ) {
+ if( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
ber_len_t max = sockbuf_max_incoming_auth;
ber_sockbuf_ctrl( op->o_conn->c_sb,
LBER_SB_OPT_SET_MAX_INCOMING, &max );
/* log authorization identity */
Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu BIND dn=\"%s\" mech=%s ssf=0\n",
- op->o_connid, op->o_opid,
- op->o_conn->c_dn.bv_val, mech.bv_val, 0 );
+ "%s BIND dn=\"%s\" mech=%s ssf=0\n",
+ op->o_log_prefix,
+ op->o_conn->c_dn.bv_val, mech.bv_val, 0, 0 );
Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d bind: \"%s\" to \"%s\"\n",
/* send this here to avoid a race condition */
send_ldap_result( op, rs );
- } else if (op->orb_edn.bv_val != NULL) {
+ } else if ( !BER_BVISNULL( &op->orb_edn ) ) {
free( op->orb_edn.bv_val );
+ BER_BVZERO( &op->orb_edn );
}
} else {
"operation not supported within naming context" );
}
-#ifdef LDAP_SLAPI
- if ( pb != NULL &&
- slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 )
- {
- Debug(LDAP_DEBUG_TRACE,
- "do_bind: Bind postoperation plugins failed.\n",
- 0, 0, 0);
- }
-#endif /* LDAP_SLAPI */
-
cleanup:;
+ op->o_bd = bd;
return rs->sr_err;
}
projects / openldap / blobdiff