]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bind.c
Don't require slapi to be in the path - always include slapi/slapi.h
[openldap] / servers / slapd / bind.c
index 80c1081acb2f3afb97c39e30d4eb9f6a9b371aa6..0c13bad30bc6f2c22fc4457cf0aeebd7a69542b1 100644 (file)
@@ -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 <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
-
-/*
- * 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
@@ -27,7 +34,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 
@@ -45,10 +52,6 @@ do_bind(
        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
@@ -356,6 +359,7 @@ do_bind(
                }
 
 #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
@@ -363,12 +367,14 @@ 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 *)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) 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 );
@@ -391,6 +397,7 @@ do_bind(
        }
 
        if ( method == LDAP_AUTH_SIMPLE ) {
+               ber_str2bv( "SIMPLE", sizeof("SIMPLE")-1, 0, &mech );
                /* accept "anonymous" binds */
                if ( op->orb_cred.bv_len == 0 || op->o_req_ndn.bv_len == 0 ) {
                        rs->sr_err = LDAP_SUCCESS;
@@ -469,6 +476,7 @@ do_bind(
 #endif
                        goto cleanup;
                }
+               ber_str2bv( "KRBV4", sizeof("KRBV4")-1, 0, &mech );
 #endif
 
        } else {
@@ -521,80 +529,87 @@ do_bind(
        }
 
 #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) );
+       if ( pb ) {
+               int rc;
+               slapi_int_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) );
+               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",
-               rs->sr_err, 0, 0);
+               LDAP_LOG( OPERATION, INFO,
+                       "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);
+               Debug(LDAP_DEBUG_TRACE,
+                       "do_bind: Bind preoperation plugin returned %d.\n",
+                       rs->sr_err, 0, 0);
 #endif
 
-       switch ( rs->sr_err ) {
-       case 1: /* no plugins present, continue normally */
-               break;
-       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;
-               }
+               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;
+                       }
 
-               op->orb_edn.bv_val = NULL;
-               op->orb_edn.bv_len = 0;
+                       op->orb_edn.bv_val = NULL;
+                       op->orb_edn.bv_len = 0;
 
-               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 );
+                       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 ) {
+                                       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 );
+                               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 );
+                               }
+                               /* 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 );
                        }
-                       /* 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 ? op->o_conn->c_dn.bv_val : "<empty>",
-                               0, 0 );
-                       ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+                       goto cleanup;
+                       break;
                }
-               goto cleanup;
-               break;
        }
 #endif /* defined( LDAP_SLAPI ) */
 
@@ -626,9 +641,9 @@ do_bind(
 
                        /* log authorization identity */
                        Statslog( LDAP_DEBUG_STATS,
-                               "conn=%lu op=%lu BIND dn=\"%s\" mech=simple ssf=0\n",
+                               "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, 0, 0 );
+                               op->o_conn->c_dn.bv_val, mech.bv_val, 0 );
 
 #ifdef NEW_LOGGING
                        LDAP_LOG( OPERATION, DETAIL1, 
@@ -655,7 +670,7 @@ do_bind(
        }
 
 #if defined( LDAP_SLAPI )
-       if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 ) {
+       if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, INFO,
                        "do_bind: Bind postoperation plugins failed\n",
@@ -669,6 +684,12 @@ do_bind(
 #endif /* defined( LDAP_SLAPI ) */
 
 cleanup:
+       if ( rs->sr_err == LDAP_SUCCESS ) {
+               if ( method != LDAP_AUTH_SASL ) {
+                       ber_dupbv( &op->o_conn->c_authmech, &mech );
+               }
+               op->o_conn->c_authtype = method;
+       }
 
        op->o_conn->c_sasl_bindop = NULL;