X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=9f26bcea3542dbba12daa7e9ce2c4f201d582d4d;hb=85271276029365fc691192654d751e4cd948822b;hp=197126f6a107ffec7c4be89ba8aac075db462bad;hpb=a4a1325a6a398879e55b50282c72b15de5a99f0e;p=openldap diff --git a/servers/slapd/search.c b/servers/slapd/search.c index 197126f6a1..9f26bcea35 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* Portions @@ -16,6 +16,7 @@ */ #include "portable.h" +#include "slapi_common.h" #include @@ -23,28 +24,33 @@ #include #include "ldap_pvt.h" +#include "lutil.h" #include "slap.h" +#include "slapi.h" int do_search( Connection *conn, /* where to send results */ Operation *op /* info about the op to which we're responding */ ) { - int i; ber_int_t scope, deref, attrsonly; ber_int_t sizelimit, timelimit; struct berval base = { 0, NULL }; - char *nbase = NULL, *fstr = NULL; + struct berval pbase = { 0, NULL }; + struct berval nbase = { 0, NULL }; + struct berval fstr = { 0, NULL }; Filter *filter = NULL; - char **attrs = NULL; + AttributeName *an = NULL; + ber_len_t siz, off, i; Backend *be; int rc; const char *text; int manageDSAit; + Slapi_PBlock *pb = op->o_pb; + #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "do_search: conn %d\n", conn->c_connid )); + LDAP_LOG( OPERATION, ENTRY, "do_search: conn %d\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 ); #endif @@ -74,7 +80,7 @@ do_search( */ /* baseObject, scope, derefAliases, sizelimit, timelimit, attrsOnly */ - if ( ber_scanf( op->o_ber, "{oiiiib" /*}*/, + if ( ber_scanf( op->o_ber, "{miiiib" /*}*/, &base, &scope, &deref, &sizelimit, &timelimit, &attrsonly ) == LBER_ERROR ) { @@ -107,105 +113,143 @@ do_search( goto return_results; } - nbase = ch_strdup( base.bv_val ); - - if( dn_normalize( nbase ) == NULL ) { - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, - NULL, "invalid DN", NULL, NULL ); + rc = dnPrettyNormal( NULL, &base, &pbase, &nbase ); + if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_search: conn %d invalid dn (%s)\n", + conn->c_connid, base.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "do_search: invalid dn (%s)\n", base.bv_val, 0, 0 ); +#endif + send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, + "invalid DN", NULL, NULL ); goto return_results; } #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, - "do_search \"%s\" %d %d %d %d %d\n", base.bv_val, scope, - deref, sizelimit, timelimit, attrsonly )); + LDAP_LOG( OPERATION, ARGS, "SRCH \"%s\" %d %d", + base.bv_val, scope, deref ); + LDAP_LOG( OPERATION, ARGS, " %d %d %d\n", + sizelimit, timelimit, attrsonly); #else - Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d", base.bv_val, scope, deref ); - Debug( LDAP_DEBUG_ARGS, " %d %d %d\n", sizelimit, timelimit, - attrsonly); + Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d", + base.bv_val, scope, deref ); + Debug( LDAP_DEBUG_ARGS, " %d %d %d\n", + sizelimit, timelimit, attrsonly); #endif /* filter - returns a "normalized" version */ - rc = get_filter( conn, op->o_ber, &filter, &fstr, &text ); + rc = get_filter( conn, op->o_ber, &filter, &text ); if( rc != LDAP_SUCCESS ) { if( rc == SLAPD_DISCONNECT ) { send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, text ); } else { - send_ldap_result( conn, op, rc, - NULL, text, NULL, NULL ); + send_ldap_result( conn, op, rc, + NULL, text, NULL, NULL ); } goto return_results; } + filter2bv( filter, &fstr ); #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, - "do_search: conn %d filter: %s\n", conn->c_connid, fstr )); + LDAP_LOG( OPERATION, ARGS, + "do_search: conn %d filter: %s\n", + conn->c_connid, fstr.bv_len ? fstr.bv_val : "empty", 0 ); #else - Debug( LDAP_DEBUG_ARGS, " filter: %s\n", fstr, 0, 0 ); + Debug( LDAP_DEBUG_ARGS, " filter: %s\n", + fstr.bv_len ? fstr.bv_val : "empty", 0, 0 ); #endif - /* attributes */ - if ( ber_scanf( op->o_ber, /*{*/ "{v}}", &attrs ) == LBER_ERROR ) { + siz = sizeof(AttributeName); + off = 0; + if ( ber_scanf( op->o_ber, "{M}}", &an, &siz, off ) == LBER_ERROR ) { send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding attrs error" ); rc = SLAPD_DISCONNECT; goto return_results; } + for ( i=0; ic_connid, rc )); + conn->c_connid, rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 ); #endif goto return_results; - } - - rc = LDAP_SUCCESS; + } #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, - "do_search: conn %d attrs:", conn->c_connid )); + LDAP_LOG( OPERATION, ARGS, + "do_search: conn %d attrs:", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_ARGS, " attrs:", 0, 0, 0 ); #endif - - if ( attrs != NULL ) { - for ( i = 0; attrs[i] != NULL; i++ ) { + if ( siz != 0 ) { + for ( i = 0; io_connid, op->o_opid, base.bv_val, scope, fstr ); + if ( StatslogTest( LDAP_DEBUG_STATS ) ) { + char abuf[BUFSIZ/2], *ptr = abuf; + int len = 0; + + Statslog( LDAP_DEBUG_STATS, + "conn=%lu op=%lu SRCH base=\"%s\" scope=%d filter=\"%s\"\n", + op->o_connid, op->o_opid, pbase.bv_val, scope, fstr.bv_val ); + + for ( i = 0; i sizeof(abuf)) { + Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu SRCH attr=%s\n", + op->o_connid, op->o_opid, abuf, 0, 0 ); + len = 0; + ptr = abuf; + } + if (len) { + *ptr++ = ' '; + len++; + } + ptr = lutil_strcopy(ptr, an[i].an_name.bv_val); + len += an[i].an_name.bv_len; + } + if (len) { + Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu SRCH attr=%s\n", + op->o_connid, op->o_opid, abuf, 0, 0 ); + } + } manageDSAit = get_manageDSAit( op ); if ( scope == LDAP_SCOPE_BASE ) { Entry *entry = NULL; - if ( strcasecmp( nbase, LDAP_ROOT_DSE ) == 0 ) { + if ( nbase.bv_len == 0 ) { #ifdef LDAP_CONNECTIONLESS - /* Ignore LDAPv2 CLDAP DSE queries */ + /* Ignore LDAPv2 CLDAP Root DSE queries */ if (op->o_protocol==LDAP_VERSION2 && conn->c_is_udp) { goto return_results; } @@ -219,10 +263,8 @@ do_search( } rc = root_dse_info( conn, &entry, &text ); - } -#if defined( SLAPD_SCHEMA_DN ) - else if ( strcasecmp( nbase, SLAPD_SCHEMA_DN ) == 0 ) { + } else if ( bvmatch( &nbase, &global_schemandn ) ) { /* check restrictions */ rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ; if( rc != LDAP_SUCCESS ) { @@ -233,7 +275,6 @@ do_search( rc = schema_info( &entry, &text ); } -#endif if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, @@ -246,7 +287,7 @@ do_search( if( rc == LDAP_COMPARE_TRUE ) { send_search_entry( NULL, conn, op, - entry, attrs, attrsonly, NULL ); + entry, an, attrsonly, NULL ); } entry_free( entry ); @@ -257,12 +298,12 @@ do_search( } } - if( nbase[0] == '\0' && default_search_nbase != NULL ) { - ch_free( base.bv_val ); - ch_free( nbase ); - base.bv_val = ch_strdup( default_search_base ); - base.bv_len = strlen( default_search_nbase ); - nbase = ch_strdup( default_search_nbase ); + if( !nbase.bv_len && default_search_nbase.bv_len ) { + ch_free( pbase.bv_val ); + ch_free( nbase.bv_val ); + + ber_dupbv( &pbase, &default_search_base ); + ber_dupbv( &nbase, &default_search_nbase ); } /* @@ -270,14 +311,14 @@ do_search( * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ - if ( (be = select_backend( nbase, manageDSAit, 1 )) == NULL ) { - struct berval **ref = referral_rewrite( default_referral, - NULL, base.bv_val, scope ); + if ( (be = select_backend( &nbase, manageDSAit, 1 )) == NULL ) { + BerVarray ref = referral_rewrite( default_referral, + NULL, &pbase, scope ); send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, ref ? ref : default_referral, NULL ); - ber_bvecfree( ref ); + ber_bvarray_free( ref ); goto return_results; } @@ -290,31 +331,84 @@ do_search( } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, base.bv_val, nbase ); + rc = backend_check_referrals( be, conn, op, &pbase, &nbase ); if ( rc != LDAP_SUCCESS ) { goto return_results; } /* deref the base if needed */ - nbase = suffix_alias( be, nbase ); + suffix_alias( be, &nbase ); + +#if defined( LDAP_SLAPI ) + slapi_pblock_set( pb, SLAPI_BACKEND, (void *)be ); + slapi_pblock_set( pb, SLAPI_CONNECTION, (void *)conn ); + slapi_pblock_set( pb, SLAPI_OPERATION, (void *)op ); + slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)base.bv_val ); + slapi_pblock_set( pb, SLAPI_SEARCH_SCOPE, (void *)scope ); + slapi_pblock_set( pb, SLAPI_SEARCH_DEREF, (void *)deref ); + slapi_pblock_set( pb, SLAPI_SEARCH_SIZELIMIT, (void *)sizelimit ); + slapi_pblock_set( pb, SLAPI_SEARCH_TIMELIMIT, (void *)timelimit ); + slapi_pblock_set( pb, SLAPI_SEARCH_FILTER, (void *)filter ); + slapi_pblock_set( pb, SLAPI_SEARCH_STRFILTER, (void *)fstr.bv_val ); + slapi_pblock_set( pb, SLAPI_SEARCH_ATTRSONLY, (void *)attrsonly ); + slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)op->o_ctrls ); + slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(1) ); + + rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_SEARCH_FN, pb ); + if ( rc != 0 && rc != LDAP_OTHER ) { + /* + * either there is no preOp (search) plugins + * or a plugin failed. Just log it + * + * FIXME: is this correct? + */ +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_search: search preOps failed\n")); +#else + Debug(LDAP_DEBUG_TRACE, "search preOps failed.\n", 0, 0, 0); +#endif + } +#endif /* defined( LDAP_SLAPI ) */ /* actually do the search and send the result(s) */ if ( be->be_search ) { - (*be->be_search)( be, conn, op, base.bv_val, nbase, + (*be->be_search)( be, conn, op, &pbase, &nbase, scope, deref, sizelimit, - timelimit, filter, fstr, attrs, attrsonly ); + timelimit, filter, &fstr, an, attrsonly ); } else { send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "operation not supported within namingContext", NULL, NULL ); + NULL, "operation not supported within namingContext", + NULL, NULL ); } +#if defined( LDAP_SLAPI ) + rc = doPluginFNs( be, SLAPI_PLUGIN_POST_SEARCH_FN, pb ); + if ( rc != 0 && rc != LDAP_OTHER ) { + /* + * either there is no postOp (search) plugins + * or a plugin failed. Just log it + * + * FIXME: is this correct? + */ +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_search: search postOps failed\n")); +#else + Debug (LDAP_DEBUG_TRACE, " search postOps failed.\n", 0, 0, 0); +#endif + } +#endif /* defined( LDAP_SLAPI ) */ + return_results:; - free( base.bv_val ); - if( nbase != NULL) free( nbase ); - if( fstr != NULL) free( fstr ); - if( filter != NULL) filter_free( filter ); - if ( attrs != NULL ) { - charray_free( attrs ); +#ifdef LDAP_CLIENT_UPDATE + if ( !( op->o_clientupdate_type & SLAP_LCUP_PERSIST ) ) +#endif /* LDAP_CLIENT_UPDATE */ + { + if( pbase.bv_val != NULL) free( pbase.bv_val ); + if( nbase.bv_val != NULL) free( nbase.bv_val ); + + if( fstr.bv_val != NULL) free( fstr.bv_val ); + if( filter != NULL) filter_free( filter ); + if( an != NULL ) free( an ); } return rc;