X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbind.c;h=6dac6e2a6b2a3fc7a4c4509fd6e8237dff7a9a97;hb=54fa643a9bd33e59059b84bda010b5f668cd45bb;hp=5ba1e865aeb34250856e7393741322b2d106b9b8;hpb=b3e8d9189c24ced7ea525b7a8a39a4adc5a32f84;p=openldap
diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 5ba1e865ae..6dac6e2a6b 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -1,12 +1,19 @@
/* bind.c - decode an ldap bind operation and pass it to a backend db */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -24,63 +31,54 @@
#include
#include
-#include "ldap_pvt.h"
#include "slap.h"
#ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
#endif
int
do_bind(
Operation *op,
- SlapReply *rs
-)
+ SlapReply *rs )
{
BerElement *ber = op->o_ber;
ber_int_t version;
ber_tag_t method;
- struct berval mech = { 0, NULL };
- struct berval dn = { 0, NULL };
+ struct berval mech = BER_BVNULL;
+ struct berval dn = BER_BVNULL;
ber_tag_t tag;
Backend *be = NULL;
-#ifdef LDAP_SLAPI
- Slapi_PBlock *pb = op->o_pb;
-#endif
-
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ENTRY, "do_bind: conn %d\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
-#endif
/*
* Force to connection to "anonymous" until bind succeeds.
*/
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
- if ( op->o_conn->c_sasl_bind_in_progress ) be = op->o_conn->c_authz_backend;
-
- /* log authorization identity demotion */
- if ( op->o_conn->c_dn.bv_len ) {
+ if ( op->o_conn->c_sasl_bind_in_progress ) {
+ be = op->o_conn->c_authz_backend;
+ }
+ 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;
+ 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;
}
@@ -107,20 +105,16 @@ do_bind(
tag = ber_scanf( ber, "{imt" /*}*/, &version, &dn, &method );
if ( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_bind: conn %d ber_scanf failed\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
-#endif
send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
- rs->sr_err = -1;
+ rs->sr_err = SLAPD_DISCONNECT;
goto cleanup;
}
op->o_protocol = version;
+ op->orb_method = method;
- if( method != LDAP_AUTH_SASL ) {
+ if( op->orb_method != LDAP_AUTH_SASL ) {
tag = ber_scanf( ber, /*{*/ "m}", &op->orb_cred );
} else {
@@ -134,8 +128,7 @@ do_bind(
tag = ber_scanf( ber, "m", &op->orb_cred );
} else {
tag = LDAP_TAG_LDAPCRED;
- op->orb_cred.bv_val = NULL;
- op->orb_cred.bv_len = 0;
+ BER_BVZERO( &op->orb_cred );
}
if ( tag != LBER_ERROR ) {
@@ -145,19 +138,13 @@ do_bind(
}
if ( tag == LBER_ERROR ) {
- send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR,
- "decoding error" );
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
rs->sr_err = SLAPD_DISCONNECT;
goto cleanup;
}
if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_bind: conn %d get_ctrls failed\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
-#endif
goto cleanup;
}
@@ -165,55 +152,33 @@ do_bind(
* However, we must dup with regular malloc when storing any
* resulting DNs in the op or conn structures.
*/
- rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
+ rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
+ op->o_tmpmemctx );
if ( rs->sr_err != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_bind: conn %d invalid dn (%s)\n",
- op->o_connid, dn.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n",
dn.bv_val, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
goto cleanup;
}
- if( method == LDAP_AUTH_SASL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1,
- "do_sasl_bind: conn %d dn (%s) mech %s\n",
- op->o_connid, op->o_req_dn.bv_val, mech.bv_val );
-#else
+ if( op->orb_method == LDAP_AUTH_SASL ) {
Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
op->o_req_dn.bv_val, mech.bv_val, NULL );
-#endif
} else {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1,
- "do_bind: version=%ld dn=\"%s\" method=%ld\n",
- (unsigned long) version, op->o_req_dn.bv_val, (unsigned long)method );
-#else
Debug( LDAP_DEBUG_TRACE,
"do_bind: version=%ld dn=\"%s\" method=%ld\n",
- (unsigned long) version,
- op->o_req_dn.bv_val, (unsigned long) method );
-#endif
+ (unsigned long) version, op->o_req_dn.bv_val,
+ (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) 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 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_bind: conn %d unknown version = %ld\n",
- op->o_connid, (unsigned long)version, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
(unsigned long) version, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
"requested protocol version not supported" );
goto cleanup;
@@ -226,15 +191,47 @@ do_bind(
goto cleanup;
}
- /* we set connection version regardless of whether bind succeeds
- * or not.
+ /*
+ * we set connection version regardless of whether bind succeeds or not.
*/
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
op->o_conn->c_protocol = version;
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ op->orb_tmp_mech = mech;
+
+ op->o_bd = frontendDB;
+ rs->sr_err = frontendDB->be_bind( op, rs );
+
+cleanup:
+ if ( rs->sr_err == LDAP_SUCCESS ) {
+ if ( op->orb_method != LDAP_AUTH_SASL ) {
+ ber_dupbv( &op->o_conn->c_authmech, &mech );
+ }
+ op->o_conn->c_authtype = op->orb_method;
+ }
+
+ op->o_conn->c_sasl_bindop = 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( !BER_BVISNULL( &op->o_req_ndn ) ) {
+ slap_sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+ BER_BVZERO( &op->o_req_ndn );
+ }
+
+ return rs->sr_err;
+}
+
+int
+fe_op_bind( Operation *op, SlapReply *rs )
+{
+ struct berval mech = op->orb_tmp_mech;
+
/* 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" );
@@ -244,32 +241,20 @@ do_bind(
/* Set the bindop for the benefit of in-directory SASL lookups */
op->o_conn->c_sasl_bindop = op;
- if ( method == LDAP_AUTH_SASL ) {
- if ( version < LDAP_VERSION3 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_bind: conn %d sasl with LDAPv%ld\n",
- op->o_connid, (unsigned long)version , 0 );
-#else
+ if ( op->orb_method == LDAP_AUTH_SASL ) {
+ if ( op->o_protocol < LDAP_VERSION3 ) {
Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
- (unsigned long) version, 0, 0 );
-#endif
+ (unsigned long)op->o_protocol, 0, 0 );
send_ldap_discon( op, rs,
LDAP_PROTOCOL_ERROR, "SASL bind requires LDAPv3" );
rs->sr_err = SLAPD_DISCONNECT;
goto cleanup;
}
- if( mech.bv_len == 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_bind: conn %d no SASL mechanism provided\n",
- op->o_connid, 0, 0 );
-#else
+ if( BER_BVISNULL( &mech ) || BER_BVISEMPTY( &mech ) ) {
Debug( LDAP_DEBUG_ANY,
"do_bind: no sasl mechanism provided\n",
0, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_AUTH_METHOD_NOT_SUPPORTED,
"no SASL mechanism provided" );
goto cleanup;
@@ -297,16 +282,14 @@ do_bind(
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 ) {
+ if( !BER_BVISEMPTY( &op->orb_edn ) ) {
/* 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 );
- op->orb_edn.bv_val = NULL;
- op->orb_edn.bv_len = 0;
+ BER_BVZERO( &op->orb_edn );
op->o_conn->c_authmech = op->o_conn->c_sasl_bind_mech;
- op->o_conn->c_sasl_bind_mech.bv_val = NULL;
- op->o_conn->c_sasl_bind_mech.bv_len = 0;
+ 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;
@@ -314,7 +297,7 @@ do_bind(
op->o_conn->c_ssf = op->orb_ssf;
}
- 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 );
@@ -322,38 +305,30 @@ do_bind(
/* 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 : "",
- op->o_conn->c_authmech.bv_val, op->orb_ssf );
+ "%s BIND dn=\"%s\" mech=%s ssf=%d\n",
+ op->o_log_prefix,
+ BER_BVISNULL( &op->o_conn->c_dn ) ? "" : op->o_conn->c_dn.bv_val,
+ op->o_conn->c_authmech.bv_val, op->orb_ssf, 0 );
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1,
- "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 : "",
- op->orb_ssf );
-#else
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 : "",
+ BER_BVISNULL( &op->o_conn->c_dn ) ? "" : op->o_conn->c_dn.bv_val,
op->orb_ssf );
-#endif
} 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 ) {
+ if ( !BER_BVISNULL( &op->o_conn->c_sasl_bind_mech ) ) {
free( op->o_conn->c_sasl_bind_mech.bv_val );
- op->o_conn->c_sasl_bind_mech.bv_val = NULL;
- op->o_conn->c_sasl_bind_mech.bv_len = 0;
+ 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
@@ -361,12 +336,16 @@ do_bind(
* exception to call the post-operation plugins after a
* SASL bind.
*/
- slapi_x_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)dn.bv_val );
- slapi_pblock_set( pb, SLAPI_BIND_METHOD, (void *)method );
- slapi_pblock_set( pb, SLAPI_BIND_CREDENTIALS, (void *)&op->orb_cred );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(0) );
- (void) doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb );
+ 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 );
@@ -377,10 +356,9 @@ do_bind(
/* 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);
- op->o_conn->c_sasl_bind_mech.bv_val = NULL;
- op->o_conn->c_sasl_bind_mech.bv_len = 0;
+ 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;
@@ -388,23 +366,25 @@ do_bind(
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
}
- if ( method == LDAP_AUTH_SIMPLE ) {
+ if ( op->orb_method == LDAP_AUTH_SIMPLE ) {
+ 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 */
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
- rs->sr_text = "unauthenticated bind (DN with no password) disallowed";
+ rs->sr_text =
+ "unauthenticated bind (DN with no password) disallowed";
} else if ( global_disallows & SLAP_DISALLOW_BIND_ANON ) {
/* disallow */
@@ -420,14 +400,8 @@ do_bind(
* just need to send success
*/
send_ldap_result( op, rs );
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1,
- "do_bind: conn %d v%d anonymous bind\n",
- op->o_connid, version , 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
- version, 0, 0 );
-#endif
+ op->o_protocol, 0, 0 );
goto cleanup;
} else if ( global_disallows & SLAP_DISALLOW_BIND_SIMPLE ) {
@@ -436,36 +410,37 @@ do_bind(
rs->sr_text = "unwilling to perform simple authentication";
send_ldap_result( op, rs );
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_bind: conn %d v%d simple bind(%s) disallowed\n",
- op->o_connid, version, op->o_req_ndn.bv_val );
-#else
Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d simple bind(%s) disallowed\n",
- version, op->o_req_ndn.bv_val, 0 );
-#endif
+ op->o_protocol, op->o_req_ndn.bv_val, 0 );
goto cleanup;
}
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
- } else if ( method == LDAP_AUTH_KRBV41 || method == LDAP_AUTH_KRBV42 ) {
+ } else if ( op->orb_method == LDAP_AUTH_KRBV41 ) {
if ( global_disallows & SLAP_DISALLOW_BIND_KRBV4 ) {
- /* disallow simple authentication */
+ /* disallow krbv4 authentication */
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text = "unwilling to perform Kerberos V4 bind";
send_ldap_result( op, rs );
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1,
- "do_bind: conn %d v%d Kerberos V4 bind\n",
- op->o_connid, version , 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n",
- version, 0, 0 );
-#endif
+
+ Debug( LDAP_DEBUG_TRACE,
+ "do_bind: v%d Kerberos V4 (step 1) bind refused\n",
+ op->o_protocol, 0, 0 );
goto cleanup;
}
+ BER_BVSTR( &mech, "KRBV4" );
+
+ } else if ( op->orb_method == LDAP_AUTH_KRBV42 ) {
+ rs->sr_err = LDAP_AUTH_METHOD_NOT_SUPPORTED;
+ rs->sr_text = "Kerberos V4 (step 2) bind not supported";
+ send_ldap_result( op, rs );
+
+ Debug( LDAP_DEBUG_TRACE,
+ "do_bind: v%d Kerberos V4 (step 2) bind refused\n",
+ op->o_protocol, 0, 0 );
+ goto cleanup;
#endif
} else {
@@ -473,15 +448,9 @@ do_bind(
rs->sr_text = "unknown authentication method";
send_ldap_result( op, rs );
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_bind: conn %ld v%d unknown authentication method (%ld)\n",
- op->o_connid, version, method );
-#else
Debug( LDAP_DEBUG_TRACE,
- "do_bind: v%d unknown authentication method (%ld)\n",
- version, method, 0 );
-#endif
+ "do_bind: v%d unknown authentication method (%d)\n",
+ op->o_protocol, op->orb_method, 0 );
goto cleanup;
}
@@ -492,22 +461,12 @@ do_bind(
*/
if ( (op->o_bd = select_backend( &op->o_req_ndn, 0, 0 )) == NULL ) {
- if ( default_referral ) {
- rs->sr_ref = referral_rewrite( default_referral,
- NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
- if (!rs->sr_ref) rs->sr_ref = default_referral;
-
- rs->sr_err = LDAP_REFERRAL;
- send_ldap_result( op, rs );
-
- if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
-
- } else {
- /* noSuchObject is not allowed to be returned by bind */
- rs->sr_err = LDAP_INVALID_CREDENTIALS;
- send_ldap_result( op, rs );
- }
-
+ /* 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 = frontendDB;
+ send_ldap_result( op, rs );
+ op->o_bd = NULL;
goto cleanup;
}
@@ -517,76 +476,85 @@ do_bind(
goto cleanup;
}
-#if defined( LDAP_SLAPI )
- slapi_x_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)dn.bv_val );
- slapi_pblock_set( pb, SLAPI_BIND_METHOD, (void *)method );
- slapi_pblock_set( pb, SLAPI_BIND_CREDENTIALS, (void *)&op->orb_cred );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(0) );
+#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) );
- rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_BIND_FN, pb );
+ rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_BIND_FN, pb );
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO, "do_bind: Bind preoperation plugin returned %d\n",
+ Debug(LDAP_DEBUG_TRACE,
+ "do_bind: Bind preoperation plugin returned %d.\n",
rs->sr_err, 0, 0);
-#else
- Debug(LDAP_DEBUG_TRACE, "do_bind: Bind preoperation plugin returned %d.\n",
- rs->sr_err, 0, 0);
-#endif
-
- switch ( rs->sr_err ) {
- 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 */
- if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err) != 0 ) {
- rs->sr_err = LDAP_OTHER;
- }
- op->orb_edn.bv_val = NULL;
- op->orb_edn.bv_len = 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;
+ }
- if ( rs->sr_err == LDAP_SUCCESS ) {
- slapi_pblock_get( pb, SLAPI_CONN_DN, (void *)&op->orb_edn.bv_val );
- if ( op->orb_edn.bv_val != NULL )
- 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 );
- op->o_req_dn.bv_val = NULL;
- op->o_req_dn.bv_len = 0;
- op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
- op->o_req_ndn.bv_val = NULL;
- op->o_req_ndn.bv_len = 0;
- 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 );
+ 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 ( !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,
+ "%s BIND dn=\"%s\" mech=%s (SLAPI) ssf=0\n",
+ op->o_log_prefix,
+ BER_BVISNULL( &op->o_conn->c_dn )
+ ? "" : op->o_conn->c_dn.bv_val,
+ mech.bv_val, 0, 0 );
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
}
- /* log authorization identity */
- Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu BIND dn=\"%s\" mech=simple (SLAPI) ssf=0\n",
- op->o_connid, op->o_opid,
- op->o_conn->c_dn.bv_val, 0, 0 );
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ goto cleanup;
+ break;
}
- goto cleanup;
- break;
}
-#endif /* defined( LDAP_SLAPI ) */
+#endif /* LDAP_SLAPI */
- if ( op->o_bd->be_bind ) {
- op->orb_method = method;
+ if( op->o_bd->be_bind ) {
rs->sr_err = (op->o_bd->be_bind)( op, rs );
if ( rs->sr_err == 0 ) {
@@ -597,7 +565,7 @@ do_bind(
}
/* 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);
@@ -605,7 +573,7 @@ do_bind(
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 );
@@ -613,58 +581,40 @@ do_bind(
/* log authorization identity */
Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu BIND dn=\"%s\" mech=simple ssf=0\n",
- op->o_connid, op->o_opid,
- op->o_conn->c_dn.bv_val, 0, 0 );
-
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1,
- "do_bind: v%d bind: \"%s\" to \"%s\" \n",
- version, op->o_conn->c_dn.bv_val, op->o_conn->c_dn.bv_val );
-#else
+ "%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",
- version, dn.bv_val, op->o_conn->c_dn.bv_val );
-#endif
+ op->o_protocol, op->o_req_dn.bv_val, op->o_conn->c_dn.bv_val );
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
/* 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 {
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
- "operation not supported within namingContext" );
+ "operation not supported within naming context" );
}
-#if defined( LDAP_SLAPI )
- if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO, "do_bind: Bind postoperation plugins failed\n",
- 0, 0, 0);
-#else
- Debug(LDAP_DEBUG_TRACE, "do_bind: Bind postoperation plugins failed.\n",
- 0, 0, 0);
-#endif
- }
-#endif /* defined( LDAP_SLAPI ) */
-
-cleanup:
-
- op->o_conn->c_sasl_bindop = NULL;
-
- if( op->o_req_dn.bv_val != NULL ) {
- sl_free( op->o_req_dn.bv_val, op->o_tmpmemctx );
- op->o_req_dn.bv_val = NULL;
- }
- if( op->o_req_ndn.bv_val != NULL ) {
- sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx );
- op->o_req_ndn.bv_val = NULL;
+#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:;
return rs->sr_err;
}
+