X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstr2filter.c;h=e0907a2534a07c43d3580cf0b394f387922f977c;hb=a26612bc00bacbc660fa4a26466f609a29a1d072;hp=f0e332b4c807f1a611a6929ba897cb0811e1dcb6;hpb=9fec1299971d03f0c1d0cd2462d530685e1c7861;p=openldap diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c index f0e332b4c8..e0907a2534 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-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -16,18 +16,24 @@ #include "slap.h" #include -static char *find_matching_paren(char *s); -static Filter *str2list(char *str, long unsigned int ftype); -static Filter *str2simple(char *str); -static int str2subvals(char *val, Filter *f); +static char *find_matching_paren( const char *s ); +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 ) { Filter *f = NULL; char *end, *freeme; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, + "str2filter: \"%s\"\n", str )); +#else Debug( LDAP_DEBUG_FILTER, "str2filter \"%s\"\n", str, 0, 0 ); +#endif + if ( str == NULL || *str == '\0' ) { return( NULL ); @@ -47,32 +53,56 @@ str2filter( char *str ) str++; switch ( *str ) { case '&': +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "str2filter: AND\n" )); +#else Debug( LDAP_DEBUG_FILTER, "str2filter: AND\n", 0, 0, 0 ); +#endif + str++; f = str2list( str, LDAP_FILTER_AND ); break; case '|': +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "str2filter: OR\n" )); +#else Debug( LDAP_DEBUG_FILTER, "put_filter: OR\n", 0, 0, 0 ); +#endif + str++; f = str2list( str, LDAP_FILTER_OR ); break; case '!': +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "str2filter: NOT\n" )); +#else Debug( LDAP_DEBUG_FILTER, "put_filter: NOT\n", 0, 0, 0 ); +#endif + str++; f = str2list( str, LDAP_FILTER_NOT ); break; default: +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "str2filter: simple\n" )); +#else Debug( LDAP_DEBUG_FILTER, "str2filter: simple\n", 0, 0, 0 ); +#endif + f = str2simple( str ); break; @@ -81,8 +111,14 @@ str2filter( char *str ) break; default: /* assume it's a simple type=value filter */ +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, + "str2filter: default\n" )); +#else Debug( LDAP_DEBUG_FILTER, "str2filter: default\n", 0, 0, 0 ); +#endif + f = str2simple( str ); break; @@ -97,14 +133,20 @@ str2filter( char *str ) */ static Filter * -str2list( char *str, unsigned long ftype ) +str2list( const char *str, unsigned long ftype ) { Filter *f; Filter **fp; char *next; char save; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, + "str2list: \"%s\"\n", str )); +#else Debug( LDAP_DEBUG_FILTER, "str2list \"%s\"\n", str, 0, 0 ); +#endif + f = (Filter *) ch_calloc( 1, sizeof(Filter) ); f->f_choice = ftype; @@ -140,19 +182,28 @@ str2list( char *str, unsigned long ftype ) } static Filter * -str2simple( char *str ) +str2simple( const char *str ) { Filter *f; char *s; char *value, savechar; + int rc; + const char *text; +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, + "str2simple: \"%s\"\n", str )); +#else Debug( LDAP_DEBUG_FILTER, "str2simple \"%s\"\n", str, 0, 0 ); +#endif + if ( (s = strchr( str, '=' )) == NULL ) { return( NULL ); } - value = s + 1; - *s-- = '\0'; + value = &s[1]; + + *s-- = '\0'; /* we shouldn't be mucking with str */ savechar = *s; f = (Filter *) ch_calloc( 1, sizeof(Filter) ); @@ -170,6 +221,12 @@ str2simple( char *str ) f->f_choice = LDAP_FILTER_APPROX; *s = '\0'; break; + case ':': + f->f_choice = LDAP_FILTER_EXT; + *s = '\0'; + return NULL; + break; + default: if ( ldap_pvt_find_wildcard( value ) == NULL ) { f->f_choice = LDAP_FILTER_EQUALITY; @@ -177,7 +234,13 @@ str2simple( char *str ) f->f_choice = LDAP_FILTER_PRESENT; } else { f->f_choice = LDAP_FILTER_SUBSTRINGS; - f->f_sub_type = ch_strdup( str ); + f->f_sub = ch_calloc( 1, sizeof( SubstringsAssertion ) ); + rc = slap_str2ad( str, &f->f_sub_desc, &text ); + if( rc != LDAP_SUCCESS ) { + filter_free( f ); + *(value-1) = '='; + return NULL; + } if ( str2subvals( value, f ) != 0 ) { filter_free( f ); *(value-1) = '='; @@ -190,30 +253,52 @@ str2simple( char *str ) } if ( f->f_choice == LDAP_FILTER_PRESENT ) { - f->f_type = ch_strdup( str ); + rc = slap_str2ad( str, &f->f_desc, &text ); + if( rc != LDAP_SUCCESS ) { + filter_free( f ); + *(value-1) = '='; + return NULL; + } } 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 ); + char *tmp; + + f->f_ava = ch_calloc( 1, sizeof( AttributeAssertion ) ); + f->f_av_desc = NULL; + rc = slap_str2ad( str, &f->f_av_desc, &text ); + if( rc != LDAP_SUCCESS ) { + filter_free( f ); + *(value-1) = '='; + return NULL; + } + + tmp = ch_strdup( value ); + ldap_pvt_filter_value_unescape( tmp ); + f->f_av_value = ber_bvstr( tmp ); } *s = savechar; *(value-1) = '='; + return( f ); } static int -str2subvals( char *val, Filter *f ) +str2subvals( const char *in, Filter *f ) { - char *nextstar, *freeme; + char *nextstar, *val, *freeme; int gotstar; - Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", val, 0, 0 ); +#ifdef NEW_LOGGING + LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, + "str2subvals: \"%s\"\n", in )); +#else + Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", in, 0, 0 ); +#endif + - if( val == NULL ) return 0; + if( in == NULL ) return 0; - val = freeme = ch_strdup( val ); + val = freeme = ch_strdup( in ); gotstar = 0; while ( *val ) { @@ -246,7 +331,7 @@ str2subvals( char *val, Filter *f ) */ static char * -find_matching_paren( char *s ) +find_matching_paren( const char *s ) { int balance, escape; @@ -260,7 +345,7 @@ find_matching_paren( char *s ) balance--; } if ( balance == 0 ) { - return( s ); + return (char *) s; } if ( *s == '\\' && ! escape ) escape = 1; @@ -268,5 +353,5 @@ find_matching_paren( char *s ) escape = 0; } - return( NULL ); + return NULL; }