]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bind.c
ITS#4634
[openldap] / servers / slapd / bind.c
index c39caea9f64e37be8a26d0ead16d2685e5fa49bd..7be6f499adf4d72924373f50acfae73b271a0ff3 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 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(
@@ -211,8 +207,6 @@ cleanup:
                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 );
@@ -229,6 +223,7 @@ int
 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_CONTROL_CRITICAL ) {
@@ -279,77 +274,6 @@ fe_op_bind( Operation *op, SlapReply *rs )
 
                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( !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 );
-                       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( !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 ssf=%d\n",
-                               op->o_log_prefix,
-                               BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
-                               op->o_conn->c_authmech.bv_val, op->orb_ssf, 0 );
-
-                       Debug( LDAP_DEBUG_TRACE,
-                               "do_bind: SASL/%s bind: dn=\"%s\" ssf=%d\n",
-                               op->o_conn->c_authmech.bv_val,
-                               BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
-                               op->orb_ssf );
-
-               } else if ( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS ) {
-                       op->o_conn->c_sasl_bind_in_progress = 1;
-
-               } else {
-                       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;
-               }
-
-#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 {
@@ -449,24 +373,22 @@ fe_op_bind( Operation *op, SlapReply *rs )
 
                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 = frontendDB;
+               op->o_bd = bd;
                send_ldap_result( op, rs );
-               op->o_bd = NULL;
                goto cleanup;
        }
 
@@ -476,85 +398,9 @@ fe_op_bind( Operation *op, SlapReply *rs )
                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 ( !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 )
-                                               ? "<empty>" : op->o_conn->c_dn.bv_val,
-                                       mech.bv_val, 0, 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 ) {
@@ -604,17 +450,8 @@ fe_op_bind( Operation *op, SlapReply *rs )
                        "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;
 }