X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstr2filter.c;h=ff7cd450adfc7eea72d5e479af5fd74831697131;hb=ecfb311f8f2b4f8b8e74c0ee88b8ef572e792c99;hp=ebc26fe4995771aeb5caaf7642d706c87b6eb526;hpb=4bc786f34b50aa301be6f5600f58a980070f481e;p=openldap diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c index ebc26fe499..ff7cd450ad 100644 --- a/servers/slapd/str2filter.c +++ b/servers/slapd/str2filter.c @@ -1,7 +1,7 @@ /* str2filter.c - parse an rfc 1588 string filter */ /* $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 */ @@ -24,258 +24,53 @@ static int str2subvals( const char *val, Filter *f); Filter * str2filter( const char *str ) { + int rc; Filter *f = NULL; - char *end, *freeme; - + BerElement *ber; + char berbuf[256]; + struct berval *bv = NULL; + Connection conn; + const char *text = NULL; + +#ifdef NEW_LOGGING + LDAP_LOG( FILTER, ENTRY, "str2filter: \"%s\"\n", str, 0, 0 ); +#else Debug( LDAP_DEBUG_FILTER, "str2filter \"%s\"\n", str, 0, 0 ); +#endif if ( str == NULL || *str == '\0' ) { - return( NULL ); + return NULL; } - str = freeme = ch_strdup( str ); - - switch ( *str ) { - case '(': - if ( (end = find_matching_paren( str )) == NULL ) { - filter_free( f ); - free( freeme ); - return( NULL ); - } - *end = '\0'; - - str++; - switch ( *str ) { - case '&': - Debug( LDAP_DEBUG_FILTER, "str2filter: AND\n", - 0, 0, 0 ); - - str++; - f = str2list( str, LDAP_FILTER_AND ); - break; - - case '|': - Debug( LDAP_DEBUG_FILTER, "put_filter: OR\n", - 0, 0, 0 ); - - str++; - f = str2list( str, LDAP_FILTER_OR ); - break; - - case '!': - Debug( LDAP_DEBUG_FILTER, "put_filter: NOT\n", - 0, 0, 0 ); - - str++; - f = str2list( str, LDAP_FILTER_NOT ); - break; - - default: - Debug( LDAP_DEBUG_FILTER, "str2filter: simple\n", - 0, 0, 0 ); - - f = str2simple( str ); - break; - } - *end = ')'; - break; - - default: /* assume it's a simple type=value filter */ - Debug( LDAP_DEBUG_FILTER, "str2filter: default\n", 0, 0, - 0 ); - - f = str2simple( str ); - break; + ber = ber_alloc_t( LBER_USE_DER ); + if( ber == NULL ) { + return NULL; } - free( freeme ); - return( f ); -} - -/* - * Put a list of filters like this "(filter1)(filter2)..." - */ - -static Filter * -str2list( const char *str, unsigned long ftype ) -{ - Filter *f; - Filter **fp; - char *next; - char save; - - Debug( LDAP_DEBUG_FILTER, "str2list \"%s\"\n", str, 0, 0 ); - - f = (Filter *) ch_calloc( 1, sizeof(Filter) ); - f->f_choice = ftype; - fp = &f->f_list; - - while ( *str ) { - while ( *str && isspace( (unsigned char) *str ) ) - str++; - if ( *str == '\0' ) - break; - - if ( (next = find_matching_paren( str )) == NULL ) { - filter_free( f ); - return( NULL ); - } - save = *++next; - *next = '\0'; - - /* now we have "(filter)" with str pointing to it */ - if ( (*fp = str2filter( str )) == NULL ) { - filter_free( f ); - *next = save; - return( NULL ); - } - *next = save; - - str = next; - fp = &(*fp)->f_next; + rc = ldap_pvt_put_filter( ber, str ); + if( rc < 0 ) { + goto done; } - *fp = NULL; - return( f ); -} - -static Filter * -str2simple( const char *str ) -{ - Filter *f; - char *s; - char *value, savechar; - - Debug( LDAP_DEBUG_FILTER, "str2simple \"%s\"\n", str, 0, 0 ); - - if ( (s = strchr( str, '=' )) == NULL ) { - return( NULL ); + rc = ber_flatten( ber, &bv ); + if( rc < 0 ) { + goto done; } - value = &s[1]; - *s-- = '\0'; - savechar = *s; - f = (Filter *) ch_calloc( 1, sizeof(Filter) ); + ber_free( ber, 0 ); - switch ( *s ) { - case '<': - f->f_choice = LDAP_FILTER_LE; - *s = '\0'; - break; - case '>': - f->f_choice = LDAP_FILTER_GE; - *s = '\0'; - break; - case '~': - f->f_choice = LDAP_FILTER_APPROX; - *s = '\0'; - break; - case ':': - f->f_choice = LDAP_FILTER_EXT; - *s = '\0'; - break; + ber = (BerElement *)berbuf; + ber_init2( ber, bv, 0 ); - default: - if ( ldap_pvt_find_wildcard( value ) == NULL ) { - f->f_choice = LDAP_FILTER_EQUALITY; - } else if ( strcmp( value, "*" ) == 0 ) { - f->f_choice = LDAP_FILTER_PRESENT; - } else { - f->f_choice = LDAP_FILTER_SUBSTRINGS; -#ifndef SLAPD_SCHEMA_NOT_COMPAT - f->f_sub_type = ch_strdup( str ); - if ( str2subvals( value, f ) != 0 ) { - filter_free( f ); - *(value-1) = '='; - return( NULL ); - } - *(value-1) = '='; - return( f ); -#endif - } - break; - } + conn.c_connid = 0; -#ifndef SLAPD_SCHEMA_NOT_COMPAT - if ( f->f_choice == LDAP_FILTER_PRESENT ) { - f->f_type = ch_strdup( str ); - } else { - f->f_avtype = ch_strdup( str ); - f->f_avvalue.bv_val = ch_strdup( value ); - ldap_pvt_filter_value_unescape( f->f_avvalue.bv_val ); - f->f_avvalue.bv_len = strlen( value ); + rc = get_filter( &conn, ber, &f, &text ); + if( rc ) { + goto done; } - *s = savechar; - *(value-1) = '='; -#endif - return( f ); -} - -static int -str2subvals( const char *in, Filter *f ) -{ - char *nextstar, *val, *freeme; - int gotstar; - - Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", in, 0, 0 ); - - if( in == NULL ) return 0; - - val = freeme = ch_strdup( in ); - gotstar = 0; - - while ( *val ) { - if ( (nextstar = ldap_pvt_find_wildcard( val )) != NULL ) - *nextstar++ = '\0'; - - ldap_pvt_filter_value_unescape( val ); - - if ( gotstar == 0 ) { - f->f_sub_initial = ber_bvstrdup( val ); - - } else if ( nextstar == NULL ) { - f->f_sub_final = ber_bvstrdup( val ); - - } else { - charray_add( (char ***) &f->f_sub_any, (char *) ber_bvstrdup( val ) ); - } - - gotstar = 1; - val = nextstar; - } - - free( freeme ); - return( 0 ); -} - -/* - * find_matching_paren - return a pointer to the right paren in s matching - * the left paren to which *s currently points - */ - -static char * -find_matching_paren( const char *s ) -{ - int balance, escape; - - balance = 0; - escape = 0; - for ( ; *s; s++ ) { - if ( escape == 0 ) { - if ( *s == '(' ) - balance++; - else if ( *s == ')' ) - balance--; - } - if ( balance == 0 ) { - return (char *) s; - } - if ( *s == '\\' && ! escape ) - escape = 1; - else - escape = 0; - } +done: + ber_bvfree( bv ); - return NULL; + return f; }