]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bind.c
minor cleanup
[openldap] / servers / slapd / bind.c
index 715ee676cc3830eed53b38375a44524261576696..6480cf7fb82b5fcaa375e44e08ab3e2a9737df07 100644 (file)
@@ -1,7 +1,7 @@
 /* bind.c - decode an ldap bind operation and pass it to a backend db */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -41,36 +41,26 @@ do_bind(
        char *ndn;
        ber_tag_t       tag;
        int                     rc = LDAP_SUCCESS;
-       char    *text;
+       const char      *text;
        struct berval   cred;
        Backend         *be;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "do_bind: conn %d\n", conn->c_connid ));
+#else
        Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
+#endif
 
        dn = NULL;
        ndn = NULL;
        mech = NULL;
        cred.bv_val = NULL;
 
-       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-
        /*
         * Force to connection to "anonymous" until bind succeeds.
         */
-
-       if ( conn->c_cdn != NULL ) {
-               free( conn->c_cdn );
-               conn->c_cdn = NULL;
-       }
-
-       if ( conn->c_dn != NULL ) {
-               free( conn->c_dn );
-               conn->c_dn = NULL;
-       }
-
-       conn->c_authc_backend = NULL;
-       conn->c_authz_backend = NULL;
-
+       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+       connection2anonymous( conn );
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
        if ( op->o_dn != NULL ) {
@@ -98,15 +88,20 @@ do_bind(
         *      }
         *
         *      SaslCredentials ::= SEQUENCE {
-     *         mechanism           LDAPString,
-     *         credentials         OCTET STRING OPTIONAL
+     *         mechanism           LDAPString,
+     *         credentials         OCTET STRING OPTIONAL
         *      }
         */
 
        tag = ber_scanf( ber, "{iat" /*}*/, &version, &dn, &method );
 
        if ( tag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_bind: conn %d  ber_scanf failed\n", conn->c_connid ));
+#else
                Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
+#endif
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
                rc = -1;
@@ -127,6 +122,10 @@ do_bind(
 
                        if ( tag == LDAP_TAG_LDAPCRED ) { 
                                tag = ber_scanf( ber, "o", &cred );
+                       } else {
+                               tag = LDAP_TAG_LDAPCRED;
+                               cred.bv_val = NULL;
+                               cred.bv_len = 0;
                        }
 
                        if ( tag != LBER_ERROR ) {
@@ -138,42 +137,77 @@ do_bind(
        if ( tag == LBER_ERROR ) {
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR,
-               "decoding error" );
+               "decoding error" );
                rc = SLAPD_DISCONNECT;
                goto cleanup;
        }
 
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_bind: conn %d  get_ctrls failed\n", conn->c_connid ));
+#else
                Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
+#endif
                goto cleanup;
        } 
 
        ndn = ch_strdup( dn );
 
        if ( dn_normalize( ndn ) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_bind: conn %d  invalid dn (%s)\n", conn->c_connid, dn ));
+#else
                Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n", dn, 0, 0 );
+#endif
                send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
                    "invalid DN", NULL, NULL );
                goto cleanup;
        }
 
        if( method == LDAP_AUTH_SASL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation",  LDAP_LEVEL_DETAIL1,
+                          "do_sasl_bind: conn %d  dn (%s) mech %s\n", conn->c_connid,
+                          dn, mech ));
+#else
                Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
                        dn, mech, NULL );
+#endif
        } else {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                          "do_bind: conn %d  version=%ld dn=\"%s\" method=%ld\n",
+                          conn->c_connid, (unsigned long) version, dn, (unsigned long)method ));
+#else
                Debug( LDAP_DEBUG_TRACE, "do_bind: version=%ld dn=\"%s\" method=%ld\n",
                        (unsigned long) version, dn, (unsigned long) method );
+#endif
        }
 
        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
            op->o_connid, op->o_opid, ndn, (unsigned long) method, 0 );
 
        if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_bind: conn %d  unknown version = %ld\n",
+                          conn->c_connid, (unsigned long)version ));
+#else
                Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
                        (unsigned long) version, 0, 0 );
+#endif
                send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
                        NULL, "requested protocol version not supported", NULL, NULL );
                goto cleanup;
+
+       } else if (( global_disallows & SLAP_DISALLOW_BIND_V2 ) &&
+               version < LDAP_VERSION3 )
+       {
+               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+                       NULL, "requested protocol version not allowed", NULL, NULL );
+               goto cleanup;
        }
 
        /* we set connection version regardless of whether bind succeeds
@@ -185,10 +219,17 @@ do_bind(
 
        if ( method == LDAP_AUTH_SASL ) {
                char *edn;
+               slap_ssf_t ssf = 0;
 
                if ( version < LDAP_VERSION3 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "do_bind: conn %d  sasl with LDAPv%ld\n",
+                                  conn->c_connid, (unsigned long)version ));
+#else
                        Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
                                (unsigned long) version, 0, 0 );
+#endif
                        send_ldap_disconnect( conn, op,
                                LDAP_PROTOCOL_ERROR, "SASL bind requires LDAPv3" );
                        rc = SLAPD_DISCONNECT;
@@ -196,69 +237,72 @@ do_bind(
                }
 
                if( mech == NULL || *mech == '\0' ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "do_bind: conn %d  no SASL mechanism provided\n",
+                                  conn->c_connid ));
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "do_bind: no sasl mechanism provided\n",
                                0, 0, 0 );
-                       send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+#endif
+                       send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED,
                                NULL, "no SASL mechanism provided", NULL, NULL );
                        goto cleanup;
                }
 
-               if( !charray_inlist( supportedSASLMechanisms, mech ) ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "do_bind: sasl mechanism=\"%s\" not supported.\n",
-                               mech, 0, 0 );
-                       send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED,
-                               NULL, "SASL mechanism not supported", NULL, NULL );
+               /* check restrictions */
+               rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+               if( rc != LDAP_SUCCESS ) {
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
                        goto cleanup;
                }
 
                ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-
-               if ( conn->c_sasl_bind_mech != NULL ) {
+               if ( conn->c_sasl_bind_in_progress ) {
                        if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
-                               /* mechanism changed, cancel in progress bind */
-#ifdef HAVE_CYRUS_SASL
-                               sasl_dispose(&conn->c_sasl_bind_context);
-                               conn->c_sasl_bind_context = NULL;
-#endif
+                               /* mechanism changed between bind steps */
+                               slap_sasl_reset(conn);
                        }
-                       free( conn->c_sasl_bind_mech );
-                       conn->c_sasl_bind_mech = NULL;
-
-#ifdef LDAP_DEBUG
-#ifdef HAVE_CYRUS_SASL
                } else {
-                       assert( conn->c_sasl_bind_context == NULL );
-#endif
-#endif
+                       conn->c_sasl_bind_mech = mech;
+                       mech = NULL;
                }
-
                ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
                edn = NULL;
-               rc = sasl_bind( conn, op, dn, ndn, mech, &cred, &edn );
+               rc = slap_sasl_bind( conn, op, dn, ndn, &cred, &edn, &ssf );
 
-               if( rc == LDAP_SUCCESS && edn != NULL ) {
-                       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-#ifdef HAVE_CYRUS_SASL
-                       assert( conn->c_sasl_bind_context == NULL );
-#endif
+               ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+               if( rc == LDAP_SUCCESS ) {
                        conn->c_dn = edn;
-                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+                       conn->c_authmech = conn->c_sasl_bind_mech;
+                       conn->c_sasl_bind_mech = NULL;
+                       conn->c_sasl_bind_in_progress = 0;
+
+                       conn->c_sasl_ssf = ssf;
+                       if( ssf > conn->c_ssf ) {
+                               conn->c_ssf = ssf;
+                       }
+
+                       if( conn->c_dn != NULL ) {
+                               ber_len_t max = sockbuf_max_incoming;
+                               ber_sockbuf_ctrl( conn->c_sb,
+                                       LBER_SB_OPT_SET_MAX_INCOMING, &max );
+                       }
 
                } else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {
-#ifdef HAVE_CYRUS_SASL
-                       assert( conn->c_sasl_bind_context != NULL );
-#endif
-                       conn->c_sasl_bind_mech = mech;
-                       mech = NULL;
+                       conn->c_sasl_bind_in_progress = 1;
 
-#ifdef HAVE_CYRUS_SASL
                } else {
-                       assert( conn->c_sasl_bind_context != NULL );
-#endif
+                       if ( conn->c_sasl_bind_mech ) {
+                               free( conn->c_sasl_bind_mech );
+                               conn->c_sasl_bind_mech = NULL;
+                       }
+                       conn->c_sasl_bind_in_progress = 0;
                }
+               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
                goto cleanup;
 
@@ -267,36 +311,114 @@ do_bind(
                ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
                if ( conn->c_sasl_bind_mech != NULL ) {
-                       assert( conn->c_sasl_bind_in_progress );
-
                        free(conn->c_sasl_bind_mech);
                        conn->c_sasl_bind_mech = NULL;
+               }
+               conn->c_sasl_bind_in_progress = 0;
 
-#ifdef HAVE_CYRUS_SASL
-                       assert( conn->c_sasl_bind_context != NULL );
-                       sasl_dispose(&conn->c_sasl_bind_context);
-                       conn->c_sasl_bind_context = NULL;
+               slap_sasl_reset( conn );
+               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+       }
+
+       if ( method == LDAP_AUTH_SIMPLE ) {
+               /* accept "anonymous" binds */
+               if ( cred.bv_len == 0 || ndn == NULL || *ndn == '\0' ) {
+                       rc = LDAP_SUCCESS;
+                       text = NULL;
+
+                       if( cred.bv_len &&
+                               ( global_disallows & SLAP_DISALLOW_BIND_ANON_CRED ))
+                       {
+                               /* cred is not empty, disallow */
+                               rc = LDAP_INVALID_CREDENTIALS;
+
+                       } else if ( ndn != NULL && *ndn != '\0' &&
+                               ( global_disallows & SLAP_DISALLOW_BIND_ANON_DN ))
+                       {
+                               /* DN is not empty, disallow */
+                               rc = LDAP_UNWILLING_TO_PERFORM;
+                               text = "unwilling to allow anonymous bind with non-empty DN";
+
+                       } else if ( global_disallows & SLAP_DISALLOW_BIND_ANON ) {
+                               /* disallow */
+                               rc = LDAP_INAPPROPRIATE_AUTH;
+                               text = "anonymous bind disallowed";
+
+                       } else {
+                               rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+                       }
+
+                       /*
+                        * we already forced connection to "anonymous",
+                        * just need to send success
+                        */
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                                  "do_bind: conn %d  v%d anonymous bind\n",
+                                  conn->c_connid, version ));
+#else
+                       Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
+                               version, 0, 0 );
 #endif
-               } else {
-                       assert( !conn->c_sasl_bind_in_progress );
-#ifdef HAVE_CYRUS_SASL
-                       assert( conn->c_sasl_bind_context == NULL );
+                       goto cleanup;
+
+               } else if ( global_disallows & SLAP_DISALLOW_BIND_SIMPLE ) {
+                       /* disallow simple authentication */
+                       rc = LDAP_UNWILLING_TO_PERFORM;
+                       text = "unwilling to perform simple authentication";
+
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "do_bind: conn %d  v%d simple bind(%s) disallowed\n",
+                                  conn->c_connid, version, ndn ));
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "do_bind: v%d simple bind(%s) disallowed\n",
+                               version, ndn, 0 );
+#endif
+                       goto cleanup;
+               }
+
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+       } else if ( method == LDAP_AUTH_KRBV41 || method == LDAP_AUTH_KRBV42 ) {
+               if ( global_disallows & SLAP_DISALLOW_BIND_KRBV4 ) {
+                       /* disallow simple authentication */
+                       rc = LDAP_UNWILLING_TO_PERFORM;
+                       text = "unwilling to perform Kerberos V4 bind";
+
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                                  "do_bind: conn %d  v%d Kerberos V4 bind\n",
+                                  conn->c_connid, version ));
+#else
+                       Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n",
+                               version, 0, 0 );
 #endif
+                       goto cleanup;
                }
+#endif
 
-               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-       }
+       } else {
+               rc = LDAP_AUTH_METHOD_NOT_SUPPORTED;
+               text = "unknown authentication method";
 
-       /* accept "anonymous" binds */
-       if ( cred.bv_len == 0 || ndn == NULL || *ndn == '\0' ) {
-               /*
-                * we already forced connection to "anonymous",
-                * just need to send success
-                */
-               send_ldap_result( conn, op, LDAP_SUCCESS,
-                       NULL, NULL, NULL, NULL );
-               Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
-                       version, 0, 0 );
+               send_ldap_result( conn, op, rc,
+                       NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_bind: conn %d  v%d unknown authentication method (%d)\n",
+                          conn->c_connid, version, method ));
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "do_bind: v%d unknown authentication method (%d)\n",
+                       version, method, 0 );
+#endif
                goto cleanup;
        }
 
@@ -306,10 +428,15 @@ do_bind(
         * if we don't hold it.
         */
 
-       if ( (be = select_backend( ndn )) == NULL ) {
+       if ( (be = select_backend( ndn, 0 )) == NULL ) {
                if ( default_referral ) {
+                       struct berval **ref = referral_rewrite( default_referral,
+                               NULL, dn, LDAP_SCOPE_DEFAULT );
+
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                               NULL, NULL, default_referral, NULL );
+                               NULL, NULL, ref ? ref : default_referral, NULL );
+
+                       ber_bvecfree( ref );
 
                } else {
                        /* noSuchObject is not allowed to be returned by bind */
@@ -320,17 +447,16 @@ do_bind(
                goto cleanup;
        }
 
-       conn->c_authz_backend = be;
-
-       /* make sure this backend recongizes critical controls */
-       rc = backend_check_controls( be, conn, op, &text ) ;
-
+       /* check restrictions */
+       rc = backend_check_restrictions( be, conn, op, NULL, &text );
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );
                goto cleanup;
        }
 
+       conn->c_authz_backend = be;
+
        if ( be->be_bind ) {
                int ret;
                /* alias suffix */
@@ -340,7 +466,7 @@ do_bind(
                ndn = suffix_alias( be, ndn );
 
                ret = (*be->be_bind)( be, conn, op, dn, ndn,
-                       method, mech, &cred, &edn );
+                       method, &cred, &edn );
 
                if ( ret == 0 ) {
                        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
@@ -355,8 +481,20 @@ do_bind(
                                ndn = NULL;
                        }
 
+                       if( conn->c_dn != NULL ) {
+                               ber_len_t max = sockbuf_max_incoming;
+                               ber_sockbuf_ctrl( conn->c_sb,
+                                       LBER_SB_OPT_SET_MAX_INCOMING, &max );
+                       }
+
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                                  "do_bind: conn %d  v%d bind: \"%s\" to \"%s\" \n",
+                                  conn->c_connid, version, conn->c_cdn, conn->c_dn ));
+#else
                        Debug( LDAP_DEBUG_TRACE, "do_bind: v%d bind: \"%s\" to \"%s\"\n",
-                       version, conn->c_cdn, conn->c_dn );
+                       version, conn->c_cdn, conn->c_dn );
+#endif
 
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
@@ -370,7 +508,7 @@ do_bind(
 
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "bind function not implemented", NULL, NULL );
+                       NULL, "operation not supported within namingContext", NULL, NULL );
        }
 
 cleanup: