X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilterentry.c;h=29dbb0886f0c3276f49b6ffc50679d568f868a76;hb=ae63be3894c799771d0ccabec1e376c7478cd263;hp=c1abb4555d4b7a2b5d9be305671e0828fd9e664b;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index c1abb4555d..29dbb0886f 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -1,7 +1,7 @@
 /* filterentry.c - apply a filter to an entry */
 /* $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
  */
 
@@ -11,21 +11,37 @@
 
 #include <ac/socket.h>
 #include <ac/string.h>
-#include <ac/regex.h>
+
 
 #include "slap.h"
 
-static int	test_filter_list(Backend *be, Connection *conn, Operation *op, Entry *e, Filter *flist, int ftype);
-static int	test_substring_filter(Backend *be, Connection *conn, Operation *op, Entry *e, Filter *f);
-static int	test_ava_filter(Backend *be, Connection *conn, Operation *op, Entry *e, Ava *ava, int type);
-static int	test_approx_filter(Backend *be, Connection *conn, Operation *op, Entry *e, Ava *ava);
-static int	test_presence_filter(Backend *be, Connection *conn, Operation *op, Entry *e, char *type);
+static int	test_filter_and( Backend *be,
+	Connection *conn, Operation *op,
+	Entry *e, Filter *flist );
+static int	test_filter_or( Backend *be,
+	Connection *conn, Operation *op,
+	Entry *e, Filter *flist );
+static int	test_substrings_filter( Backend *be,
+	Connection *conn, Operation *op,
+	Entry *e, Filter *f);
+static int	test_ava_filter( Backend *be,
+	Connection *conn, Operation *op,
+	Entry *e, AttributeAssertion *ava, int type );
+static int	test_mra_filter( Backend *be,
+	Connection *conn, Operation *op,
+	Entry *e, MatchingRuleAssertion *mra );
+static int	test_presence_filter( Backend *be,
+	Connection *conn, Operation *op,
+	Entry *e, AttributeDescription *desc );
+
 
 /*
  * test_filter - test a filter against a single entry.
- * returns	0	filter matched
- *		-1	filter did not match
- *		>0	an ldap error code
+ * returns:
+ *		LDAP_COMPARE_TRUE		filter matched
+ *		LDAP_COMPARE_FALSE		filter did not match
+ *		SLAPD_COMPARE_UNDEFINED	filter is undefined
+ *	or an ldap result code indicating error
  */
 
 int
@@ -42,277 +58,259 @@ test_filter(
 	Debug( LDAP_DEBUG_FILTER, "=> test_filter\n", 0, 0, 0 );
 
 	switch ( f->f_choice ) {
+	case SLAPD_FILTER_COMPUTED:
+		Debug( LDAP_DEBUG_FILTER, "    COMPUTED %s (%d)\n",
+			f->f_result == LDAP_COMPARE_FALSE ? "false" :
+			f->f_result == LDAP_COMPARE_TRUE ? "true" :
+			f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" : "error",
+			f->f_result, 0 );
+		rc = f->f_result;
+		break;
+
 	case LDAP_FILTER_EQUALITY:
 		Debug( LDAP_DEBUG_FILTER, "    EQUALITY\n", 0, 0, 0 );
-		rc = test_ava_filter( be, conn, op, e, &f->f_ava,
+		rc = test_ava_filter( be, conn, op, e, f->f_ava,
 		    LDAP_FILTER_EQUALITY );
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
 		Debug( LDAP_DEBUG_FILTER, "    SUBSTRINGS\n", 0, 0, 0 );
-		rc = test_substring_filter( be, conn, op, e, f );
+		rc = test_substrings_filter( be, conn, op, e, f );
 		break;
 
 	case LDAP_FILTER_GE:
-		Debug( LDAP_DEBUG_FILTER, "    GE\n", 0, 0, 0 );
-		rc = test_ava_filter( be, conn, op, e, &f->f_ava,
+		rc = test_ava_filter( be, conn, op, e, f->f_ava,
 		    LDAP_FILTER_GE );
 		break;
 
 	case LDAP_FILTER_LE:
-		Debug( LDAP_DEBUG_FILTER, "    LE\n", 0, 0, 0 );
-		rc = test_ava_filter( be, conn, op, e, &f->f_ava,
+		rc = test_ava_filter( be, conn, op, e, f->f_ava,
 		    LDAP_FILTER_LE );
 		break;
 
 	case LDAP_FILTER_PRESENT:
 		Debug( LDAP_DEBUG_FILTER, "    PRESENT\n", 0, 0, 0 );
-		rc = test_presence_filter( be, conn, op, e, f->f_type );
+		rc = test_presence_filter( be, conn, op, e, f->f_desc );
 		break;
 
 	case LDAP_FILTER_APPROX:
 		Debug( LDAP_DEBUG_FILTER, "    APPROX\n", 0, 0, 0 );
-		rc = test_approx_filter( be, conn, op, e, &f->f_ava );
+		rc = test_ava_filter( be, conn, op, e, f->f_ava,
+		    LDAP_FILTER_APPROX );
 		break;
 
 	case LDAP_FILTER_AND:
 		Debug( LDAP_DEBUG_FILTER, "    AND\n", 0, 0, 0 );
-		rc = test_filter_list( be, conn, op, e, f->f_and,
-		    LDAP_FILTER_AND );
+		rc = test_filter_and( be, conn, op, e, f->f_and );
 		break;
 
 	case LDAP_FILTER_OR:
 		Debug( LDAP_DEBUG_FILTER, "    OR\n", 0, 0, 0 );
-		rc = test_filter_list( be, conn, op, e, f->f_or,
-		    LDAP_FILTER_OR );
+		rc = test_filter_or( be, conn, op, e, f->f_or );
 		break;
 
 	case LDAP_FILTER_NOT:
 		Debug( LDAP_DEBUG_FILTER, "    NOT\n", 0, 0, 0 );
-		rc = (! test_filter( be, conn, op, e, f->f_not ) );
+		rc = test_filter( be, conn, op, e, f->f_not );
+
+		switch( rc ) {
+		case LDAP_COMPARE_TRUE:
+			rc = LDAP_COMPARE_FALSE;
+			break;
+		case LDAP_COMPARE_FALSE:
+			rc = LDAP_COMPARE_TRUE;
+			break;
+		}
 		break;
 
+#ifdef SLAPD_EXT_FILTERS
+	case LDAP_FILTER_EXT:
+		Debug( LDAP_DEBUG_FILTER, "    EXT\n", 0, 0, 0 );
+		rc = test_mra_filter( be, conn, op, e, f->f_mra );
+		break;
+#endif
+
 	default:
 		Debug( LDAP_DEBUG_ANY, "    unknown filter type %lu\n",
 		    f->f_choice, 0, 0 );
-		rc = -1;
+		rc = LDAP_PROTOCOL_ERROR;
 	}
 
 	Debug( LDAP_DEBUG_FILTER, "<= test_filter %d\n", rc, 0, 0 );
 	return( rc );
 }
 
+
 static int
 test_ava_filter(
     Backend	*be,
     Connection	*conn,
     Operation	*op,
     Entry	*e,
-    Ava		*ava,
+	AttributeAssertion *ava,
     int		type
 )
 {
-	int		i, rc;
+	int		i;
 	Attribute	*a;
 
 	if ( be != NULL && ! access_allowed( be, conn, op, e,
-		ava->ava_type, &ava->ava_value, ACL_SEARCH ) )
+		ava->aa_desc, ava->aa_value, ACL_SEARCH ) )
 	{
-		return( -2 );
-	}
-
-	if ( (a = attr_find( e->e_attrs, ava->ava_type )) == NULL ) {
-		return( -1 );
+		return LDAP_INSUFFICIENT_ACCESS;
 	}
 
-	if ( a->a_syntax == 0 ) {
-		a->a_syntax = attr_syntax( ava->ava_type );
-	}
-	for ( i = 0; a->a_vals[i] != NULL; i++ ) {
-		rc = value_cmp( a->a_vals[i], &ava->ava_value, a->a_syntax,
-		    3 );
+	for(a = attrs_find( e->e_attrs, ava->aa_desc );
+		a != NULL;
+		a = attrs_find( a->a_next, ava->aa_desc ) )
+	{
+		MatchingRule *mr;
 
 		switch ( type ) {
+		case LDAP_FILTER_APPROX:
+			mr = a->a_desc->ad_type->sat_approx;
+			if( mr != NULL ) break;
+
 		case LDAP_FILTER_EQUALITY:
-			if ( rc == 0 ) {
-				return( 0 );
-			}
+			mr = a->a_desc->ad_type->sat_equality;
 			break;
 
 		case LDAP_FILTER_GE:
-			if ( rc >= 0 ) {
-				return( 0 );
-			}
+		case LDAP_FILTER_LE:
+			mr = a->a_desc->ad_type->sat_ordering;
 			break;
 
-		case LDAP_FILTER_LE:
-			if ( rc <= 0 ) {
-				return( 0 );
+		default:
+			mr = NULL;
+		}
+
+		if( mr == NULL ) {
+			continue;
+		}
+
+		for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+			int ret;
+			int rc;
+			const char *text;
+
+			rc = value_match( &ret, a->a_desc, mr,
+				a->a_vals[i], ava->aa_value,
+				&text );
+
+			if( rc != LDAP_SUCCESS ) {
+				return rc;
+			}
+
+			switch ( type ) {
+			case LDAP_FILTER_EQUALITY:
+			case LDAP_FILTER_APPROX:
+				if ( ret == 0 ) {
+					return LDAP_COMPARE_TRUE;
+				}
+				break;
+
+			case LDAP_FILTER_GE:
+				if ( ret >= 0 ) {
+					return LDAP_COMPARE_TRUE;
+				}
+				break;
+
+			case LDAP_FILTER_LE:
+				if ( ret <= 0 ) {
+					return LDAP_COMPARE_TRUE;
+				}
+				break;
 			}
-			break;
 		}
 	}
 
-	return( 1 );
+	return( LDAP_COMPARE_FALSE );
 }
 
+
 static int
 test_presence_filter(
     Backend	*be,
     Connection	*conn,
     Operation	*op,
     Entry	*e,
-    char	*type
+	AttributeDescription *desc
 )
 {
 	if ( be != NULL && ! access_allowed( be, conn, op, e,
-		type, NULL, ACL_SEARCH ) )
+		desc, NULL, ACL_SEARCH ) )
 	{
-		return( -2 );
+		return LDAP_INSUFFICIENT_ACCESS;
 	}
 
-	return( attr_find( e->e_attrs, type ) != NULL ? 0 : -1 );
+	return attrs_find( e->e_attrs, desc ) != NULL
+		? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
 }
 
+
 static int
-test_approx_filter(
+test_filter_and(
     Backend	*be,
     Connection	*conn,
     Operation	*op,
     Entry	*e,
-    Ava		*ava
+    Filter	*flist
 )
 {
-	char		*w1, *w2, *c1, *c2;
-	int		i;
-	Attribute	*a;
+	Filter	*f;
+	int rtn = LDAP_COMPARE_TRUE;
 
-	if ( be != NULL && ! access_allowed( be, conn, op, e,
-		ava->ava_type, NULL, ACL_SEARCH ) )
-	{
-		return( -2 );
-	}
+	Debug( LDAP_DEBUG_FILTER, "=> test_filter_and\n", 0, 0, 0 );
 
-	if ( (a = attr_find( e->e_attrs, ava->ava_type )) == NULL ) {
-		return( -1 );
-	}
-
-	/* for each value in the attribute */
-	for ( i = 0; a->a_vals[i] != NULL; i++ ) {
-		/*
-		 * try to match words in the filter value in order
-		 * in the attribute value.
-		 */
-
-		w2 = a->a_vals[i]->bv_val;
-		/* for each word in the filter value */
-		for ( w1 = first_word( ava->ava_value.bv_val ); w1 != NULL;
-		    w1 = next_word( w1 ) ) {
-			if ( (c1 = phonetic( w1 )) == NULL ) {
-				break;
-			}
+	for ( f = flist; f != NULL; f = f->f_next ) {
+		int rc = test_filter( be, conn, op, e, f );
 
-			/*
-			 * for each word in the attribute value from
-			 * where we left off...
-			 */
-			for ( w2 = first_word( w2 ); w2 != NULL;
-			    w2 = next_word( w2 ) ) {
-				c2 = phonetic( w2 );
-				if ( strcmp( c1, c2 ) == 0 ) {
-					free( c2 );
-					break;
-				}
-				free( c2 );
-			}
-			free( c1 );
-
-			/*
-			 * if we stopped because we ran out of words
-			 * before making a match, go on to the next
-			 * value.  otherwise try to keep matching
-			 * words in this value from where we left off.
-			 */
-			if ( w2 == NULL ) {
-				break;
-			} else {
-				w2 = next_word( w2 );
-			}
+		if ( rc == LDAP_COMPARE_FALSE ) {
+			rtn = LDAP_COMPARE_FALSE;
+			break;
 		}
-		/*
-		 * if we stopped because we ran out of words we
-		 * have a match.
-		 */
-		if ( w1 == NULL ) {
-			return( 0 );
+		if ( rc != LDAP_COMPARE_TRUE ) {
+			rtn = rc;
 		}
 	}
 
-	return( 1 );
+	Debug( LDAP_DEBUG_FILTER, "<= test_filter_and %d\n", rtn, 0, 0 );
+	return rtn;
 }
 
 static int
-test_filter_list(
+test_filter_or(
     Backend	*be,
     Connection	*conn,
     Operation	*op,
     Entry	*e,
-    Filter	*flist,
-    int		ftype
+    Filter	*flist
 )
 {
-	int	nomatch;
 	Filter	*f;
+	int rtn = LDAP_COMPARE_FALSE;
 
-	Debug( LDAP_DEBUG_FILTER, "=> test_filter_list\n", 0, 0, 0 );
+	Debug( LDAP_DEBUG_FILTER, "=> test_filter_or\n", 0, 0, 0 );
 
-	nomatch = 1;
 	for ( f = flist; f != NULL; f = f->f_next ) {
-		if ( test_filter( be, conn, op, e, f ) != 0 ) {
-			if ( ftype == LDAP_FILTER_AND ) {
-				Debug( LDAP_DEBUG_FILTER,
-				    "<= test_filter_list 1\n", 0, 0, 0 );
-				return( 1 );
-			}
-		} else {
-			nomatch = 0;
+		int rc = test_filter( be, conn, op, e, f );
+
+		if ( rc == LDAP_COMPARE_TRUE ) {
+			rtn = LDAP_COMPARE_TRUE;
+			break;
+		}
+		if ( rc != LDAP_COMPARE_TRUE ) {
+			rtn = rc;
 		}
 	}
 
-	Debug( LDAP_DEBUG_FILTER, "<= test_filter_list %d\n", nomatch, 0, 0 );
-	return( nomatch );
+	Debug( LDAP_DEBUG_FILTER, "<= test_filter_or %d\n", rtn, 0, 0 );
+	return rtn;
 }
 
-static void
-strcpy_regex( char *d, char *s )
-{
-	for ( ; *s; s++ ) {
-		switch ( *s ) {
-		case '^':
-		case '.':
-		case '[':
-		case ']': /* ? */
-		case '$':
-		case '(':
-		case ')': /* ? */
-		case '|':
-		case '*':
-		case '+':
-		case '?':
-		case '{':
-		case '}': /* ? */
-		case '\\':
-			*d++ = '\\';
-			/* FALL */
-		default:
-			*d++ = *s;
-		}
-	}
-	*d = '\0';
-}
 
 static int
-test_substring_filter(
+test_substrings_filter(
     Backend	*be,
     Connection	*conn,
     Operation	*op,
@@ -321,118 +319,45 @@ test_substring_filter(
 )
 {
 	Attribute	*a;
-	int		i, rc;
-	char		*p, *end, *realval, *tmp;
-	char		pat[BUFSIZ];
-	char		buf[BUFSIZ];
-	struct berval	*val;
-	regex_t		re;
 
-	Debug( LDAP_DEBUG_FILTER, "begin test_substring_filter\n", 0, 0, 0 );
+	Debug( LDAP_DEBUG_FILTER, "begin test_substrings_filter\n", 0, 0, 0 );
 
 	if ( be != NULL && ! access_allowed( be, conn, op, e,
-		f->f_sub_type, NULL, ACL_SEARCH ) )
+		f->f_sub_desc, NULL, ACL_SEARCH ) )
 	{
-		return( -2 );
-	}
-
-	if ( (a = attr_find( e->e_attrs, f->f_sub_type )) == NULL ) {
-		return( -1 );
+		return LDAP_INSUFFICIENT_ACCESS;
 	}
 
-	if ( a->a_syntax & SYNTAX_BIN ) {
-		Debug( LDAP_DEBUG_FILTER, "test_substring_filter bin attr\n",
-		    0, 0, 0 );
-		return( -1 );
-	}
+	for(a = attrs_find( e->e_attrs, f->f_sub_desc );
+		a != NULL;
+		a = attrs_find( a->a_next, f->f_sub_desc ) )
+	{
+		int i;
+		MatchingRule *mr = a->a_desc->ad_type->sat_substr;
 
-	/*
-	 * construct a regular expression corresponding to the
-	 * filter and let regex do the work
-	 */
-
-	pat[0] = '\0';
-	p = pat;
-	end = pat + sizeof(pat) - 2;	/* leave room for null */
-	if ( f->f_sub_initial != NULL ) {
-		strcpy( p, "^" );
-		p = strchr( p, '\0' );
-		/* 2 * in case every char is special */
-		if ( p + 2 * strlen( f->f_sub_initial ) > end ) {
-			Debug( LDAP_DEBUG_ANY, "not enough pattern space\n",
-			    0, 0, 0 );
-			return( -1 );
-		}
-		strcpy_regex( p, f->f_sub_initial );
-		p = strchr( p, '\0' );
-	}
-	if ( f->f_sub_any != NULL ) {
-		for ( i = 0; f->f_sub_any[i] != NULL; i++ ) {
-			/* ".*" + value */
-			if ( p + 2 * strlen( f->f_sub_any[i] ) + 2 > end ) {
-				Debug( LDAP_DEBUG_ANY,
-				    "not enough pattern space\n", 0, 0, 0 );
-				return( -1 );
-			}
-			strcpy( p, ".*" );
-			p = strchr( p, '\0' );
-			strcpy_regex( p, f->f_sub_any[i] );
-			p = strchr( p, '\0' );
+		if( mr == NULL ) {
+			continue;
 		}
-	}
-	if ( f->f_sub_final != NULL ) {
-		/* ".*" + value */
-		if ( p + 2 * strlen( f->f_sub_final ) + 2 > end ) {
-			Debug( LDAP_DEBUG_ANY, "not enough pattern space\n",
-			    0, 0, 0 );
-			return( -1 );
-		}
-		strcpy( p, ".*" );
-		p = strchr( p, '\0' );
-		strcpy_regex( p, f->f_sub_final );
-		p = strchr( p, '\0' );
-		strcpy( p, "$" );
-	}
 
-	/* compile the regex */
-	Debug( LDAP_DEBUG_FILTER, "test_substring_filter: regcomp pat: %s\n",
-		pat, 0, 0 );
-	if ((rc = regcomp(&re, pat, REG_EXTENDED|REG_NOSUB))) {
-		char error[512];
-
-		regerror(rc, &re, error, sizeof(error));
-		Debug( LDAP_DEBUG_ANY, "regcomp failed (%s) %s\n",
-			p, error, 0 );
-		return( -1 );
-	}
+		for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+			int ret;
+			int rc;
+			const char *text;
 
-	/* for each value in the attribute see if regex matches */
-	for ( i = 0; a->a_vals[i] != NULL; i++ ) {
-		val = a->a_vals[i];
-		tmp = NULL;
-		if ( val->bv_len < sizeof(buf) ) {
-			strcpy( buf, val->bv_val );
-			realval = buf;
-		} else {
-			tmp = (char *) ch_malloc( val->bv_len + 1 );
-			strcpy( tmp, val->bv_val );
-			realval = tmp;
-		}
-		value_normalize( realval, a->a_syntax );
+			rc = value_match( &ret, a->a_desc, mr,
+				a->a_vals[i], f->f_sub,
+				&text );
 
-		rc = !regexec(&re, realval, 0, NULL, 0);
+			if( rc != LDAP_SUCCESS ) {
+				return rc;
+			}
 
-		if ( tmp != NULL ) {
-			free( tmp );
-		}
-		if ( rc == 1 ) {
-			regfree(&re);
-			return( 0 );
+			if ( ret == 0 ) {
+				return LDAP_COMPARE_TRUE;
+			}
 		}
 	}
 
-	regfree(&re);
-
-	Debug( LDAP_DEBUG_FILTER, "end test_substring_filter 1\n", 0, 0, 0 );
-	return( 1 );
+	Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter 1\n", 0, 0, 0 );
+	return LDAP_COMPARE_FALSE;
 }