X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstr2filter.c;h=04667cc345b73f4efdf15806ec5b8ea51c950952;hb=9b4bf8a973c8cfea809be9a4b658f785a6b16f2f;hp=60ced1aee2f67f238d3cddf0482e8d7ade3db0e2;hpb=2a869f5a99f537b246ba8640502e2a86117cb6e8;p=openldap diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c index 60ced1aee2..04667cc345 100644 --- a/servers/slapd/str2filter.c +++ b/servers/slapd/str2filter.c @@ -1,253 +1,63 @@ /* str2filter.c - parse an rfc 1588 string filter */ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ #include "portable.h" #include #include +#include #include #include "slap.h" +#include -static char *find_matching_paren(); -static Filter *str2list(); -static Filter *str2simple(); -static int str2subvals(); +#if 0 /* unused */ +static char *find_matching_paren( const char *s ); +#endif /* unused */ +static Filter *str2list( const char *str, long unsigned int ftype); +static Filter *str2simple( const char *str); +static int str2subvals( const char *val, Filter *f); Filter * -str2filter( char *str ) +str2filter( const char *str ) { + int rc; Filter *f = NULL; - char *end; - + char berbuf[256]; + BerElement *ber = (BerElement *)berbuf; + 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 ); - } - - switch ( *str ) { - case '(': - if ( (end = find_matching_paren( str )) == NULL ) { - filter_free( f ); - 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; - } - - return( f ); -} - -/* - * Put a list of filters like this "(filter1)(filter2)..." - */ - -static Filter * -str2list( 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( *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; - } - *fp = NULL; - - return( f ); -} - -static Filter * -str2simple( 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 ); - } - value = s + 1; - *s-- = '\0'; - savechar = *s; - - f = (Filter *) ch_calloc( 1, sizeof(Filter) ); - - 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; - default: - if ( strchr( 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; - f->f_sub_type = strdup( str ); - if ( str2subvals( value, f ) != 0 ) { - filter_free( f ); - *(value-1) = '='; - return( NULL ); - } - *(value-1) = '='; - return( f ); - } - break; + return NULL; } - if ( f->f_choice == LDAP_FILTER_PRESENT ) { - f->f_type = strdup( str ); - } else { - f->f_avtype = strdup( str ); - f->f_avvalue.bv_val = strdup( value ); - f->f_avvalue.bv_len = strlen( value ); - } - - *s = savechar; - *(value-1) = '='; - return( f ); -} - -static int -str2subvals( char *val, Filter *f ) -{ - char *nextstar; - int gotstar; - - Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", val, 0, 0 ); - - gotstar = 0; - while ( val != NULL && *val ) { - if ( (nextstar = strchr( val, '*' )) != NULL ) - *nextstar++ = '\0'; + ber_init2( ber, NULL, LBER_USE_DER ); - if ( gotstar == 0 ) { - f->f_sub_initial = strdup( val ); - } else if ( nextstar == NULL ) { - f->f_sub_final = strdup( val ); - } else { - charray_add( &f->f_sub_any, strdup( val ) ); - } - - gotstar = 1; - if ( nextstar != NULL ) - *(nextstar-1) = '*'; - val = nextstar; + rc = ldap_pvt_put_filter( ber, str ); + if( rc < 0 ) { + goto done; } - return( 0 ); -} + ber_reset( ber, 1 ); -/* - * find_matching_paren - return a pointer to the right paren in s matching - * the left paren to which *s currently points - */ + conn.c_connid = 0; -static char * -find_matching_paren( char *s ) -{ - int balance, escape; + rc = get_filter( &conn, ber, &f, &text ); - balance = 0; - escape = 0; - for ( ; *s; s++ ) { - if ( escape == 0 ) { - if ( *s == '(' ) - balance++; - else if ( *s == ')' ) - balance--; - } - if ( balance == 0 ) { - return( s ); - } - if ( *s == '\\' && ! escape ) - escape = 1; - else - escape = 0; - } +done: + ber_free_buf( ber ); - return( NULL ); + return f; }