X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fsearch.c;h=c0bc46df7899dae708c45b7ce4e559d476bc1fb2;hb=5c701066571f8ff173a9bc8ade0439c4a1587b61;hp=c4a223dfe31ad069bcbd6bd6a5268c4b0bf6b0d9;hpb=bf5fc54473f2143586e43aada98ae8f5dab7570b;p=openldap

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index c4a223dfe3..c0bc46df78 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -1,6 +1,6 @@
 /* $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
  */
 /*  Portions
@@ -22,43 +22,6 @@
 
 #include "ldap-int.h"
 
-static int ldap_is_attr_oid LDAP_P((
-	const char *attr ));
-
-static int ldap_is_attr_desc LDAP_P((
-	const char *attr ));
-
-static int hex2value LDAP_P((
-	int c ));
-
-static char *find_right_paren LDAP_P((
-	char *s ));
-
-static char *put_complex_filter LDAP_P((
-	BerElement *ber,
-	char *str,
-	ber_tag_t tag,
-	int not ));
-
-int ldap_int_put_filter LDAP_P((
-	BerElement *ber,
-	char *str ));
-
-#define put_filter(b,s) ldap_int_put_filter((b),(s))
-
-static int put_simple_filter LDAP_P((
-	BerElement *ber,
-	char *str ));
-
-static int put_substring_filter LDAP_P((
-	BerElement *ber,
-	char *type,
-	char *str ));
-
-static int put_filter_list LDAP_P((
-	BerElement *ber,
-	char *str,
-	ber_tag_t tag ));
 
 /*
  * ldap_search_ext - initiate an ldap search operation.
@@ -98,7 +61,11 @@ ldap_search_ext(
 	BerElement	*ber;
 	int timelimit;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "search", LDAP_LEVEL_ENTRY, "ldap_search_ext\n" ));
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 );
+#endif
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
@@ -216,7 +183,11 @@ ldap_search(
 {
 	BerElement	*ber;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "search", LDAP_LEVEL_ENTRY, "ldap_search\n" ));
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_search\n", 0, 0, 0 );
+#endif
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
@@ -249,7 +220,7 @@ ldap_build_search_req(
 	LDAP *ld,
 	LDAP_CONST char *base,
 	ber_int_t scope,
-	LDAP_CONST char *filter_in,
+	LDAP_CONST char *filter,
 	char **attrs,
 	ber_int_t attrsonly,
 	LDAPControl **sctrls,
@@ -259,7 +230,6 @@ ldap_build_search_req(
 {
 	BerElement	*ber;
 	int		err;
-	char	*filter;
 
 	/*
 	 * Create the search request.  It looks like this:
@@ -329,13 +299,11 @@ ldap_build_search_req(
 		return( NULL );
 	}
 
-	if( filter_in != NULL ) {
-		filter = LDAP_STRDUP( filter_in );
-	} else {
-		filter = LDAP_STRDUP( "(objectclass=*)" );
+	if( filter == NULL ) {
+		filter = "(objectclass=*)";
 	}
-	err = put_filter( ber, filter );
-	LDAP_FREE( filter );
+
+	err = ldap_pvt_put_filter( ber, filter );
 
 	if ( err  == -1 ) {
 		ld->ld_errno = LDAP_FILTER_ERROR;
@@ -364,583 +332,6 @@ ldap_build_search_req(
 	return( ber );
 }
 
-static int ldap_is_attr_oid ( const char *attr )
-{
-	int i, c, digit=0;
-
-	for( i = 0; (c = attr[i]) != 0; i++ ) {
-		if( c >= '0' && c <= '9' ) {
-			digit=1;
-
-		} else if ( c != '.' ) {
-			/* not digit nor '.' */
-			return 0;
-
-		} else if ( !digit ) {
-			/* '.' but prev not digit */
-			return 0;
-
-		} else {
-			/* '.' */
-			digit = 0;
-		}
-	}
-
-	return digit;
-}
-
-static int ldap_is_attr_desc ( const char *attr )
-{
-	/* cheap attribute description check */
-	int i, c;
-
-	for( i = 0; (c = attr[i]) != 0; i++ ) {
-		if (( c >= '0' && c <= '9' )
-			|| ( c >= 'A' && c <= 'Z' )
-			|| ( c >= 'a' && c <= 'z' )
-			|| ( c == '.' || c == '-' )
-			|| ( c == ';' )) continue;
-
-		return 0;
-	}
-
-	return i > 0;
-}
-
-static char *
-find_right_paren( char *s )
-{
-	int	balance, escape;
-
-	balance = 1;
-	escape = 0;
-	while ( *s && balance ) {
-		if ( escape == 0 ) {
-			if ( *s == '(' )
-				balance++;
-			else if ( *s == ')' )
-				balance--;
-		}
-		if ( *s == '\\' && ! escape )
-			escape = 1;
-		else
-			escape = 0;
-		if ( balance )
-			s++;
-	}
-
-	return( *s ? s : NULL );
-}
-
-static int hex2value( int c )
-{
-	if( c >= '0' && c <= '9' ) {
-		return c - '0';
-	}
-
-	if( c >= 'A' && c <= 'F' ) {
-		return c + (10 - (int) 'A');
-	}
-
-	if( c >= 'a' && c <= 'f' ) {
-		return c + (10 - (int) 'a');
-	}
-
-	return -1;
-}
-
-char *
-ldap_pvt_find_wildcard( const char *s )
-{
-	for( ; *s != '\0' ; s++ ) {
-		switch( *s ) {
-		case '*':	/* found wildcard */
-			return (char *) s;
-
-		case '\\':
-			s++; /* skip over escape */
-			if ( *s == '\0' )
-				return NULL;	/* escape at end of string */
-		}
-	}
-
-	return NULL;
-}
-
-/* unescape filter value */
-/* support both LDAP v2 and v3 escapes */
-/* output can include nul characters! */
-ber_slen_t
-ldap_pvt_filter_value_unescape( char *fval )
-{
-	ber_slen_t r, v;
-	int v1, v2;
-
-	for( r=v=0; fval[v] != '\0'; v++ ) {
-		switch( fval[v] ) {
-		case '\\':
-			/* escape */
-			v++;
-
-			if ( fval[v] == '\0' ) {
-				/* escape at end of string */
-				return -1;
-
-			}
-
-			if (( v1 = hex2value( fval[v] )) >= 0 ) {
-				/* LDAPv3 escape */
-				if (( v2 = hex2value( fval[v+1] )) < 0 ) {
-					/* must be two digit code */
-					return -1;
-				}
-
-				fval[r++] = v1 * 16 + v2;
-				v++;
-
-			} else {
-				/* LDAPv2 escape */
-				switch( fval[v] ) {
-				case '(':
-				case ')':
-				case '*':
-				case '\\':
-					fval[r++] = fval[v];
-					break;
-				default:
-					/* illegal escape */
-					return -1;
-				}
-			}
-			break;
-
-		default:
-			fval[r++] = fval[v];
-		}
-	}
-
-	fval[r] = '\0';
-	return r;
-}
-
-static char *
-put_complex_filter( BerElement *ber, char *str, ber_tag_t tag, int not )
-{
-	char	*next;
-
-	/*
-	 * We have (x(filter)...) with str sitting on
-	 * the x.  We have to find the paren matching
-	 * the one before the x and put the intervening
-	 * filters by calling put_filter_list().
-	 */
-
-	/* put explicit tag */
-	if ( ber_printf( ber, "t{" /*}*/, tag ) == -1 )
-		return( NULL );
-
-	str++;
-	if ( (next = find_right_paren( str )) == NULL )
-		return( NULL );
-
-	*next = '\0';
-	if ( put_filter_list( ber, str, tag ) == -1 )
-		return( NULL );
-	*next++ = ')';
-
-	/* flush explicit tagged thang */
-	if ( ber_printf( ber, /*{*/ "N}" ) == -1 )
-		return( NULL );
-
-	return( next );
-}
-
-int
-ldap_int_put_filter( BerElement *ber, char *str )
-{
-	char	*next;
-	int	parens, balance, escape;
-
-	/*
-	 * A Filter looks like this:
-	 *      Filter ::= CHOICE {
-	 *              and             [0]     SET OF Filter,
-	 *              or              [1]     SET OF Filter,
-	 *              not             [2]     Filter,
-	 *              equalityMatch   [3]     AttributeValueAssertion,
-	 *              substrings      [4]     SubstringFilter,
-	 *              greaterOrEqual  [5]     AttributeValueAssertion,
-	 *              lessOrEqual     [6]     AttributeValueAssertion,
-	 *              present         [7]     AttributeType,
-	 *              approxMatch     [8]     AttributeValueAssertion,
-	 *				extensibleMatch [9]		MatchingRuleAssertion -- LDAPv3
-	 *      }
-	 *
-	 *      SubstringFilter ::= SEQUENCE {
-	 *              type               AttributeType,
-	 *              SEQUENCE OF CHOICE {
-	 *                      initial          [0] IA5String,
-	 *                      any              [1] IA5String,
-	 *                      final            [2] IA5String
-	 *              }
-	 *      }
-	 *
-	 *		MatchingRuleAssertion ::= SEQUENCE {	-- LDAPv3
-	 *			matchingRule    [1] MatchingRuleId OPTIONAL,
-	 *			type            [2] AttributeDescription OPTIONAL,
-	 *			matchValue      [3] AssertionValue,
-	 *			dnAttributes    [4] BOOLEAN DEFAULT FALSE }
-	 *
-	 * Note: tags in a choice are always explicit
-	 */
-
-	Debug( LDAP_DEBUG_TRACE, "put_filter \"%s\"\n", str, 0, 0 );
-
-	parens = 0;
-	while ( *str ) {
-		switch ( *str ) {
-		case '(':
-			str++;
-			parens++;
-
-			/* skip spaces */
-			while( LDAP_SPACE( *str ) ) str++;
-
-			switch ( *str ) {
-			case '&':
-				Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n",
-				    0, 0, 0 );
-
-				if ( (str = put_complex_filter( ber, str,
-				    LDAP_FILTER_AND, 0 )) == NULL )
-					return( -1 );
-
-				parens--;
-				break;
-
-			case '|':
-				Debug( LDAP_DEBUG_TRACE, "put_filter: OR\n",
-				    0, 0, 0 );
-
-				if ( (str = put_complex_filter( ber, str,
-				    LDAP_FILTER_OR, 0 )) == NULL )
-					return( -1 );
-
-				parens--;
-				break;
-
-			case '!':
-				Debug( LDAP_DEBUG_TRACE, "put_filter: NOT\n",
-				    0, 0, 0 );
-
-				if ( (str = put_complex_filter( ber, str,
-				    LDAP_FILTER_NOT, 1 )) == NULL )
-					return( -1 );
-
-				parens--;
-				break;
-
-			default:
-				Debug( LDAP_DEBUG_TRACE, "put_filter: simple\n",
-				    0, 0, 0 );
-
-				balance = 1;
-				escape = 0;
-				next = str;
-				while ( *next && balance ) {
-					if ( escape == 0 ) {
-						if ( *next == '(' )
-							balance++;
-						else if ( *next == ')' )
-							balance--;
-					}
-					if ( *next == '\\' && ! escape )
-						escape = 1;
-					else
-						escape = 0;
-					if ( balance )
-						next++;
-				}
-				if ( balance != 0 )
-					return( -1 );
-
-				*next = '\0';
-				if ( put_simple_filter( ber, str ) == -1 ) {
-					return( -1 );
-				}
-				*next++ = ')';
-				str = next;
-				parens--;
-				break;
-			}
-			break;
-
-		case ')':
-			Debug( LDAP_DEBUG_TRACE, "put_filter: end\n", 0, 0,
-			    0 );
-			if ( ber_printf( ber, /*[*/ "]" ) == -1 )
-				return( -1 );
-			str++;
-			parens--;
-			break;
-
-		case ' ':
-			str++;
-			break;
-
-		default:	/* assume it's a simple type=value filter */
-			Debug( LDAP_DEBUG_TRACE, "put_filter: default\n", 0, 0,
-			    0 );
-			next = strchr( str, '\0' );
-			if ( put_simple_filter( ber, str ) == -1 ) {
-				return( -1 );
-			}
-			str = next;
-			break;
-		}
-	}
-
-	return( parens ? -1 : 0 );
-}
-
-/*
- * Put a list of filters like this "(filter1)(filter2)..."
- */
-
-static int
-put_filter_list( BerElement *ber, char *str, ber_tag_t tag )
-{
-	char	*next = NULL;
-	char	save;
-
-	Debug( LDAP_DEBUG_TRACE, "put_filter_list \"%s\"\n", str, 0, 0 );
-
-	while ( *str ) {
-		while ( *str && LDAP_SPACE( (unsigned char) *str ) ) {
-			str++;
-		}
-		if ( *str == '\0' ) break;
-
-		if ( (next = find_right_paren( str + 1 )) == NULL ) {
-			return( -1 );
-		}
-		save = *++next;
-
-		/* now we have "(filter)" with str pointing to it */
-		*next = '\0';
-		if ( put_filter( ber, str ) == -1 ) return -1;
-		*next = save;
-		str = next;
-
-		if( tag == LDAP_FILTER_NOT ) break;
-	}
-
-	if( tag == LDAP_FILTER_NOT && ( next == NULL || *str )) {
-		return -1;
-	}
-
-	return 0;
-}
-
-static int
-put_simple_filter(
-	BerElement *ber,
-	char *str )
-{
-	char		*s;
-	char		*value;
-	ber_tag_t	ftype;
-	int		rc = -1;
-
-	Debug( LDAP_DEBUG_TRACE, "put_simple_filter \"%s\"\n", str, 0, 0 );
-
-	str = LDAP_STRDUP( str );
-	if( str == NULL ) return -1;
-
-	if ( (s = strchr( str, '=' )) == NULL ) {
-		goto done;
-	}
-
-	value = s + 1;
-	*s-- = '\0';
-
-	switch ( *s ) {
-	case '<':
-		ftype = LDAP_FILTER_LE;
-		*s = '\0';
-		if(! ldap_is_attr_desc( str ) ) goto done;
-		break;
-
-	case '>':
-		ftype = LDAP_FILTER_GE;
-		*s = '\0';
-		if(! ldap_is_attr_desc( str ) ) goto done;
-		break;
-
-	case '~':
-		ftype = LDAP_FILTER_APPROX;
-		*s = '\0';
-		if(! ldap_is_attr_desc( str ) ) goto done;
-		break;
-
-	case ':':
-		/* RFC2254 extensible filters are off the form:
-		 *		type [:dn] [:rule] := value
-		 * or	[:dn]:rule := value		
-		 */
-		ftype = LDAP_FILTER_EXT;
-		*s = '\0';
-
-		{
-			char *dn = strchr( str, ':' );
-			char *rule = NULL;
-
-			if( dn == NULL ) {
-				if(! ldap_is_attr_desc( str ) ) goto done;
-			} else {
-
-				*dn++ = '\0';
-				rule = strchr( dn, ':' );
-
-				if( rule == NULL ) {
-					/* one colon */
-					if ( strcmp(dn, "dn") == 0 ) {
-						/* must have attribute */
-						if( !ldap_is_attr_desc( str ) ) {
-							goto done;
-						}
-
-						rule = "";
-
-					} else {
-					  rule = dn;
-					  dn = NULL;
-					}
-				
-				} else {
-					/* two colons */
-					*rule++ = '\0';
-
-					if ( strcmp(dn, "dn") != 0 ) {
-						/* must have "dn" */
-						goto done;
-					}
-				}
-
-			}
-
-			if ( *str == '\0' && ( !rule || *rule == '\0' ) ) {
-				/* must have either type or rule */
-				goto done;
-			}
-
-			if ( *str != '\0' && !ldap_is_attr_desc( str ) ) {
-				goto done;
-			}
-
-			if ( rule && *rule != '\0' && !ldap_is_attr_oid( rule ) ) {
-				goto done;
-			}
-
-			rc = ber_printf( ber, "t{" /*}*/, ftype );
-
-			if( rc != -1 && rule && *rule != '\0' ) {
-				rc = ber_printf( ber, "ts", LDAP_FILTER_EXT_OID, rule );
-			}
-			if( rc != -1 && *str != '\0' ) {
-				rc = ber_printf( ber, "ts", LDAP_FILTER_EXT_TYPE, str );
-			}
-
-			if( rc != -1 ) {
-				ber_slen_t len = ldap_pvt_filter_value_unescape( value );
-
-				if( len >= 0 ) {
-					rc = ber_printf( ber, "totbN}",
-						LDAP_FILTER_EXT_VALUE, value, len,
-						LDAP_FILTER_EXT_DNATTRS, dn != NULL);
-				} else {
-					rc = -1;
-				}
-			}
-		}
-		goto done;
-
-	default:
-		if ( ldap_pvt_find_wildcard( value ) == NULL ) {
-			ftype = LDAP_FILTER_EQUALITY;
-		} else if ( strcmp( value, "*" ) == 0 ) {
-			ftype = LDAP_FILTER_PRESENT;
-		} else {
-			rc = put_substring_filter( ber, str, value );
-			goto done;
-		}
-		break;
-	}
-
-	if ( ftype == LDAP_FILTER_PRESENT ) {
-		rc = ber_printf( ber, "ts", ftype, str );
-
-	} else {
-		ber_slen_t len = ldap_pvt_filter_value_unescape( value );
-
-		if( len >= 0 ) {
-			rc = ber_printf( ber, "t{soN}",
-				ftype, str, value, len );
-		}
-	}
-
-	if( rc != -1 ) rc = 0;
-
-done:
-	LDAP_FREE( str );
-	return rc;
-}
-
-static int
-put_substring_filter( BerElement *ber, char *type, char *val )
-{
-	char		*nextstar, gotstar = 0;
-	ber_tag_t	ftype = LDAP_FILTER_SUBSTRINGS;
-
-	Debug( LDAP_DEBUG_TRACE, "put_substring_filter \"%s=%s\"\n", type,
-	    val, 0 );
-
-	if ( ber_printf( ber, "t{s{", ftype, type ) == -1 )
-		return( -1 );
-
-	for( ; val != NULL; val=nextstar ) {
-		if ( (nextstar = ldap_pvt_find_wildcard( val )) != NULL )
-			*nextstar++ = '\0';
-
-		if ( gotstar == 0 ) {
-			ftype = LDAP_SUBSTRING_INITIAL;
-		} else if ( nextstar == NULL ) {
-			ftype = LDAP_SUBSTRING_FINAL;
-		} else {
-			ftype = LDAP_SUBSTRING_ANY;
-		}
-
-		if ( *val != '\0' ) {
-			ber_slen_t len = ldap_pvt_filter_value_unescape( val );
-
-			if ( len < 0  ) {
-				return -1;
-			}
-
-			if ( ber_printf( ber, "to", ftype, val, len ) == -1 ) {
-				return( -1 );
-			}
-		}
-
-		gotstar = 1;
-	}
-
-	if ( ber_printf( ber, /* {{ */ "N}N}" ) == -1 )
-		return( -1 );
-
-	return( 0 );
-}
-
 int
 ldap_search_st(
 	LDAP *ld, LDAP_CONST char *base, int scope,