+/* $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
*/
/* Portions
#include "ldap-int.h"
-static int ldap_is_attribute LDAP_P((
+static int ldap_is_attr_oid LDAP_P((
const char *attr ));
-static int ldap_is_attribute_ext LDAP_P((
+static int ldap_is_attr_desc LDAP_P((
const char *attr ));
static int hex2value LDAP_P((
int c ));
-static ber_slen_t filter_value_unescape LDAP_P((
- char *filter ));
-
static char *find_right_paren LDAP_P((
char *s ));
-static char *find_wildcard LDAP_P((
- char *s ));
-
static char *put_complex_filter LDAP_P((
BerElement *ber,
char *str,
Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 );
/*
- * if timeout is provided, use only tv_sec as timelimit.
- * otherwise, use default.
+ * if timeout is provided, both tv_sec and tv_usec must
+ * be non-zero
*/
- timelimit = (timeout != NULL)
- ? timeout->tv_sec
- : -1;
+ if( timeout != NULL ) {
+ if( timeout->tv_sec == 0 && timeout->tv_usec == 0 ) {
+ return LDAP_PARAM_ERROR;
+ }
+
+ /* timelimit must be non-zero if timeout is provided */
+ timelimit = timeout->tv_sec != 0 ? timeout->tv_sec : 1;
+
+ } else {
+ /* no timeout, no timelimit */
+ timelimit = -1;
+ }
ber = ldap_build_search_req( ld, base, scope, filter, attrs,
attrsonly, sctrls, cctrls, timelimit, sizelimit );
return( rc );
}
- if ( ldap_result( ld, msgid, 1, timeout, res ) == -1 )
+ rc = ldap_result( ld, msgid, 1, timeout, res );
+
+ if( rc <= 0 ) {
+ /* error(-1) or timeout(0) */
return( ld->ld_errno );
+ }
return( ldap_result2error( ld, *res, 0 ) );
}
BerElement *
ldap_build_search_req(
LDAP *ld,
- LDAP_CONST char *base_in,
+ LDAP_CONST char *base,
ber_int_t scope,
LDAP_CONST char *filter_in,
char **attrs,
{
BerElement *ber;
int err;
- char *base;
char *filter;
/*
return( NULL );
}
- if ( base_in == NULL ) {
+ if ( base == NULL ) {
/* no base provided, use session default base */
base = ld->ld_options.ldo_defbase;
- } else {
- base = (char *) base_in;
- }
- if ( base == NULL ) {
- /* no session default base, use top */
- base = "";
+ if ( base == NULL ) {
+ /* no session default base, use top */
+ base = "";
+ }
}
#ifdef LDAP_CONNECTIONLESS
return( NULL );
}
- filter = LDAP_STRDUP( filter_in );
+ if( filter_in != NULL ) {
+ filter = LDAP_STRDUP( filter_in );
+ } else {
+ filter = LDAP_STRDUP( "(objectclass=*)" );
+ }
err = put_filter( ber, filter );
LDAP_FREE( filter );
return( ber );
}
-#ifndef LDAP_UNDERSCORE
-#define LDAP_UNDERSCORE ""
-#endif
+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;
-static char *spanset =
- ":-.;" LDAP_UNDERSCORE
- "ABCDEFGHIGKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "0123456789";
+ } else if ( c != '.' ) {
+ /* not digit nor '.' */
+ return 0;
-#define ATTR_SPANSET (spanset)
-#define EXT_SPANSET (&spanset[1])
+ } else if ( !digit ) {
+ /* '.' but prev not digit */
+ return 0;
-static int ldap_is_attribute LDAP_P(( const char *attr ))
-{
- size_t len = strlen( attr );
- size_t span = strspn( attr, ATTR_SPANSET );
+ } else {
+ /* '.' */
+ digit = 0;
+ }
+ }
- return span == len;
+ return digit;
}
-static int ldap_is_attribute_ext LDAP_P(( const char *attr ))
+static int ldap_is_attr_desc ( const char *attr )
{
- size_t len = strlen( attr );
- size_t span = strspn( attr, EXT_SPANSET );
+ /* 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 span == len;
+ return i > 0;
}
static char *
return -1;
}
-static char *
-find_wildcard( char *s )
+char *
+ldap_pvt_find_wildcard( const char *s )
{
for( ; *s != '\0' ; s++ ) {
switch( *s ) {
case '*': /* found wildcard */
- return s;
+ return (char *) s;
case '\\':
s++; /* skip over escape */
- if( hex2value( s[0] ) >= 0 && hex2value( s[1] ) >= 0 ) {
- /* skip over lead digit of two hex digit code */
- s++;
- }
+ if ( *s == '\0' )
+ return NULL; /* escape at end of string */
}
}
/* unescape filter value */
/* support both LDAP v2 and v3 escapes */
/* output can include nul characters */
-static ber_slen_t
-filter_value_unescape( char *fval )
+ber_slen_t
+ldap_pvt_filter_value_unescape( char *fval )
{
ber_slen_t r, v;
int v1, v2;
/* escape at end of string */
return -1;
- } else if (( v1 = hex2value( fval[v] )) < 0 ) {
+ }
+
+ if (( v1 = hex2value( fval[v] )) >= 0 ) {
/* LDAPv3 escape */
if (( v2 = hex2value( fval[v+1] )) < 0 ) {
case '(':
str++;
parens++;
+
+ /* skip spaces */
+ while( isspace( *str ) ) str++;
+
switch ( *str ) {
case '&':
Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n",
case '<':
ftype = LDAP_FILTER_LE;
*s = '\0';
- if(! ldap_is_attribute( str ) ) goto done;
+ if(! ldap_is_attr_desc( str ) ) goto done;
break;
case '>':
ftype = LDAP_FILTER_GE;
*s = '\0';
- if(! ldap_is_attribute( str ) ) goto done;
+ if(! ldap_is_attr_desc( str ) ) goto done;
break;
case '~':
ftype = LDAP_FILTER_APPROX;
*s = '\0';
- if(! ldap_is_attribute( str ) ) goto done;
+ if(! ldap_is_attr_desc( str ) ) goto done;
break;
- case ':': /* LDAPv3 extended filter */
- ftype = LDAP_FILTER_EXTENDED;
- if(! ldap_is_attribute_ext( str ) ) goto done;
- goto done; /* XXX not yet implemented */
+ 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;
+ break;
+ }
+
+ *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 == '\0' ) {
+ /* must have either type or rule */
+ goto done;
+ }
+
+ if ( *str != '\0' && !ldap_is_attr_desc( str ) ) {
+ goto done;
+ }
+
+ if ( *rule != '\0' && !ldap_is_attr_oid( rule ) ) {
+ goto done;
+ }
+
+ rc = ber_printf( ber, "t{" /*}*/, ftype );
+
+ if( rc != -1 && *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, "totb}",
+ LDAP_FILTER_EXT_VALUE, value, len,
+ LDAP_FILTER_EXT_DNATTRS, dn != NULL);
+ } else {
+ rc = -1;
+ }
+ }
+ }
break;
default:
- if ( find_wildcard( value ) == NULL ) {
+ if ( ldap_pvt_find_wildcard( value ) == NULL ) {
ftype = LDAP_FILTER_EQUALITY;
} else if ( strcmp( value, "*" ) == 0 ) {
ftype = LDAP_FILTER_PRESENT;
rc = ber_printf( ber, "ts", ftype, str );
} else {
- ber_slen_t len = filter_value_unescape( value );
+ ber_slen_t len = ldap_pvt_filter_value_unescape( value );
if( len >= 0 ) {
rc = ber_printf( ber, "t{so}",
return( -1 );
for( ; val != NULL; val=nextstar ) {
- if ( (nextstar = find_wildcard( val )) != NULL )
+ if ( (nextstar = ldap_pvt_find_wildcard( val )) != NULL )
*nextstar++ = '\0';
if ( gotstar == 0 ) {
}
if ( *val != '\0' ) {
- ber_slen_t len = filter_value_unescape( val );
+ ber_slen_t len = ldap_pvt_filter_value_unescape( val );
if ( len < 0 ) {
return -1;
projects / openldap / blobdiff