X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=a24a9f68ee60fb9c76061a72b762bb0575171710;hb=18393e882cd89e461fc804b8ef58817027e465a1;hp=3c1bce5336c84b628e5e3f76bb4bf7917fab8c71;hpb=3250aef49c0158e4d172e3cc6e5e16797e929ae1;p=openldap diff --git a/servers/slapd/search.c b/servers/slapd/search.c index 3c1bce5336..a24a9f68ee 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -17,26 +17,35 @@ #include #include -#include "ldapconfig.h" +#include "ldap_defaults.h" #include "slap.h" -void +int do_search( Connection *conn, /* where to send results */ Operation *op /* info about the op to which we're responding */ ) { int i, err; - int scope, deref, attrsonly; - int sizelimit, timelimit; + ber_int_t scope, deref, attrsonly; + ber_int_t sizelimit, timelimit; char *base = NULL, *fstr = NULL; Filter *filter = NULL; char **attrs = NULL; Backend *be; + int rc; Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 ); + if( op->o_bind_in_progress ) { + Debug( LDAP_DEBUG_ANY, "do_search: SASL bind in progress.\n", + 0, 0, 0 ); + send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, + NULL, "SASL bind in progress", NULL, NULL ); + return LDAP_SASL_BIND_IN_PROGRESS; + } + /* * Parse the search request. It looks like this: * @@ -62,19 +71,46 @@ do_search( */ /* baseObject, scope, derefAliases, sizelimit, timelimit, attrsOnly */ - if ( ber_scanf( op->o_ber, "{aiiiib", &base, &scope, &deref, &sizelimit, + if ( ber_scanf( op->o_ber, "{aiiiib", + &base, &scope, &deref, &sizelimit, &timelimit, &attrsonly ) == LBER_ERROR ) { - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "" ); + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding error" ); + rc = -1; goto return_results; } - if ( scope != LDAP_SCOPE_BASE && scope != LDAP_SCOPE_ONELEVEL - && scope != LDAP_SCOPE_SUBTREE ) { - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, - "Unknown search scope" ); + + switch( scope ) { + case LDAP_SCOPE_BASE: + case LDAP_SCOPE_ONELEVEL: + case LDAP_SCOPE_SUBTREE: + break; + default: + send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, + NULL, "invalid scope", NULL, NULL ); + rc = -1; goto return_results; } - (void) dn_normalize_case( base ); + switch( deref ) { + case LDAP_DEREF_NEVER: + case LDAP_DEREF_FINDING: + case LDAP_DEREF_SEARCHING: + case LDAP_DEREF_ALWAYS: + break; + default: + send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, + NULL, "invalid deref", NULL, NULL ); + rc = -1; + goto return_results; + } + + if( dn_normalize_case( base ) == NULL ) { + send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX, + NULL, "invalid DN", NULL, NULL ); + rc = -1; + goto return_results; + } Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d", base, scope, deref ); Debug( LDAP_DEBUG_ARGS, " %d %d %d\n", sizelimit, timelimit, @@ -82,52 +118,75 @@ do_search( /* filter - returns a "normalized" version */ if ( (err = get_filter( conn, op->o_ber, &filter, &fstr )) != 0 ) { - send_ldap_result( conn, op, err, NULL, "Bad search filter" ); + if( err == -1 ) { + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decode error" ); + } else { + send_ldap_result( conn, op, err, + NULL, "Bad search filter", NULL, NULL ); + } goto return_results; } + Debug( LDAP_DEBUG_ARGS, " filter: %s\n", fstr, 0, 0 ); /* attributes */ - if ( ber_scanf( op->o_ber, "{v}}", &attrs ) == LBER_ERROR ) { - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "" ); + if ( ber_scanf( op->o_ber, /*{*/ "{v}}", &attrs ) == LBER_ERROR ) { + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding error" ); + rc = -1; goto return_results; } + if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { + Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 ); + goto return_results; + } + + rc = 0; + Debug( LDAP_DEBUG_ARGS, " attrs:", 0, 0, 0 ); + if ( attrs != NULL ) { for ( i = 0; attrs[i] != NULL; i++ ) { attr_normalize( attrs[i] ); Debug( LDAP_DEBUG_ARGS, " %s", attrs[i], 0, 0 ); } } + Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 ); Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d SRCH base=\"%s\" scope=%d filter=\"%s\"\n", - conn->c_connid, op->o_opid, base, scope, fstr ); + op->o_connid, op->o_opid, base, scope, fstr ); -#if defined( SLAPD_MONITOR_DN ) || defined( SLAPD_CONFIG_DN ) || defined( SLAPD_SCHEMA_DN ) if ( scope == LDAP_SCOPE_BASE ) { #if defined( SLAPD_MONITOR_DN ) if ( strcmp( base, SLAPD_MONITOR_DN ) == 0 ) { - monitor_info( conn, op ); + monitor_info( conn, op, attrs, attrsonly ); goto return_results; } #endif + #if defined( SLAPD_CONFIG_DN ) if ( strcmp( base, SLAPD_CONFIG_DN ) == 0 ) { - config_info( conn, op ); + config_info( conn, op, attrs, attrsonly ); goto return_results; } #endif + #if defined( SLAPD_SCHEMA_DN ) if ( strcmp( base, SLAPD_SCHEMA_DN ) == 0 ) { - schema_info( conn, op ); + schema_info( conn, op, attrs, attrsonly ); goto return_results; } #endif + + if ( strcmp( base, LDAP_ROOT_DSE ) == 0 ) { + root_dse_info( conn, op, attrs, attrsonly ); + goto return_results; + } } -#endif /* monitor or config or schema dn */ /* * We could be serving multiple database backends. Select the @@ -135,22 +194,22 @@ do_search( * if we don't hold it. */ if ( (be = select_backend( base )) == NULL ) { - send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL, - default_referral ); + send_ldap_result( conn, op, rc = LDAP_REFERRAL, + NULL, NULL, default_referral, NULL ); goto return_results; } - /* translate the base if it matches an aliased base part */ - base = suffixAlias ( base, op, be ); + /* deref the base if needed */ + base = suffix_alias( be, base ); /* actually do the search and send the result(s) */ if ( be->be_search ) { (*be->be_search)( be, conn, op, base, scope, deref, sizelimit, timelimit, filter, fstr, attrs, attrsonly ); } else { - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL, - "Function not implemented" ); + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "Function not implemented", NULL, NULL ); } return_results:; @@ -160,4 +219,6 @@ return_results:; if ( attrs != NULL ) { charray_free( attrs ); } + + return rc; }