--- servers/slapd/filter.c 2001/12/07 15:43:18 1.13.4.10 +++ servers/slapd/filter.c 2001/10/22 11:23:05 1.61 @@ -1,5 +1,5 @@ /* filter.c - routines for parsing and dealing with filters */ -/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.13.4.9 2001/08/31 20:24:17 kurt Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.60 2001/06/22 16:09:19 kurt Exp $ */ /* * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file @@ -47,8 +47,12 @@ get_filter( char *ftmp = NULL; struct berval escaped; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_filter: conn %d\n", + conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 ); - +#endif /* * A filter looks like this coming in: * Filter ::= CHOICE { @@ -65,19 +69,19 @@ get_filter( * } * * SubstringFilter ::= SEQUENCE { - * type AttributeType, + * type AttributeType, * SEQUENCE OF CHOICE { - * initial [0] IA5String, - * any [1] IA5String, - * final [2] IA5String + * initial [0] IA5String, + * any [1] IA5String, + * final [2] IA5String * } * } * - * MatchingRuleAssertion ::= SEQUENCE { - * matchingRule [1] MatchingRuleId OPTIONAL, - * type [2] AttributeDescription OPTIONAL, - * matchValue [3] AssertionValue, - * dnAttributes [4] BOOLEAN DEFAULT FALSE + * MatchingRuleAssertion ::= SEQUENCE { + * matchingRule [1] MatchingRuleId OPTIONAL, + * type [2] AttributeDescription OPTIONAL, + * matchValue [3] AssertionValue, + * dnAttributes [4] BOOLEAN DEFAULT FALSE * } * */ @@ -98,8 +102,12 @@ get_filter( switch ( f->f_choice ) { case LDAP_FILTER_EQUALITY: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2, + "get_filter: conn %d EQUALITY\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 ); - +#endif err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text ); if ( err != LDAP_SUCCESS ) { break; @@ -110,24 +118,33 @@ get_filter( filter_escape_value( f->f_av_value, &escaped ); *fstr = ch_malloc( sizeof("(=)") - + f->f_av_desc->ad_cname->bv_len + + f->f_av_desc->ad_cname.bv_len + escaped.bv_len ); sprintf( *fstr, "(%s=%s)", - f->f_av_desc->ad_cname->bv_val, + f->f_av_desc->ad_cname.bv_val, escaped.bv_val ); ber_memfree( escaped.bv_val ); break; case LDAP_FILTER_SUBSTRINGS: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d SUBSTRINGS\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 ); +#endif err = get_substring_filter( conn, ber, f, fstr, text ); break; case LDAP_FILTER_GE: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d GE\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 ); - +#endif err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; @@ -136,19 +153,23 @@ get_filter( filter_escape_value( f->f_av_value, &escaped ); *fstr = ch_malloc( sizeof("(>=)") - + f->f_av_desc->ad_cname->bv_len + + f->f_av_desc->ad_cname.bv_len + escaped.bv_len ); sprintf( *fstr, "(%s>=%s)", - f->f_av_desc->ad_cname->bv_val, + f->f_av_desc->ad_cname.bv_val, escaped.bv_val ); ber_memfree( escaped.bv_val ); break; case LDAP_FILTER_LE: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d LE\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 ); - +#endif err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; @@ -158,11 +179,11 @@ get_filter( filter_escape_value( f->f_av_value, &escaped ); *fstr = ch_malloc( sizeof("(<=)") - + f->f_av_desc->ad_cname->bv_len + + f->f_av_desc->ad_cname.bv_len + escaped.bv_len ); sprintf( *fstr, "(%s<=%s)", - f->f_av_desc->ad_cname->bv_val, + f->f_av_desc->ad_cname.bv_val, escaped.bv_val ); ber_memfree( escaped.bv_val ); @@ -171,8 +192,12 @@ get_filter( case LDAP_FILTER_PRESENT: { struct berval type; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d PRESENT\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 ); - +#endif if ( ber_scanf( ber, "o", &type ) == LBER_ERROR ) { err = SLAPD_DISCONNECT; *text = "error decoding filter"; @@ -183,27 +208,26 @@ get_filter( err = slap_bv2ad( &type, &f->f_desc, text ); if( err != LDAP_SUCCESS ) { - /* unrecognized attribute description or other error */ - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = LDAP_COMPARE_FALSE; - *fstr = ch_strdup( "(unrecogized=*)" ); ch_free( type.bv_val ); - err = LDAP_SUCCESS; break; } ch_free( type.bv_val ); *fstr = ch_malloc( sizeof("(=*)") - + f->f_desc->ad_cname->bv_len ); + + f->f_desc->ad_cname.bv_len ); sprintf( *fstr, "(%s=*)", - f->f_desc->ad_cname->bv_val ); + f->f_desc->ad_cname.bv_val ); } break; case LDAP_FILTER_APPROX: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d APPROX\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 ); - +#endif err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY_APPROX, text ); if ( err != LDAP_SUCCESS ) { break; @@ -212,18 +236,23 @@ get_filter( filter_escape_value( f->f_av_value, &escaped ); *fstr = ch_malloc( sizeof("(~=)") - + f->f_av_desc->ad_cname->bv_len + + f->f_av_desc->ad_cname.bv_len + escaped.bv_len ); sprintf( *fstr, "(%s~=%s)", - f->f_av_desc->ad_cname->bv_val, + f->f_av_desc->ad_cname.bv_val, escaped.bv_val ); ber_memfree( escaped.bv_val ); break; case LDAP_FILTER_AND: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d AND\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 ); +#endif err = get_filter_list( conn, ber, &f->f_and, &ftmp, text ); if ( err != LDAP_SUCCESS ) { break; @@ -235,7 +264,12 @@ get_filter( break; case LDAP_FILTER_OR: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d OR\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 ); +#endif err = get_filter_list( conn, ber, &f->f_and, &ftmp, text ); if ( err != LDAP_SUCCESS ) { break; @@ -247,7 +281,12 @@ get_filter( break; case LDAP_FILTER_NOT: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d NOT\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 ); +#endif (void) ber_skip_tag( ber, &len ); err = get_filter( conn, ber, &f->f_not, &ftmp, text ); if ( err != LDAP_SUCCESS ) { @@ -260,19 +299,47 @@ get_filter( break; case LDAP_FILTER_EXT: - /* not yet implemented */ - Debug( LDAP_DEBUG_ANY, "extensible match not yet implemented.\n", - 0, 0, 0 ); - (void) ber_skip_tag( ber, &len ); - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; - *fstr = ch_strdup( "(extended)" ); +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_filter: conn %d EXTENSIBLE\n", conn->c_connid )); +#else + Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 ); +#endif + + err = get_mra( ber, &f->f_mra, text ); + if ( err != LDAP_SUCCESS ) { + break; + } + + assert( f->f_mra != NULL ); + + filter_escape_value( f->f_mr_value, &escaped ); + + *fstr = ch_malloc( sizeof("(:dn::=)") + + (f->f_mr_desc ? f->f_mr_desc->ad_cname.bv_len : 0) + + (f->f_mr_rule_text ? strlen(f->f_mr_rule_text) : 0) + + escaped.bv_len ); + + sprintf( *fstr, "(%s%s%s%s:=%s)", + (f->f_mr_desc ? f->f_mr_desc->ad_cname.bv_val : ""), + (f->f_mr_dnattrs ? ":dn" : ""), + (f->f_mr_rule_text ? ":" : ""), + (f->f_mr_rule_text ? f->f_mr_rule_text : ""), + escaped.bv_val ); + + ber_memfree( escaped.bv_val ); break; default: (void) ber_scanf( ber, "x" ); /* skip the element */ +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ERR, + "get_filter: conn %d unknown filter type=%lu\n", + conn->c_connid, f->f_choice )); +#else Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n", f->f_choice, 0, 0 ); +#endif f->f_choice = SLAPD_FILTER_COMPUTED; f->f_result = SLAPD_COMPARE_UNDEFINED; *fstr = ch_strdup( "(undefined)" ); @@ -301,7 +368,12 @@ get_filter( *filt = f; } +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2, + "get_filter: conn %d exit\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 ); +#endif return( err ); } @@ -316,8 +388,12 @@ get_filter_list( Connection *conn, BerEl ber_len_t len; char *last, *ftmp; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, + "get_filter_list: conn %d start\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 ); - +#endif *fstr = NULL; new = f; for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; @@ -339,7 +415,12 @@ get_filter_list( Connection *conn, BerEl } *new = NULL; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, + "get_filter_list: conn %d exit\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 ); +#endif return( LDAP_SUCCESS ); } @@ -362,8 +443,12 @@ get_substring_filter( struct berval *nvalue; *text = "error decoding filter"; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, + "get_substring_filter: conn %d begin\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 ); - +#endif if ( ber_scanf( ber, "{o" /*}*/, &type ) == LBER_ERROR ) { return SLAPD_DISCONNECT; } @@ -389,8 +474,8 @@ get_substring_filter( if( fstr ) { *fstr = ch_malloc( sizeof("(=" /*)*/) + - f->f_sub_desc->ad_cname->bv_len ); - sprintf( *fstr, "(%s=" /*)*/, f->f_sub_desc->ad_cname->bv_val ); + f->f_sub_desc->ad_cname.bv_len ); + sprintf( *fstr, "(%s=" /*)*/, f->f_sub_desc->ad_cname.bv_val ); } for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; @@ -426,10 +511,15 @@ get_substring_filter( default: rc = LDAP_PROTOCOL_ERROR; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ERR, + "get_filter_substring: conn %d unknown substring choice=%ld\n", + conn->c_connid, (long)tag )); +#else Debug( LDAP_DEBUG_FILTER, " unknown substring choice=%ld\n", (long) tag, 0, 0 ); - +#endif ber_bvfree( value ); goto return_error; } @@ -447,7 +537,14 @@ get_substring_filter( switch ( tag ) { case LDAP_SUBSTRING_INITIAL: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_substring_filter: conn %d INITIAL\n", + conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 ); +#endif + if ( f->f_sub_initial != NULL || f->f_sub_any != NULL || f->f_sub_final != NULL ) @@ -468,7 +565,13 @@ get_substring_filter( break; case LDAP_SUBSTRING_ANY: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_substring_filter: conn %d ANY\n", + conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); +#endif if ( f->f_sub_final != NULL ) { ber_bvfree( value ); @@ -491,7 +594,13 @@ get_substring_filter( break; case LDAP_SUBSTRING_FINAL: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "get_substring_filter: conn %d FINAL\n", + conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 ); +#endif if ( f->f_sub_final != NULL ) { ber_bvfree( value ); @@ -511,22 +620,32 @@ get_substring_filter( break; default: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_INFO, + "get_substring_filter: conn %d unknown substring type %ld\n", + conn->c_connid, (long)tag )); +#else Debug( LDAP_DEBUG_FILTER, " unknown substring type=%ld\n", (long) tag, 0, 0 ); +#endif ber_bvfree( value ); return_error: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_INFO, + "get_substring_filter: conn %d error %ld\n", + conn->c_connid, (long)rc )); +#else Debug( LDAP_DEBUG_FILTER, " error=%ld\n", (long) rc, 0, 0 ); - +#endif if( fstr ) { free( *fstr ); *fstr = NULL; } - ad_free( f->f_sub_desc, 1 ); ber_bvfree( f->f_sub_initial ); ber_bvecfree( f->f_sub_any ); ber_bvfree( f->f_sub_final ); @@ -543,7 +662,12 @@ return_error: strcat( *fstr, /*(*/ ")" ); } +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, + "get_substring_filter: conn %d exit\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 ); +#endif return( LDAP_SUCCESS ); } @@ -558,7 +682,6 @@ filter_free( Filter *f ) switch ( f->f_choice ) { case LDAP_FILTER_PRESENT: - ad_free( f->f_desc, 1 ); break; case LDAP_FILTER_EQUALITY: @@ -569,7 +692,6 @@ filter_free( Filter *f ) break; case LDAP_FILTER_SUBSTRINGS: - ad_free( f->f_sub_desc, 1 ); if ( f->f_sub_initial != NULL ) { ber_bvfree( f->f_sub_initial ); } @@ -593,8 +715,13 @@ filter_free( Filter *f ) break; default: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ERR, + "filter_free: unknown filter type %lu\n", f->f_choice )); +#else Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n", f->f_choice, 0, 0 ); +#endif break; } @@ -617,7 +744,7 @@ filter_print( Filter *f ) case LDAP_FILTER_EQUALITY: filter_escape_value( f->f_av_value, &escaped ); fprintf( stderr, "(%s=%s)", - f->f_av_desc->ad_cname->bv_val, + f->f_av_desc->ad_cname.bv_val, escaped.bv_val ); ber_memfree( escaped.bv_val ); break; @@ -625,7 +752,7 @@ filter_print( Filter *f ) case LDAP_FILTER_GE: filter_escape_value( f->f_av_value, &escaped ); fprintf( stderr, "(%s>=%s)", - f->f_av_desc->ad_cname->bv_val, + f->f_av_desc->ad_cname.bv_val, escaped.bv_val ); ber_memfree( escaped.bv_val ); break; @@ -633,7 +760,7 @@ filter_print( Filter *f ) case LDAP_FILTER_LE: filter_escape_value( f->f_av_value, &escaped ); fprintf( stderr, "(%s<=%s)", - f->f_ava->aa_desc->ad_cname->bv_val, + f->f_ava->aa_desc->ad_cname.bv_val, escaped.bv_val ); ber_memfree( escaped.bv_val ); break; @@ -641,14 +768,14 @@ filter_print( Filter *f ) case LDAP_FILTER_APPROX: filter_escape_value( f->f_av_value, &escaped ); fprintf( stderr, "(%s~=%s)", - f->f_ava->aa_desc->ad_cname->bv_val, + f->f_ava->aa_desc->ad_cname.bv_val, escaped.bv_val ); ber_memfree( escaped.bv_val ); break; case LDAP_FILTER_SUBSTRINGS: fprintf( stderr, "(%s=" /*)*/, - f->f_sub_desc->ad_cname->bv_val ); + f->f_sub_desc->ad_cname.bv_val ); if ( f->f_sub_initial != NULL ) { filter_escape_value( f->f_sub_initial, &escaped ); fprintf( stderr, "%s", @@ -674,7 +801,7 @@ filter_print( Filter *f ) case LDAP_FILTER_PRESENT: fprintf( stderr, "(%s=*)", - f->f_desc->ad_cname->bv_val ); + f->f_desc->ad_cname.bv_val ); break; case LDAP_FILTER_AND: