servers/slapd/filter.c - diff

Return to filter.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/filter.c between versions 1.125 and 1.125.2.12

version 1.125, 2004/11/25 21:59:01	version 1.125.2.12, 2007/10/05 06:36:24
Line 1	Line 1
/* filter.c - routines for parsing and dealing with filters */	/* filter.c - routines for parsing and dealing with filters */
/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.124 2004/09/04 02:54:30 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.125.2.11 2007/10/05 06:25:15 ando Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2004 The OpenLDAP Foundation.	* Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
Line 32	Line 32
#include <ac/string.h>	#include <ac/string.h>

#include "slap.h"	#include "slap.h"
	#include "lutil.h"

static int get_filter_list(	static int get_filter_list(
Operation *op,	Operation *op,
Line 45 static int get_ssa(	Line 46 static int get_ssa(
SubstringsAssertion **s,	SubstringsAssertion **s,
const char **text );	const char **text );

static int filter_escape_value_x(
struct berval *in,
struct berval *out,
void *ctx );

static void simple_vrFilter2bv(	static void simple_vrFilter2bv(
Operation *op,	Operation *op,
ValuesReturnFilter *f,	ValuesReturnFilter *f,
Line 171 get_filter(	Line 167 get_filter(
err = slap_bv2ad( &type, &f.f_desc, text );	err = slap_bv2ad( &type, &f.f_desc, text );

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */	err = slap_bv2undef_ad( &type, &f.f_desc, text,
Debug( LDAP_DEBUG_ANY,	SLAP_AD_PROXIED\|SLAP_AD_NOINSERT );
"get_filter: conn %d unknown attribute "
"type=%s (%d)\n",
op->o_connid, type.bv_val, err );

f.f_choice = SLAPD_FILTER_COMPUTED;	if ( err != LDAP_SUCCESS ) {
f.f_result = LDAP_COMPARE_FALSE;	/* unrecognized attribute description or other error */
err = LDAP_SUCCESS;	Debug( LDAP_DEBUG_ANY,
*text = NULL;	"get_filter: conn %lu unknown attribute "
break;	"type=%s (%d)\n",
	op->o_connid, type.bv_val, err );

	f.f_choice = SLAPD_FILTER_COMPUTED;
	f.f_result = LDAP_COMPARE_FALSE;
	err = LDAP_SUCCESS;
	*text = NULL;
	break;
	}
}	}

assert( f.f_desc != NULL );	assert( f.f_desc != NULL );
Line 348 get_ssa(	Line 349 get_ssa(
rc = slap_bv2ad( &desc, &ssa.sa_desc, text );	rc = slap_bv2ad( &desc, &ssa.sa_desc, text );

if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,	rc = slap_bv2undef_ad( &desc, &ssa.sa_desc, text,
"get_ssa: conn %d unknown attribute type=%s (%d)\n",	SLAP_AD_PROXIED\|SLAP_AD_NOINSERT );
op->o_connid, desc.bv_val, rc );
	if( rc != LDAP_SUCCESS ) {
/* skip over the rest of this filter */	Debug( LDAP_DEBUG_ANY,
for ( tag = ber_first_element( ber, &len, &last );	"get_ssa: conn %lu unknown attribute type=%s (%ld)\n",
tag != LBER_DEFAULT;	op->o_connid, desc.bv_val, (long) rc );
tag = ber_next_element( ber, &len, last ) ) {
ber_scanf( ber, "x" );	/* skip over the rest of this filter */
	for ( tag = ber_first_element( ber, &len, &last );
	tag != LBER_DEFAULT;
	tag = ber_next_element( ber, &len, last ) ) {
	ber_scanf( ber, "x" );
	}
	return rc;
}	}
return rc;
}	}

rc = LDAP_PROTOCOL_ERROR;	rc = LDAP_PROTOCOL_ERROR;
Line 382 get_ssa(	Line 388 get_ssa(

switch ( tag ) {	switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:	case LDAP_SUBSTRING_INITIAL:
	if ( ssa.sa_initial.bv_val != NULL
	\|\| ssa.sa_any != NULL
	\|\| ssa.sa_final.bv_val != NULL )
	{
	rc = LDAP_PROTOCOL_ERROR;
	goto return_error;
	}
usage = SLAP_MR_SUBSTR_INITIAL;	usage = SLAP_MR_SUBSTR_INITIAL;
break;	break;

case LDAP_SUBSTRING_ANY:	case LDAP_SUBSTRING_ANY:
	if ( ssa.sa_final.bv_val != NULL ) {
	rc = LDAP_PROTOCOL_ERROR;
	goto return_error;
	}
usage = SLAP_MR_SUBSTR_ANY;	usage = SLAP_MR_SUBSTR_ANY;
break;	break;

case LDAP_SUBSTRING_FINAL:	case LDAP_SUBSTRING_FINAL:
	if ( ssa.sa_final.bv_val != NULL ) {
	rc = LDAP_PROTOCOL_ERROR;
	goto return_error;
	}

usage = SLAP_MR_SUBSTR_FINAL;	usage = SLAP_MR_SUBSTR_FINAL;
break;	break;

default:	default:
rc = LDAP_PROTOCOL_ERROR;

Debug( LDAP_DEBUG_FILTER,	Debug( LDAP_DEBUG_FILTER,
" unknown substring choice=%ld\n",	" unknown substring choice=%ld\n",
(long) tag, 0, 0 );	(long) tag, 0, 0 );

	rc = LDAP_PROTOCOL_ERROR;
goto return_error;	goto return_error;
}	}

Line 407 get_ssa(	Line 428 get_ssa(
rc = asserted_value_validate_normalize(	rc = asserted_value_validate_normalize(
ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,	ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,
usage, &value, &nvalue, text, op->o_tmpmemctx );	usage, &value, &nvalue, text, op->o_tmpmemctx );
	if( rc != LDAP_SUCCESS ) goto return_error;
if( rc != LDAP_SUCCESS ) {
goto return_error;
}

rc = LDAP_PROTOCOL_ERROR;

switch ( tag ) {	switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:	case LDAP_SUBSTRING_INITIAL:
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );

if ( ssa.sa_initial.bv_val != NULL
\|\| ssa.sa_any != NULL
\|\| ssa.sa_final.bv_val != NULL )
{
slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}

ssa.sa_initial = nvalue;	ssa.sa_initial = nvalue;
break;	break;

case LDAP_SUBSTRING_ANY:	case LDAP_SUBSTRING_ANY:
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );

if ( ssa.sa_final.bv_val != NULL ) {
slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}

ber_bvarray_add_x( &ssa.sa_any, &nvalue, op->o_tmpmemctx );	ber_bvarray_add_x( &ssa.sa_any, &nvalue, op->o_tmpmemctx );
break;	break;

case LDAP_SUBSTRING_FINAL:	case LDAP_SUBSTRING_FINAL:
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );

if ( ssa.sa_final.bv_val != NULL ) {
slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}

ssa.sa_final = nvalue;	ssa.sa_final = nvalue;
break;	break;

default:	default:
Debug( LDAP_DEBUG_FILTER,
" unknown substring type=%ld\n",
(long) tag, 0, 0 );

assert( 0 );	assert( 0 );
slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );	slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
	rc = LDAP_PROTOCOL_ERROR;

return_error:	return_error:
Debug( LDAP_DEBUG_FILTER, " error=%ld\n",	Debug( LDAP_DEBUG_FILTER, " error=%ld\n",
Line 477 return_error:	Line 469 return_error:
}	}

Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );

return rc /* LDAP_SUCCESS */ ;	return rc /* LDAP_SUCCESS */ ;
}	}

Line 571 filter2bv_x( Operation op, Filter f, s	Line 562 filter2bv_x( Operation op, Filter f, s

switch ( f->f_choice ) {	switch ( f->f_choice ) {
case LDAP_FILTER_EQUALITY:	case LDAP_FILTER_EQUALITY:
filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );	if ( f->f_av_desc->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {
	tmp.bv_val = op->o_tmpalloc( LDAP_LUTIL_UUIDSTR_BUFSIZE, op->o_tmpmemctx );
	tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,
	f->f_av_value.bv_len, tmp.bv_val, LDAP_LUTIL_UUIDSTR_BUFSIZE );
	assert( tmp.bv_len > 0 );
	} else {
	filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
	}

fstr->bv_len = f->f_av_desc->ad_cname.bv_len +	fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(=)") - 1 );	tmp.bv_len + ( sizeof("(=)") - 1 );
Line 579 filter2bv_x( Operation op, Filter f, s	Line 577 filter2bv_x( Operation op, Filter f, s

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
f->f_av_desc->ad_cname.bv_val,	f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");

ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;
Line 593 filter2bv_x( Operation op, Filter f, s	Line 591 filter2bv_x( Operation op, Filter f, s

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
f->f_av_desc->ad_cname.bv_val,	f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");

ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;
Line 607 filter2bv_x( Operation op, Filter f, s	Line 605 filter2bv_x( Operation op, Filter f, s

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
f->f_av_desc->ad_cname.bv_val,	f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");

ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;
Line 621 filter2bv_x( Operation op, Filter f, s	Line 619 filter2bv_x( Operation op, Filter f, s

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
f->f_av_desc->ad_cname.bv_val,	f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

Line 644 filter2bv_x( Operation op, Filter f, s	Line 642 filter2bv_x( Operation op, Filter f, s

snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,
/* "(attr=" / "%s)",	/* "(attr=" / "%s)",
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");

ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}
Line 661 filter2bv_x( Operation op, Filter f, s	Line 659 filter2bv_x( Operation op, Filter f, s

snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init][any]" / "%s)",	/* "(attr=[init][any]" / "%s)",
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}
}	}
Line 677 filter2bv_x( Operation op, Filter f, s	Line 675 filter2bv_x( Operation op, Filter f, s

snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init][any]" */ "%s)",	/* "(attr=[init][any]" */ "%s)",
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");

ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}
Line 742 filter2bv_x( Operation op, Filter f, s	Line 740 filter2bv_x( Operation op, Filter f, s
f->f_mr_dnattrs ? ":dn" : "",	f->f_mr_dnattrs ? ":dn" : "",
f->f_mr_rule_text.bv_len ? ":" : "",	f->f_mr_rule_text.bv_len ? ":" : "",
f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",	f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
} break;	} break;

Line 787 filter2bv( Filter f, struct berval fst	Line 785 filter2bv( Filter f, struct berval fst
filter2bv_x( &op, f, fstr );	filter2bv_x( &op, f, fstr );
}	}

static int	Filter *
filter_escape_value_x(	filter_dup( Filter f, void memctx )
struct berval *in,
struct berval *out,
void *ctx )
{	{
ber_len_t i;	BerMemoryFunctions *mf = &slap_sl_mfuncs;
assert( in );	Filter *n;
assert( out );

i = in->bv_len * 3 + 1;
out->bv_val = ctx ? slap_sl_malloc( i, ctx ) : ch_malloc( i );
out->bv_len = 0;

for( i=0; i < in->bv_len ; i++ ) {
if( FILTER_ESCAPE(in->bv_val[i]) ) {
out->bv_val[out->bv_len++] = SLAP_ESCAPE_CHAR;
out->bv_val[out->bv_len++] = SLAP_ESCAPE_HI( in->bv_val[i] );
out->bv_val[out->bv_len++] = SLAP_ESCAPE_LO( in->bv_val[i] );
} else {
out->bv_val[out->bv_len++] = in->bv_val[i];
}
}

out->bv_val[out->bv_len] = '\0';	if ( !f )
return LDAP_SUCCESS;	return NULL;
}

int	n = mf->bmf_malloc( sizeof(Filter), memctx );
filter_escape_value(	n->f_choice = f->f_choice;
struct berval *in,	n->f_next = NULL;
struct berval *out )
{	switch( f->f_choice ) {
return filter_escape_value_x( in, out, NULL );	case SLAPD_FILTER_COMPUTED:
	n->f_result = f->f_result;
	break;
	case LDAP_FILTER_PRESENT:
	n->f_desc = f->f_desc;
	break;
	case LDAP_FILTER_EQUALITY:
	case LDAP_FILTER_GE:
	case LDAP_FILTER_LE:
	case LDAP_FILTER_APPROX:
	/* Should this be ava_dup() ? */
	n->f_ava = mf->bmf_calloc( 1, sizeof(AttributeAssertion), memctx );
	n->f_ava = f->f_ava;
	ber_dupbv_x( &n->f_av_value, &f->f_av_value, memctx );
	break;
	case LDAP_FILTER_SUBSTRINGS:
	n->f_sub = mf->bmf_calloc( 1, sizeof(SubstringsAssertion), memctx );
	n->f_sub_desc = f->f_sub_desc;
	if ( !BER_BVISNULL( &f->f_sub_initial ))
	ber_dupbv_x( &n->f_sub_initial, &f->f_sub_initial, memctx );
	if ( f->f_sub_any ) {
	int i;
	for ( i = 0; !BER_BVISNULL( &f->f_sub_any[i] ); i++ );
	n->f_sub_any = mf->bmf_malloc(( i+1 )*sizeof( struct berval ),
	memctx );
	for ( i = 0; !BER_BVISNULL( &f->f_sub_any[i] ); i++ ) {
	ber_dupbv_x( &n->f_sub_any[i], &f->f_sub_any[i], memctx );
	}
	BER_BVZERO( &n->f_sub_any[i] );
	}
	if ( !BER_BVISNULL( &f->f_sub_final ))
	ber_dupbv_x( &n->f_sub_final, &f->f_sub_final, memctx );
	break;
	case LDAP_FILTER_EXT: {
	/* Should this be mra_dup() ? */
	ber_len_t length;
	length = sizeof(MatchingRuleAssertion);
	if ( !BER_BVISNULL( &f->f_mr_rule_text ))
	length += f->f_mr_rule_text.bv_len + 1;
	n->f_mra = mf->bmf_calloc( 1, length, memctx );
	n->f_mra = f->f_mra;
	ber_dupbv_x( &n->f_mr_value, &f->f_mr_value, memctx );
	if ( !BER_BVISNULL( &f->f_mr_rule_text )) {
	n->f_mr_rule_text.bv_val = (char *)(n->f_mra+1);
	AC_MEMCPY(n->f_mr_rule_text.bv_val,
	f->f_mr_rule_text.bv_val, f->f_mr_rule_text.bv_len );
	}
	} break;
	case LDAP_FILTER_AND:
	case LDAP_FILTER_OR:
	case LDAP_FILTER_NOT: {
	Filter **p;
	for ( p = &n->f_list, f = f->f_list; f; f = f->f_next ) {
	*p = filter_dup( f, memctx );
	p = &(*p)->f_next;
	}
	} break;
	}
	return n;
}	}

static int	static int
Line 895 get_simple_vrFilter(	Line 932 get_simple_vrFilter(
err = slap_bv2ad( &type, &vrf.vrf_desc, text );	err = slap_bv2ad( &type, &vrf.vrf_desc, text );

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */	err = slap_bv2undef_ad( &type, &vrf.vrf_desc, text,
Debug( LDAP_DEBUG_ANY,	SLAP_AD_PROXIED\|SLAP_AD_NOINSERT );
"get_simple_vrFilter: conn %d unknown "
"attribute type=%s (%d)\n",	if( err != LDAP_SUCCESS ) {
op->o_connid, type.bv_val, err );	/* unrecognized attribute description or other error */
	Debug( LDAP_DEBUG_ANY,
vrf.vrf_choice = SLAPD_FILTER_COMPUTED;	"get_simple_vrFilter: conn %lu unknown "
vrf.vrf_result = LDAP_COMPARE_FALSE;	"attribute type=%s (%d)\n",
err = LDAP_SUCCESS;	op->o_connid, type.bv_val, err );
break;
	vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
	vrf.vrf_result = LDAP_COMPARE_FALSE;
	err = LDAP_SUCCESS;
	break;
	}
}	}
} break;	} break;

Line 944 get_simple_vrFilter(	Line 986 get_simple_vrFilter(
}	}

if ( err == LDAP_SUCCESS ) {	if ( err == LDAP_SUCCESS ) {
*filt = ch_malloc( sizeof vrf );	*filt = op->o_tmpalloc( sizeof vrf, op->o_tmpmemctx );
**filt = vrf;	**filt = vrf;
}	}

Removed from v.1.125
changed lines
	Added in v.1.125.2.12