]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/bind.c
ITS#3818 fix index_substr_any_step keyword
[openldap] / servers / slapd / back-ldbm / bind.c
index 73dddc18bb913052736c9e2ff065dad143fc8d1b..dce317876a1ff38e561713b5a045f244f8f78f0c 100644 (file)
@@ -1,8 +1,17 @@
 /* bind.c - ldbm backend bind and unbind routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 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-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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 
 int
 ldbm_back_bind(
-    Backend            *be,
-    Connection         *conn,
     Operation          *op,
-    const char         *dn,
-    const char         *ndn,
-    int                        method,
-    struct berval      *cred,
-       char**  edn
-)
+    SlapReply          *rs )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+       struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
        Entry           *e;
        Attribute       *a;
        int             rc;
@@ -43,133 +45,77 @@ ldbm_back_bind(
 
        AttributeDescription *password = slap_schema.si_ad_userPassword;
 
-       Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_bind: dn: %s\n", dn, 0, 0);
+       Debug(LDAP_DEBUG_ARGS,
+               "==> ldbm_back_bind: dn: %s\n", op->o_req_dn.bv_val, 0, 0);
 
-       *edn = NULL;
-       dn = ndn;
+       if ( op->oq_bind.rb_method == LDAP_AUTH_SIMPLE && be_isroot_pw( op ) ) {
+               ber_dupbv( &op->oq_bind.rb_edn, be_root_dn( op->o_bd ) );
+               /* front end will send result */
+               return LDAP_SUCCESS;
+       }
 
-       /* get entry with reader lock */
-       if ( (e = dn2entry_r( be, dn, &matched )) == NULL ) {
-               char *matched_dn = NULL;
-               struct berval **refs = NULL;
+       /* grab giant lock for reading */
+       ldap_pvt_thread_rdwr_rlock(&li->li_giant_rwlock);
 
+       /* get entry with reader lock */
+       if ( (e = dn2entry_r( op->o_bd, &op->o_req_ndn, &matched )) == NULL ) {
                if( matched != NULL ) {
-                       matched_dn = ch_strdup( matched->e_dn );
-
-                       refs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, conn, op, matched )
-                               : NULL;
-
                        cache_return_entry_r( &li->li_cache, matched );
-               } else {
-                       refs = default_referral;
                }
+               ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
 
                /* allow noauth binds */
                rc = 1;
-               if ( method == LDAP_AUTH_SIMPLE ) {
-                       if ( be_isroot_pw( be, dn, cred ) ) {
-                               *edn = ch_strdup( be_root_dn( be ) );
-                               rc = 0; /* front end will send result */
-
-                       } else if ( refs != NULL ) {
-                               send_ldap_result( conn, op, LDAP_REFERRAL,
-                                       matched_dn, NULL, refs, NULL );
-
-                       } else {
-                               send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                                       NULL, NULL, NULL, NULL );
-                       }
-
-               } else if ( refs != NULL ) {
-                       send_ldap_result( conn, op, LDAP_REFERRAL,
-                               matched_dn, NULL, refs, NULL );
-
-               } else {
-                       send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                               NULL, NULL, NULL, NULL );
-               }
-
-               if ( matched != NULL ) {
-                       ber_bvecfree( refs );
-                       free( matched_dn );
-               }
-               return( rc );
+               rs->sr_err = LDAP_INVALID_CREDENTIALS;
+               send_ldap_result( op, rs );
+               return rs->sr_err;
        }
 
-       *edn = ch_strdup( e->e_dn );
-
        /* check for deleted */
+#ifdef LDBM_SUBENTRIES
+       if ( is_entry_subentry( e ) ) {
+               /* entry is an subentry, don't allow bind */
+               Debug( LDAP_DEBUG_TRACE,
+                               "entry is subentry\n", 0, 0, 0 );
+               rc = LDAP_INVALID_CREDENTIALS;
+               goto return_results;
+       }
+#endif
 
        if ( is_entry_alias( e ) ) {
                /* entry is an alias, don't allow bind */
-               Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0,
-                   0, 0 );
-
-               send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM,
-                   NULL, "entry is alias", NULL, NULL );
+               Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0, 0, 0 );
 
-               rc = 1;
+#if 1
+               rc = LDAP_INVALID_CREDENTIALS;
+#else
+               rs->sr_text = "entry is alias";
+               rc = LDAP_ALIAS_PROBLEM;
+#endif
                goto return_results;
        }
 
        if ( is_entry_referral( e ) ) {
                /* entry is a referral, don't allow bind */
-               struct berval **refs = get_entry_referrals( be,
-                       conn, op, e );
-
-               Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
-                   0, 0 );
+               Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0, 0, 0 );
 
-               if( refs != NULL ) {
-                       send_ldap_result( conn, op, LDAP_REFERRAL,
-                               e->e_dn, NULL, refs, NULL );
-
-               } else {
-                       send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                               NULL, NULL, NULL, NULL );
-               }
-
-               ber_bvecfree( refs );
-
-               rc = 1;
+               rc = LDAP_INVALID_CREDENTIALS;
                goto return_results;
        }
 
-       switch ( method ) {
+       switch ( op->oq_bind.rb_method ) {
        case LDAP_AUTH_SIMPLE:
-               /* check for root dn/passwd */
-               if ( be_isroot_pw( be, dn, cred ) ) {
-                       /* front end will send result */
-                       if(*edn != NULL) free( *edn );
-                       *edn = ch_strdup( be_root_dn( be ) );
-                       rc = 0;
-                       goto return_results;
-               }
-
-               if ( ! access_allowed( be, conn, op, e,
-                       password, NULL, ACL_AUTH ) )
-               {
-                       send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-                               NULL, NULL, NULL, NULL );
-                       rc = 1;
-                       goto return_results;
-               }
-
                if ( (a = attr_find( e->e_attrs, password )) == NULL ) {
-                       send_ldap_result( conn, op, LDAP_INAPPROPRIATE_AUTH,
-                           NULL, NULL, NULL, NULL );
-
                        /* stop front end from sending result */
-                       rc = 1;
+                       rc = LDAP_INVALID_CREDENTIALS;
                        goto return_results;
                }
 
-               if ( slap_passwd_check( a, cred ) != 0 ) {
-                       send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                               NULL, NULL, NULL, NULL );
-                       /* stop front end from sending result */
-                       rc = 1;
+               if ( slap_passwd_check( op, e, a, &op->oq_bind.rb_cred,
+                                       &rs->sr_text ) != 0 )
+               {
+                       /* failure; stop front end from sending result */
+                       rc = LDAP_INVALID_CREDENTIALS;
                        goto return_results;
                }
 
@@ -178,19 +124,17 @@ ldbm_back_bind(
 
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        case LDAP_AUTH_KRBV41:
-               if ( krbv4_ldap_auth( be, cred, &ad ) != LDAP_SUCCESS ) {
-                       send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                           NULL, NULL, NULL, NULL );
-                       rc = 1;
+               if ( krbv4_ldap_auth( op->o_bd, &op->oq_bind.rb_cred, &ad )
+                       != LDAP_SUCCESS )
+               {
+                       rc = LDAP_INVALID_CREDENTIALS;
                        goto return_results;
                }
 
-               if ( ! access_allowed( be, conn, op, e,
-                       krbattr, NULL, ACL_AUTH ) )
+               if ( ! access_allowed( op, e,
+                       krbattr, NULL, ACL_AUTH, NULL ) )
                {
-                       send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-                               NULL, NULL, NULL, NULL );
-                       rc = 1;
+                       rc = LDAP_INSUFFICIENT_ACCESS;
                        goto return_results;
                }
 
@@ -201,13 +145,11 @@ ldbm_back_bind(
                        /*
                         * no krbname values present:  check against DN
                         */
-                       if ( strcasecmp( dn, krbname ) == 0 ) {
+                       if ( strcasecmp( op->o_req_dn.bv_val, krbname ) == 0 ) {
                                rc = 0;
                                break;
                        }
-                       send_ldap_result( conn, op, LDAP_INAPPROPRIATE_AUTH,
-                           NULL, NULL, NULL, NULL );
-                       rc = 1;
+                       rc = LDAP_INAPPROPRIATE_AUTH;
                        goto return_results;
 
                } else {        /* look for krbname match */
@@ -217,37 +159,38 @@ ldbm_back_bind(
                        krbval.bv_len = strlen( krbname );
 
                        if ( value_find( a->a_desc, a->a_vals, &krbval ) != 0 ) {
-                               send_ldap_result( conn, op,
-                                   LDAP_INVALID_CREDENTIALS,
-                                       NULL, NULL, NULL, NULL );
-                               rc = 1;
+                               rc = LDAP_INVALID_CREDENTIALS;
                                goto return_results;
                        }
                }
                rc = 0;
                break;
-
-       case LDAP_AUTH_KRBV42:
-               send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "Kerberos bind step 2 not supported",
-                       NULL, NULL );
-               /* stop front end from sending result */
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               goto return_results;
 #endif
 
        default:
-               send_ldap_result( conn, op, LDAP_STRONG_AUTH_NOT_SUPPORTED,
-                   NULL, "authentication method not supported", NULL, NULL );
-               rc = 1;
+               assert( 0 ); /* should not be reachable */
+               rs->sr_text = "authentication method not supported";
+               rc = LDAP_STRONG_AUTH_NOT_SUPPORTED;
                goto return_results;
        }
 
+       ber_dupbv( &op->oq_bind.rb_edn, &e->e_name );
+
 return_results:;
        /* free entry and reader lock */
        cache_return_entry_r( &li->li_cache, e );
+       ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
+
+       if ( rc ) {
+               rs->sr_err = rc;
+               send_ldap_result( op, rs );
+               if ( rs->sr_ref ) {
+                       ber_bvarray_free( rs->sr_ref );
+                       rs->sr_ref = NULL;
+               }
+       }
 
-       /* front end with send result on success (rc==0) */
+       /* front end will send result on success (rc==0) */
        return( rc );
 }