X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilter.c;h=ff9334639c6ace1a56ebe123cbe427e2a707ac9b;hb=4325d05ebc5ca096ee4a0d0177e7651c028c7449;hp=81243d9ebfcb6c82d596d79d1d6a18d4dae161a0;hpb=52fb5b13424c3e3daee261553f0833d56add5fc1;p=openldap diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c index 81243d9ebf..ff9334639c 100644 --- a/servers/slapd/filter.c +++ b/servers/slapd/filter.c @@ -20,10 +20,10 @@ static int get_filter_list( Filter **f, const char **text ); -static int get_substring_filter( +static int get_ssa( Connection *conn, BerElement *ber, - Filter *f, + SubstringsAssertion **s, const char **text ); static void simple_vrFilter2bv( @@ -36,6 +36,9 @@ static int get_simple_vrFilter( ValuesReturnFilter **f, const char **text ); +#ifdef SLAP_NVALUES +#define XXX 1 +#endif int get_filter( @@ -47,7 +50,7 @@ get_filter( ber_tag_t tag; ber_len_t len; int err; - Filter *f; + Filter f; #ifdef NEW_LOGGING LDAP_LOG( FILTER, ENTRY, "get_filter: conn %d\n", conn->c_connid, 0, 0 ); @@ -94,13 +97,12 @@ get_filter( return SLAPD_DISCONNECT; } - f = (Filter *) ch_malloc( sizeof(Filter) ); - f->f_next = NULL; - err = LDAP_SUCCESS; - f->f_choice = tag; - switch ( f->f_choice ) { + f.f_next = NULL; + f.f_choice = tag; + + switch ( f.f_choice ) { case LDAP_FILTER_EQUALITY: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL2, @@ -108,12 +110,12 @@ get_filter( #else Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text ); + err = get_ava( ber, &f.f_ava, SLAP_MR_EQUALITY, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( f->f_ava != NULL ); + assert( f.f_ava != NULL ); break; case LDAP_FILTER_SUBSTRINGS: @@ -123,11 +125,11 @@ get_filter( #else Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 ); #endif - err = get_substring_filter( conn, ber, f, text ); + err = get_ssa( conn, ber, &f.f_sub, text ); if( err != LDAP_SUCCESS ) { break; } - assert( f->f_sub != NULL ); + assert( f.f_sub != NULL ); break; case LDAP_FILTER_GE: @@ -137,11 +139,11 @@ get_filter( #else Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &f.f_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( f->f_ava != NULL ); + assert( f.f_ava != NULL ); break; case LDAP_FILTER_LE: @@ -151,11 +153,11 @@ get_filter( #else Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &f.f_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( f->f_ava != NULL ); + assert( f.f_ava != NULL ); break; case LDAP_FILTER_PRESENT: { @@ -173,16 +175,18 @@ get_filter( break; } - f->f_desc = NULL; - err = slap_bv2ad( &type, &f->f_desc, text ); + f.f_desc = NULL; + 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; + f.f_choice = SLAPD_FILTER_COMPUTED; + f.f_result = LDAP_COMPARE_FALSE; err = LDAP_SUCCESS; break; } + + assert( f.f_desc != NULL ); } break; case LDAP_FILTER_APPROX: @@ -192,11 +196,11 @@ get_filter( #else Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY_APPROX, text ); + err = get_ava( ber, &f.f_ava, SLAP_MR_EQUALITY_APPROX, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( f->f_ava != NULL ); + assert( f.f_ava != NULL ); break; case LDAP_FILTER_AND: @@ -206,13 +210,11 @@ get_filter( #else Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 ); #endif - err = get_filter_list( conn, ber, &f->f_and, text ); + err = get_filter_list( conn, ber, &f.f_and, text ); if ( err != LDAP_SUCCESS ) { break; } -#if XXX - assert( f->f_and != NULL ); -#endif + /* no assert - list could be empty */ break; case LDAP_FILTER_OR: @@ -222,13 +224,11 @@ get_filter( #else Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 ); #endif - err = get_filter_list( conn, ber, &f->f_or, text ); + err = get_filter_list( conn, ber, &f.f_or, text ); if ( err != LDAP_SUCCESS ) { break; } -#if XXX - assert( f->f_or != NULL ); -#endif + /* no assert - list could be empty */ break; case LDAP_FILTER_NOT: @@ -239,12 +239,13 @@ get_filter( Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 ); #endif (void) ber_skip_tag( ber, &len ); - err = get_filter( conn, ber, &f->f_not, text ); + err = get_filter( conn, ber, &f.f_not, text ); if ( err != LDAP_SUCCESS ) { break; } -#if XXX - assert( f->f_not != NULL ); + +#ifdef XXX + assert( f.f_not != NULL ); #endif break; @@ -256,13 +257,13 @@ get_filter( Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 ); #endif - err = get_mra( ber, &f->f_mra, text ); + err = get_mra( ber, &f.f_mra, text ); if ( err != LDAP_SUCCESS ) { break; } -#if nothosed - assert( f->f_mra != NULL ); +#ifdef XXX + assert( f.f_mra != NULL ); #endif break; @@ -271,30 +272,26 @@ get_filter( #ifdef NEW_LOGGING LDAP_LOG( FILTER, ERR, "get_filter: conn %d unknown filter type=%lu\n", - conn->c_connid, f->f_choice, 0 ); + conn->c_connid, f.f_choice, 0 ); #else Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n", - f->f_choice, 0, 0 ); + f.f_choice, 0, 0 ); #endif - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; + f.f_choice = SLAPD_FILTER_COMPUTED; + f.f_result = SLAPD_COMPARE_UNDEFINED; break; } - if ( err != LDAP_SUCCESS ) { - if( err != SLAPD_DISCONNECT ) { - /* ignore error */ - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; - err = LDAP_SUCCESS; - *filt = f; - - } else { - free(f); - } + if( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) { + /* ignore error */ + f.f_choice = SLAPD_FILTER_COMPUTED; + f.f_result = SLAPD_COMPARE_UNDEFINED; + err = LDAP_SUCCESS; + } - } else { - *filt = f; + if ( err == LDAP_SUCCESS ) { + *filt = ch_malloc( sizeof(f) ); + **filt = f; } #ifdef NEW_LOGGING @@ -303,6 +300,7 @@ get_filter( #else Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 ); #endif + return( err ); } @@ -324,7 +322,8 @@ get_filter_list( Connection *conn, BerElement *ber, Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 ); #endif new = f; - for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; + for ( tag = ber_first_element( ber, &len, &last ); + tag != LBER_DEFAULT; tag = ber_next_element( ber, &len, last ) ) { err = get_filter( conn, ber, new, text ); @@ -344,47 +343,48 @@ get_filter_list( Connection *conn, BerElement *ber, } static int -get_substring_filter( +get_ssa( Connection *conn, BerElement *ber, - Filter *f, + SubstringsAssertion **out, const char **text ) { ber_tag_t tag; ber_len_t len; ber_tag_t rc; - struct berval value; + struct berval desc, value, nvalue; char *last; - struct berval bv; + SubstringsAssertion ssa; + *text = "error decoding filter"; #ifdef NEW_LOGGING LDAP_LOG( FILTER, ENTRY, - "get_substring_filter: conn %d begin\n", conn->c_connid, 0, 0 ); + "get_ssa: conn %d begin\n", conn->c_connid, 0, 0 ); #else - Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_FILTER, "begin get_ssa\n", 0, 0, 0 ); #endif - if ( ber_scanf( ber, "{m" /*}*/, &bv ) == LBER_ERROR ) { + if ( ber_scanf( ber, "{m" /*}*/, &desc ) == LBER_ERROR ) { return SLAPD_DISCONNECT; } - f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) ); - f->f_sub_desc = NULL; - rc = slap_bv2ad( &bv, &f->f_sub_desc, text ); + *text = NULL; + + ssa.sa_desc = NULL; + ssa.sa_initial.bv_val = NULL; + ssa.sa_any = NULL; + ssa.sa_final.bv_val = NULL; + + rc = slap_bv2ad( &desc, &ssa.sa_desc, text ); if( rc != LDAP_SUCCESS ) { - text = NULL; - ch_free( f->f_sub ); - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; return LDAP_SUCCESS; } - f->f_sub_initial.bv_val = NULL; - f->f_sub_any = NULL; - f->f_sub_final.bv_val = NULL; + rc = LDAP_PROTOCOL_ERROR; - for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; + for ( tag = ber_first_element( ber, &len, &last ); + tag != LBER_DEFAULT; tag = ber_next_element( ber, &len, last ) ) { unsigned usage; @@ -425,92 +425,96 @@ get_substring_filter( " unknown substring choice=%ld\n", (long) tag, 0, 0 ); #endif + goto return_error; } #ifdef SLAP_NVALUES /* validate/normalize using equality matching rule validator! */ rc = asserted_value_validate_normalize( - f->f_sub_desc, f->f_sub_desc->ad_type->sat_equality, - usage, &value, &bv, text ); + ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality, + usage, &value, &nvalue, text ); + if( rc != LDAP_SUCCESS ) { goto return_error; } #else /* validate using equality matching rule validator! */ - rc = value_validate( f->f_sub_desc->ad_type->sat_equality, + rc = value_validate( ssa.sa_desc->ad_type->sat_equality, &value, text ); if( rc != LDAP_SUCCESS ) { goto return_error; } - rc = value_normalize( f->f_sub_desc, usage, - &value, &bv, text ); + rc = value_normalize( ssa.sa_desc, usage, + &value, &nvalue, text ); + if( rc != LDAP_SUCCESS ) { goto return_error; } #endif - value = bv; - rc = LDAP_PROTOCOL_ERROR; switch ( tag ) { case LDAP_SUBSTRING_INITIAL: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL1, - "get_substring_filter: conn %d INITIAL\n", conn->c_connid, 0, 0 ); + "get_ssa: conn %d INITIAL\n", + conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 ); #endif - if ( f->f_sub_initial.bv_val != NULL - || f->f_sub_any != NULL - || f->f_sub_final.bv_val != NULL ) + if ( ssa.sa_initial.bv_val != NULL + || ssa.sa_any != NULL + || ssa.sa_final.bv_val != NULL ) { - free( value.bv_val ); + free( nvalue.bv_val ); goto return_error; } - f->f_sub_initial = value; + ssa.sa_initial = nvalue; break; case LDAP_SUBSTRING_ANY: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL1, - "get_substring_filter: conn %d ANY\n", conn->c_connid, 0, 0 ); + "get_ssa: conn %d ANY\n", + conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); #endif - if ( f->f_sub_final.bv_val != NULL ) { - free( value.bv_val ); + if ( ssa.sa_final.bv_val != NULL ) { + free( nvalue.bv_val ); goto return_error; } - ber_bvarray_add( &f->f_sub_any, &value ); + ber_bvarray_add( &ssa.sa_any, &nvalue ); break; case LDAP_SUBSTRING_FINAL: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL1, - "get_substring_filter: conn %d FINAL\n", conn->c_connid, 0, 0 ); + "get_ssa: conn %d FINAL\n", + conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 ); #endif - if ( f->f_sub_final.bv_val != NULL ) { - free( value.bv_val ); + if ( ssa.sa_final.bv_val != NULL ) { + free( nvalue.bv_val ); goto return_error; } - f->f_sub_final = value; + ssa.sa_final = nvalue; break; default: #ifdef NEW_LOGGING LDAP_LOG( FILTER, INFO, - "get_substring_filter: conn %d unknown substring type %ld\n", + "get_ssa: conn %d unknown substring type %ld\n", conn->c_connid, (long)tag, 0 ); #else Debug( LDAP_DEBUG_FILTER, @@ -518,32 +522,40 @@ get_substring_filter( (long) tag, 0, 0 ); #endif - free( value.bv_val ); + assert( 0 ); + free( nvalue.bv_val ); return_error: #ifdef NEW_LOGGING LDAP_LOG( FILTER, INFO, - "get_substring_filter: conn %d error %ld\n", + "get_ssa: conn %d error %ld\n", conn->c_connid, (long)rc, 0 ); #else Debug( LDAP_DEBUG_FILTER, " error=%ld\n", (long) rc, 0, 0 ); #endif - free( f->f_sub_initial.bv_val ); - ber_bvarray_free( f->f_sub_any ); - free( f->f_sub_final.bv_val ); - ch_free( f->f_sub ); + free( ssa.sa_initial.bv_val ); + ber_bvarray_free( ssa.sa_any ); + free( ssa.sa_final.bv_val ); return rc; } + + rc = LDAP_SUCCESS; + } + + if( rc == LDAP_SUCCESS ) { + *out = ch_malloc( sizeof( ssa ) ); + **out = ssa; } #ifdef NEW_LOGGING LDAP_LOG( FILTER, ENTRY, - "get_substring_filter: conn %d exit\n", conn->c_connid, 0, 0 ); + "get_ssa: conn %d exit\n", conn->c_connid, 0, 0 ); #else - Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 ); #endif - return( LDAP_SUCCESS ); + + return LDAP_SUCCESS; } void @@ -847,7 +859,7 @@ get_simple_vrFilter( ber_tag_t tag; ber_len_t len; int err; - ValuesReturnFilter *vrf; + ValuesReturnFilter vrf; #ifdef NEW_LOGGING LDAP_LOG( FILTER, ENTRY, @@ -863,13 +875,12 @@ get_simple_vrFilter( return SLAPD_DISCONNECT; } - vrf = (ValuesReturnFilter *) ch_malloc( sizeof(ValuesReturnFilter) ); - vrf->vrf_next = NULL; + vrf.vrf_next = NULL; err = LDAP_SUCCESS; - vrf->vrf_choice = tag; + vrf.vrf_choice = tag; - switch ( vrf->vrf_choice ) { + switch ( vrf.vrf_choice ) { case LDAP_FILTER_EQUALITY: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL2, @@ -877,12 +888,12 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 ); #endif - err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_EQUALITY, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_EQUALITY, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( vrf->vrf_ava != NULL ); + assert( vrf.vrf_ava != NULL ); break; case LDAP_FILTER_SUBSTRINGS: @@ -892,7 +903,7 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 ); #endif - err = get_substring_filter( conn, ber, (Filter *)vrf, text ); + err = get_ssa( conn, ber, &vrf.vrf_sub, text ); break; case LDAP_FILTER_GE: @@ -902,7 +913,7 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -915,7 +926,7 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -936,13 +947,13 @@ get_simple_vrFilter( break; } - vrf->vrf_desc = NULL; - err = slap_bv2ad( &type, &vrf->vrf_desc, text ); + vrf.vrf_desc = NULL; + err = slap_bv2ad( &type, &vrf.vrf_desc, text ); if( err != LDAP_SUCCESS ) { /* unrecognized attribute description or other error */ - vrf->vrf_choice = SLAPD_FILTER_COMPUTED; - vrf->vrf_result = LDAP_COMPARE_FALSE; + vrf.vrf_choice = SLAPD_FILTER_COMPUTED; + vrf.vrf_result = LDAP_COMPARE_FALSE; err = LDAP_SUCCESS; break; } @@ -955,7 +966,7 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 ); #endif - err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_EQUALITY_APPROX, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_EQUALITY_APPROX, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -969,12 +980,12 @@ get_simple_vrFilter( Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 ); #endif - err = get_mra( ber, &vrf->vrf_mra, text ); + err = get_mra( ber, &vrf.vrf_mra, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( vrf->vrf_mra != NULL ); + assert( vrf.vrf_mra != NULL ); break; default: @@ -982,30 +993,26 @@ get_simple_vrFilter( #ifdef NEW_LOGGING LDAP_LOG( FILTER, ERR, "get_simple_vrFilter: conn %d unknown filter type=%lu\n", - conn->c_connid, vrf->vrf_choice, 0 ); + conn->c_connid, vrf.vrf_choice, 0 ); #else Debug( LDAP_DEBUG_ANY, "get_simple_vrFilter: unknown filter type=%lu\n", - vrf->vrf_choice, 0, 0 ); + vrf.vrf_choice, 0, 0 ); #endif - vrf->vrf_choice = SLAPD_FILTER_COMPUTED; - vrf->vrf_result = SLAPD_COMPARE_UNDEFINED; + vrf.vrf_choice = SLAPD_FILTER_COMPUTED; + vrf.vrf_result = SLAPD_COMPARE_UNDEFINED; break; } - if ( err != LDAP_SUCCESS ) { - if( err != SLAPD_DISCONNECT ) { - /* ignore error */ - vrf->vrf_choice = SLAPD_FILTER_COMPUTED; - vrf->vrf_result = SLAPD_COMPARE_UNDEFINED; - err = LDAP_SUCCESS; - *filt = vrf; - - } else { - free(vrf); - } + if ( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) { + /* ignore error */ + vrf.vrf_choice = SLAPD_FILTER_COMPUTED; + vrf.vrf_result = SLAPD_COMPARE_UNDEFINED; + err = LDAP_SUCCESS; + } - } else { - *filt = vrf; + if ( err == LDAP_SUCCESS ) { + *filt = ch_malloc( sizeof vrf ); + **filt = vrf; } #ifdef NEW_LOGGING @@ -1014,7 +1021,8 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "end get_simple_vrFilter %d\n", err, 0, 0 ); #endif - return( err ); + + return err; } int @@ -1081,8 +1089,9 @@ get_vrFilter( Connection *conn, BerElement *ber, tag = ber_next_element( ber, &len, last ) ) { int err = get_simple_vrFilter( conn, ber, n, text ); - if ( err != LDAP_SUCCESS ) - return( err ); + + if ( err != LDAP_SUCCESS ) return( err ); + n = &(*n)->vrf_next; } *n = NULL; @@ -1363,6 +1372,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) } } +#if 0 /* unused */ static int get_substring_vrFilter( Connection *conn, @@ -1566,4 +1576,4 @@ return_error: #endif return( LDAP_SUCCESS ); } - +#endif /* unused */