#include "portable.h"
#include <stdio.h>
+#include <limits.h>
#include <ac/ctype.h>
+#include <ac/errno.h>
#include <ac/string.h>
#include <ac/socket.h>
#include "ldap_utf8.h"
#include "lutil_hash.h"
-/* We should replace MD5 with a faster hash */
#define HASH_BYTES LUTIL_HASH_BYTES
#define HASH_CONTEXT lutil_HASH_CTX
#define HASH_Init(c) lutil_HASHInit(c)
#define berValidate blobValidate
/* unimplemented pretters */
-#define dnPretty NULL
#define integerPretty NULL
/* recycled matching routines */
#define bitStringMatch octetStringMatch
-#define integerMatch caseIgnoreIA5Match
#define numericStringMatch caseIgnoreIA5Match
#define objectIdentifierMatch caseIgnoreIA5Match
#define telephoneNumberMatch caseIgnoreIA5Match
#define authPasswordMatch NULL
/* recycled indexing/filtering routines */
-#define dnIndexer caseIgnoreIndexer
-#define dnFilter caseIgnoreFilter
-#define integerIndexer caseIgnoreIA5Indexer
-#define integerFilter caseIgnoreIA5Filter
+#define dnIndexer caseExactIgnoreIndexer
+#define dnFilter caseExactIgnoreFilter
+#define bitStringFilter octetStringFilter
+#define bitStringIndexer octetStringIndexer
#define telephoneNumberIndexer caseIgnoreIA5Indexer
#define telephoneNumberFilter caseIgnoreIA5Filter
#define telephoneNumberSubstringsIndexer caseIgnoreIA5SubstringsIndexer
#define telephoneNumberSubstringsFilter caseIgnoreIA5SubstringsFilter
+/* must match OIDs below */
+#define caseExactMatchOID "2.5.13.5"
+#define caseExactSubstringsMatchOID "2.5.13.7"
+
static char *strcasechr( const char *str, int c )
{
char *lower = strchr( str, TOLOWER(c) );
}
/* Index generation function */
-int octetStringIndexer(
+static int octetStringIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
int i;
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- /* we should have at least one value at this point */
- assert( values != NULL && values[0] != NULL );
-
for( i=0; values[i] != NULL; i++ ) {
/* just count them */
}
- keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
+ /* we should have at least one value at this point */
+ assert( i > 0 );
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ keys = ch_malloc( sizeof( struct berval ) * (i+1) );
+
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
for( i=0; values[i] != NULL; i++ ) {
HASH_Init( &HASHcontext );
values[i]->bv_val, values[i]->bv_len );
HASH_Final( HASHdigest, &HASHcontext );
- keys[i] = ber_bvdup( &digest );
+ ber_dupbv( &keys[i], &digest );
}
- keys[i] = NULL;
+ keys[i].bv_val = NULL;
*keysp = keys;
}
/* Index generation function */
-int octetStringFilter(
+static int octetStringFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval *value = (struct berval *) assertValue;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
- keys = ch_malloc( sizeof( struct berval * ) * 2 );
+ keys = ch_malloc( sizeof( struct berval ) * 2 );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
value->bv_val, value->bv_len );
HASH_Final( HASHdigest, &HASHcontext );
- keys[0] = ber_bvdup( &digest );
- keys[1] = NULL;
+ ber_dupbv( keys, &digest );
+ keys[1].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
-static int
-dnValidate(
- Syntax *syntax,
- struct berval *in )
-{
- int rc;
- char *dn;
-
- if( in->bv_len == 0 ) return LDAP_SUCCESS;
-
- dn = ch_strdup( in->bv_val );
-
- if( dn == NULL ) {
- return LDAP_INVALID_SYNTAX;
-
- } else if ( strlen( in->bv_val ) != in->bv_len ) {
- rc = LDAP_INVALID_SYNTAX;
-
- } else if ( dn_validate( dn ) == NULL ) {
- rc = LDAP_INVALID_SYNTAX;
-
- } else {
- rc = LDAP_SUCCESS;
- }
-
- ch_free( dn );
- return rc;
-}
-
-int
-dnNormalize(
- Syntax *syntax,
- struct berval *val,
- struct berval **normalized )
-{
- struct berval *out;
-
- if ( val->bv_len != 0 ) {
- char *dn;
- out = ber_bvstr( UTF8normalize( val->bv_val, UTF8_CASEFOLD ) );
-
- dn = dn_validate( out->bv_val );
-
- if( dn == NULL ) {
- ber_bvfree( out );
- return LDAP_INVALID_SYNTAX;
- }
-
- out->bv_val = dn;
- out->bv_len = strlen( dn );
- } else {
- out = ber_bvdup( val );
- }
-
- *normalized = out;
- return LDAP_SUCCESS;
-}
-
-static int
-dnMatch(
- int *matchp,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *value,
- void *assertedValue )
-{
- int match;
- struct berval *asserted = (struct berval *) assertedValue;
-
- match = value->bv_len - asserted->bv_len;
-
- if( match == 0 ) {
-#ifdef USE_DN_NORMALIZE
- match = strcmp( value->bv_val, asserted->bv_val );
-#else
- match = strcasecmp( value->bv_val, asserted->bv_val );
-#endif
- }
-
-#ifdef NEW_LOGGING
- LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
- "dnMatch: %d\n %s\n %s\n", match,
- value->bv_val, asserted->bv_val ));
-#else
- Debug( LDAP_DEBUG_ARGS, "dnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
- match, value->bv_val, asserted->bv_val );
-#endif
-
-
- *matchp = match;
- return LDAP_SUCCESS;
-}
-
static int
nameUIDValidate(
Syntax *syntax,
if( in->bv_len == 0 ) return LDAP_SUCCESS;
dn = ber_bvdup( in );
+ if( !dn ) return LDAP_OTHER;
- if( dn->bv_val[dn->bv_len-1] == '\'' ) {
+ if( dn->bv_val[dn->bv_len-1] == 'B'
+ && dn->bv_val[dn->bv_len-2] == '\'' )
+ {
/* assume presence of optional UID */
ber_len_t i;
- for(i=dn->bv_len-2; i>2; i--) {
+ for(i=dn->bv_len-3; i>1; i--) {
if( dn->bv_val[i] != '0' && dn->bv_val[i] != '1' ) {
break;
}
}
- if( dn->bv_val[i] != '\'' ) {
- return LDAP_INVALID_SYNTAX;
- }
- if( dn->bv_val[i-1] != 'B' ) {
- return LDAP_INVALID_SYNTAX;
- }
- if( dn->bv_val[i-2] != '#' ) {
+ if( dn->bv_val[i] != '\'' ||
+ dn->bv_val[i-1] != '#' ) {
+ ber_bvfree( dn );
return LDAP_INVALID_SYNTAX;
}
- /* trim the UID to allow use of dn_validate */
- dn->bv_val[i-2] = '\0';
+ /* trim the UID to allow use of dnValidate */
+ dn->bv_val[i-1] = '\0';
+ dn->bv_len = i-1;
}
- rc = dn_validate( dn->bv_val ) == NULL
- ? LDAP_INVALID_SYNTAX : LDAP_SUCCESS;
+ rc = dnValidate( NULL, dn );
ber_bvfree( dn );
return rc;
nameUIDNormalize(
Syntax *syntax,
struct berval *val,
- struct berval **normalized )
+ struct berval *normalized )
{
- struct berval *out = ber_bvdup( val );
+ struct berval out;
+ int rc;
- if( out->bv_len != 0 ) {
- char *dn;
+ ber_dupbv( &out, val );
+ if( out.bv_len != 0 ) {
ber_len_t dnlen;
char *uid = NULL;
ber_len_t uidlen = 0;
- if( out->bv_val[out->bv_len-1] == '\'' ) {
+ if( out.bv_val[out.bv_len-1] == '\'' ) {
/* assume presence of optional UID */
- uid = strrchr( out->bv_val, '#' );
+ uid = strrchr( out.bv_val, '#' );
if( uid == NULL ) {
- ber_bvfree( out );
+ free( out.bv_val );
return LDAP_INVALID_SYNTAX;
}
- uidlen = out->bv_len - (out->bv_val - uid);
+ uidlen = out.bv_len - (uid - out.bv_val);
/* temporarily trim the UID */
*uid = '\0';
+ out.bv_len -= uidlen;
}
#ifdef USE_DN_NORMALIZE
- dn = dn_normalize( out->bv_val );
+ rc = dnNormalize2( NULL, &out, normalized );
#else
- dn = dn_validate( out->bv_val );
+ rc = dnPretty2( NULL, &out, normalized );
#endif
- if( dn == NULL ) {
- ber_bvfree( out );
+ if( rc != LDAP_SUCCESS ) {
+ free( out.bv_val );
return LDAP_INVALID_SYNTAX;
}
- dnlen = strlen(dn);
+ dnlen = normalized->bv_len;
if( uidlen ) {
+ struct berval b2;
+ b2.bv_val = ch_malloc(dnlen + uidlen + 1);
+ SAFEMEMCPY( b2.bv_val, normalized->bv_val, dnlen );
+
/* restore the separator */
*uid = '#';
/* shift the UID */
- SAFEMEMCPY( &dn[dnlen], uid, uidlen );
+ SAFEMEMCPY( normalized->bv_val+dnlen, uid, uidlen );
+ b2.bv_len = dnlen + uidlen;
+ normalized->bv_val[dnlen+uidlen] = '\0';
+ free(normalized->bv_val);
+ *normalized = b2;
}
-
- out->bv_val = dn;
- out->bv_len = dnlen + uidlen;
+ free( out.bv_val );
}
- *normalized = out;
return LDAP_SUCCESS;
}
return LDAP_INVALID_SYNTAX;
}
- if( in->bv_val[0] != 'B' ||
- in->bv_val[1] != '\'' ||
- in->bv_val[in->bv_len-1] != '\'' )
+ /*
+ * rfc 2252 section 6.3 Bit String
+ * bitstring = "'" *binary-digit "'"
+ * binary-digit = "0" / "1"
+ * example: '0101111101'B
+ */
+
+ if( in->bv_val[0] != '\'' ||
+ in->bv_val[in->bv_len-2] != '\'' ||
+ in->bv_val[in->bv_len-1] != 'B' )
{
return LDAP_INVALID_SYNTAX;
}
- for( i=in->bv_len-2; i>1; i-- ) {
+ for( i=in->bv_len-3; i>0; i-- ) {
if( in->bv_val[i] != '0' && in->bv_val[i] != '1' ) {
return LDAP_INVALID_SYNTAX;
}
return LDAP_SUCCESS;
}
+static int
+bitStringNormalize(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *normalized )
+{
+ /*
+ * A normalized bitString is has no extaneous (leading) zero bits.
+ * That is, '00010'B is normalized to '10'B
+ * However, as a special case, '0'B requires no normalization.
+ */
+ char *p;
+
+ /* start at the first bit */
+ p = &val->bv_val[1];
+
+ /* Find the first non-zero bit */
+ while ( *p == '0' ) p++;
+
+ if( *p == '\'' ) {
+ /* no non-zero bits */
+ ber_str2bv( "\'0\'B", sizeof("\'0\'B") - 1, 1, normalized );
+ goto done;
+ }
+
+ normalized->bv_val = ch_malloc( val->bv_len + 1 );
+
+ normalized->bv_val[0] = '\'';
+ normalized->bv_len = 1;
+
+ for( ; *p != '\0'; p++ ) {
+ normalized->bv_val[normalized->bv_len++] = *p;
+ }
+
+ normalized->bv_val[normalized->bv_len] = '\0';
+
+done:
+ return LDAP_SUCCESS;
+}
+
/*
* Handling boolean syntax and matching is quite rigid.
* A more flexible approach would be to allow a variety
UTF8StringNormalize(
Syntax *syntax,
struct berval *val,
- struct berval **normalized )
+ struct berval *normalized )
{
- struct berval *newval;
char *p, *q, *s;
-
- newval = ch_malloc( sizeof( struct berval ) );
+ int len = 0;
p = val->bv_val;
/* Ignore initial whitespace */
- while ( ldap_utf8_isspace( p ) ) {
- LDAP_UTF8_INCR( p );
+ /* All space is ASCII. All ASCII is 1 byte */
+ while ( ASCII_SPACE( *p ) ) {
+ p++;
}
if( *p == '\0' ) {
- ch_free( newval );
return LDAP_INVALID_SYNTAX;
}
- newval->bv_val = ch_strdup( p );
- p = q = newval->bv_val;
+ ber_str2bv( p, val->bv_len - (p - val->bv_val), 1, normalized );
+
+ assert( normalized->bv_val );
+
+ p = q = normalized->bv_val;
s = NULL;
while ( *p ) {
- int len;
-
- if ( ldap_utf8_isspace( p ) ) {
- len = LDAP_UTF8_COPY(q,p);
- s=q;
- p+=len;
- q+=len;
+ q += len;
+ if ( ASCII_SPACE( *p ) ) {
+ s = q - len;
+ len = 1;
+ *q = *p++;
/* Ignore the extra whitespace */
- while ( ldap_utf8_isspace( p ) ) {
- LDAP_UTF8_INCR( p );
+ while ( ASCII_SPACE( *p ) ) {
+ p++;
}
} else {
len = LDAP_UTF8_COPY(q,p);
s=NULL;
p+=len;
- q+=len;
}
}
- assert( *newval->bv_val );
- assert( newval->bv_val < p );
- assert( q <= p );
+ assert( normalized->bv_val < p );
+ assert( q+len <= p );
/* cannot start with a space */
- assert( !ldap_utf8_isspace(newval->bv_val) );
+ assert( !ASCII_SPACE(normalized->bv_val[0]) );
/*
* If the string ended in space, backup the pointer one
*/
if ( s != NULL ) {
+ len = q - s;
q = s;
}
/* cannot end with a space */
- assert( !ldap_utf8_isspace( LDAP_UTF8_PREV(q) ) );
+ assert( !ASCII_SPACE( *q ) );
+
+ q += len;
/* null terminate */
*q = '\0';
- newval->bv_len = q - newval->bv_val;
- *normalized = newval;
+ normalized->bv_len = q - normalized->bv_val;
return LDAP_SUCCESS;
}
-/* Returns Unicode cannonically normalized copy of a substring assertion
+/* Returns Unicode canonically normalized copy of a substring assertion
* Skipping attribute description */
-SubstringsAssertion *
+static SubstringsAssertion *
UTF8SubstringsassertionNormalize(
SubstringsAssertion *sa,
char casefold )
return NULL;
}
- if( sa->sa_initial != NULL ) {
- nsa->sa_initial = ber_bvstr( UTF8normalize( sa->sa_initial->bv_val, casefold ) );
- if( nsa->sa_initial == NULL ) {
+ if( sa->sa_initial.bv_val != NULL ) {
+ ber_str2bv( UTF8normalize( &sa->sa_initial, casefold ), 0,
+ 0, &nsa->sa_initial );
+ if( nsa->sa_initial.bv_val == NULL ) {
goto err;
}
}
if( sa->sa_any != NULL ) {
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
+ for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
/* empty */
}
- nsa->sa_any = (struct berval **)ch_malloc( (i + 1) * sizeof(struct berval *) );
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- nsa->sa_any[i] = ber_bvstr( UTF8normalize( sa->sa_any[i]->bv_val, casefold ) );
- if( nsa->sa_any[i] == NULL ) {
+ nsa->sa_any = (struct berval *)ch_malloc( (i + 1) * sizeof(struct berval) );
+ for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
+ ber_str2bv( UTF8normalize( &sa->sa_any[i], casefold ),
+ 0, 0, &nsa->sa_any[i] );
+ if( nsa->sa_any[i].bv_val == NULL ) {
goto err;
}
}
- nsa->sa_any[i] = NULL;
+ nsa->sa_any[i].bv_val = NULL;
}
- if( sa->sa_final != NULL ) {
- nsa->sa_final = ber_bvstr( UTF8normalize( sa->sa_final->bv_val, casefold ) );
- if( nsa->sa_final == NULL ) {
+ if( sa->sa_final.bv_val != NULL ) {
+ ber_str2bv( UTF8normalize( &sa->sa_final, casefold ), 0,
+ 0, &nsa->sa_final );
+ if( nsa->sa_final.bv_val == NULL ) {
goto err;
}
}
return nsa;
err:
- ch_free( nsa->sa_final );
- ber_bvecfree( nsa->sa_any );
- ch_free( nsa->sa_initial );
+ if ( nsa->sa_final.bv_val ) free( nsa->sa_final.bv_val );
+ if ( nsa->sa_any )bvarray_free( nsa->sa_any );
+ if ( nsa->sa_initial.bv_val ) free( nsa->sa_initial.bv_val );
ch_free( nsa );
return NULL;
}
-#if defined(SLAPD_APPROX_MULTISTRING)
+/* Strip characters with the 8th bit set */
+static char *
+strip8bitChars(
+ char *in )
+{
+ char *p = in, *q;
+
+ if( in == NULL ) {
+ return NULL;
+ }
+ while( *p ) {
+ if( *p & 0x80 ) {
+ q = p;
+ while( *++q & 0x80 ) {
+ /* empty */
+ }
+ p = memmove(p, q, strlen(q) + 1);
+ } else {
+ p++;
+ }
+ }
+ return in;
+}
+
+#ifndef SLAPD_APPROX_OLDSINGLESTRING
#if defined(SLAPD_APPROX_INITIALS)
#define SLAPD_APPROX_DELIMITER "._ "
struct berval *value,
void *assertedValue )
{
- char *val, *assertv, **values, **words, *c;
+ char *val, *nval, *assertv, **values, **words, *c;
int i, count, len, nextchunk=0, nextavail=0;
+ size_t avlen;
+
+ /* Yes, this is necessary */
+ nval = UTF8normalize( value, UTF8_NOCASEFOLD );
+ if( nval == NULL ) {
+ *matchp = 1;
+ return LDAP_SUCCESS;
+ }
+ strip8bitChars( nval );
+ /* Yes, this is necessary */
+ assertv = UTF8normalize( ((struct berval *)assertedValue),
+ UTF8_NOCASEFOLD );
+ if( assertv == NULL ) {
+ ch_free( nval );
+ *matchp = 1;
+ return LDAP_SUCCESS;
+ }
+ strip8bitChars( assertv );
+ avlen = strlen( assertv );
/* Isolate how many words there are */
- val = ch_strdup( value->bv_val );
- for( c=val,count=1; *c; c++ ) {
+ for( c=nval,count=1; *c; c++ ) {
c = strpbrk( c, SLAPD_APPROX_DELIMITER );
if ( c == NULL ) break;
*c = '\0';
/* Get a phonetic copy of each word */
words = (char **)ch_malloc( count * sizeof(char *) );
values = (char **)ch_malloc( count * sizeof(char *) );
- for( c=val,i=0; i<count; i++,c+=strlen(c)+1 ) {
+ for( c=nval,i=0; i<count; i++,c+=strlen(c)+1 ) {
words[i] = c;
values[i] = phonetic(c);
}
-
- /* Work through the asserted value's words, to see if at least some
+ /* Work through the asserted value's words, to see if at least some
of the words are there, in the same order. */
- assertv = ch_strdup( ((struct berval *)assertedValue)->bv_val );
len = 0;
- while ( nextchunk < ((struct berval *)assertedValue)->bv_len ) {
+ while ( (size_t) nextchunk < avlen ) {
len = strcspn( assertv + nextchunk, SLAPD_APPROX_DELIMITER);
if( len == 0 ) {
nextchunk++;
break;
}
}
+ ch_free( val );
}
/* This chunk in the asserted value was NOT within the *value. */
}
/* Cleanup allocs */
- ch_free( assertv );
+ free( assertv );
for( i=0; i<count; i++ ) {
ch_free( values[i] );
}
ch_free( values );
ch_free( words );
- ch_free( val );
+ ch_free( nval );
return LDAP_SUCCESS;
}
-
-int
+static int
approxIndexer(
slap_mask_t use,
slap_mask_t flags,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
char *val, *c;
int i,j, len, wordcount, keycount=0;
- struct berval **newkeys, **keys=NULL;
-
+ struct berval *newkeys, *keys=NULL;
for( j=0; values[j] != NULL; j++ ) {
+ /* Yes, this is necessary */
+ val = UTF8normalize( values[j], UTF8_NOCASEFOLD );
+ strip8bitChars( val );
/* Isolate how many words there are. There will be a key for each */
- val = ch_strdup( values[j]->bv_val );
for( wordcount=0,c=val; *c; c++) {
len = strcspn(c, SLAPD_APPROX_DELIMITER);
if( len >= SLAPD_APPROX_WORDLEN ) wordcount++;
}
/* Allocate/increase storage to account for new keys */
- newkeys = (struct berval **)ch_malloc( (keycount + wordcount + 1)
- * sizeof(struct berval *) );
- memcpy( newkeys, keys, keycount * sizeof(struct berval *) );
+ newkeys = (struct berval *)ch_malloc( (keycount + wordcount + 1)
+ * sizeof(struct berval) );
+ memcpy( newkeys, keys, keycount * sizeof(struct berval) );
if( keys ) ch_free( keys );
keys = newkeys;
for( c=val,i=0; i<wordcount; c+=len+1 ) {
len = strlen( c );
if( len < SLAPD_APPROX_WORDLEN ) continue;
- keys[keycount] = (struct berval *)ch_malloc( sizeof(struct berval) );
- keys[keycount]->bv_val = phonetic( c );
- keys[keycount]->bv_len = strlen( keys[keycount]->bv_val );
+ ber_str2bv( phonetic( c ), 0, 0, &keys[keycount] );
keycount++;
i++;
}
- ch_free( val );
+ free( val );
}
- keys[keycount] = NULL;
+ keys[keycount].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
-
-int
+static int
approxFilter(
slap_mask_t use,
slap_mask_t flags,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
char *val, *c;
int i, count, len;
- struct berval **keys;
-
+ struct berval *keys;
+
+ /* Yes, this is necessary */
+ val = UTF8normalize( ((struct berval *)assertValue),
+ UTF8_NOCASEFOLD );
+ if( val == NULL ) {
+ keys = (struct berval *)ch_malloc( sizeof(struct berval) );
+ keys[0].bv_val = NULL;
+ *keysp = keys;
+ return LDAP_SUCCESS;
+ }
+ strip8bitChars( val );
/* Isolate how many words there are. There will be a key for each */
- val = ch_strdup( ((struct berval *)assertValue)->bv_val );
for( count=0,c=val; *c; c++) {
len = strcspn(c, SLAPD_APPROX_DELIMITER);
if( len >= SLAPD_APPROX_WORDLEN ) count++;
}
/* Allocate storage for new keys */
- keys = (struct berval **)ch_malloc( (count + 1) * sizeof(struct berval *) );
+ keys = (struct berval *)ch_malloc( (count + 1) * sizeof(struct berval) );
/* Get a phonetic copy of each word */
for( c=val,i=0; i<count; c+=len+1 ) {
len = strlen(c);
if( len < SLAPD_APPROX_WORDLEN ) continue;
- keys[i] = (struct berval *)ch_malloc( sizeof(struct berval) );
- keys[i]->bv_val = phonetic( c );
- keys[i]->bv_len = strlen( keys[i]->bv_val );
+ ber_str2bv( phonetic( c ), 0, 0, &keys[i] );
i++;
}
- ch_free( val );
+ free( val );
- keys[count] = NULL;
+ keys[count].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
void *assertedValue )
{
char *vapprox, *avapprox;
+ char *s, *t;
- vapprox = phonetic( value->bv_val );
- avapprox = phonetic( ((struct berval *)assertedValue)->bv_val);
+ /* Yes, this is necessary */
+ s = UTF8normalize( value, UTF8_NOCASEFOLD );
+ if( s == NULL ) {
+ *matchp = 1;
+ return LDAP_SUCCESS;
+ }
+
+ /* Yes, this is necessary */
+ t = UTF8normalize( ((struct berval *)assertedValue),
+ UTF8_NOCASEFOLD );
+ if( t == NULL ) {
+ free( s );
+ *matchp = -1;
+ return LDAP_SUCCESS;
+ }
+
+ vapprox = phonetic( strip8bitChars( s ) );
+ avapprox = phonetic( strip8bitChars( t ) );
+
+ free( s );
+ free( t );
*matchp = strcmp( vapprox, avapprox );
return LDAP_SUCCESS;
}
-int
+static int
approxIndexer(
slap_mask_t use,
slap_mask_t flags,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
int i;
- struct berval **keys;
-
+ struct berval *keys;
+ char *s;
for( i=0; values[i] != NULL; i++ ) {
- /* just count them */
+ /* empty - just count them */
}
+
+ /* we should have at least one value at this point */
assert( i > 0 );
- keys = (struct berval **)ch_malloc( sizeof( struct berval * ) * (i+1) );
+ keys = (struct berval *)ch_malloc( sizeof( struct berval ) * (i+1) );
/* Copy each value and run it through phonetic() */
for( i=0; values[i] != NULL; i++ ) {
- keys[i] = ch_malloc( sizeof( struct berval * ) );
- keys[i]->bv_val = phonetic( values[i]->bv_val );
- keys[i]->bv_len = strlen( keys[i]->bv_val );
+ /* Yes, this is necessary */
+ s = UTF8normalize( values[i], UTF8_NOCASEFOLD );
+
+ /* strip 8-bit chars and run through phonetic() */
+ ber_str2bv( phonetic( strip8bitChars( s ) ), 0, 0, &keys[i] );
+ free( s );
}
- keys[i] = NULL;
+ keys[i].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
-int
+static int
approxFilter(
slap_mask_t use,
slap_mask_t flags,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
- struct berval **keys;
-
+ struct berval *keys;
+ char *s;
- keys = (struct berval **)ch_malloc( sizeof( struct berval * ) * 2 );
+ keys = (struct berval *)ch_malloc( sizeof( struct berval * ) * 2 );
- /* Copy the value and run it through phonetic() */
- keys[0] = ch_malloc( sizeof( struct berval * ) );
- keys[0]->bv_val = phonetic( ((struct berval *)assertValue)->bv_val );
- keys[0]->bv_len = strlen( keys[0]->bv_val );
- keys[1] = NULL;
+ /* Yes, this is necessary */
+ s = UTF8normalize( ((struct berval *)assertValue),
+ UTF8_NOCASEFOLD );
+ if( s == NULL ) {
+ keys[0] = NULL;
+ } else {
+ /* strip 8-bit chars and run through phonetic() */
+ keys[0] = ber_bvstr( phonetic( strip8bitChars( s ) ) );
+ free( s );
+ keys[1] = NULL;
+ }
*keysp = keys;
return LDAP_SUCCESS;
}
static int
-caseExactSubstringsMatch(
+caseExactIgnoreSubstringsMatch(
int *matchp,
slap_mask_t flags,
Syntax *syntax,
void *assertedValue )
{
int match = 0;
- SubstringsAssertion *sub;
+ SubstringsAssertion *sub = NULL;
struct berval left;
int i;
ber_len_t inlen=0;
- char *nav;
+ char *nav, casefold;
+
+ casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
- nav = UTF8normalize( value->bv_val, UTF8_NOCASEFOLD );
+ nav = UTF8normalize( value, casefold );
if( nav == NULL ) {
match = 1;
goto done;
left.bv_val = nav;
left.bv_len = strlen( nav );
- sub = UTF8SubstringsassertionNormalize( assertedValue, UTF8_NOCASEFOLD );
+ sub = UTF8SubstringsassertionNormalize( assertedValue, casefold );
if( sub == NULL ) {
match = -1;
goto done;
}
/* Add up asserted input length */
- if( sub->sa_initial ) {
- inlen += sub->sa_initial->bv_len;
+ if( sub->sa_initial.bv_val ) {
+ inlen += sub->sa_initial.bv_len;
}
if( sub->sa_any ) {
- for(i=0; sub->sa_any[i] != NULL; i++) {
- inlen += sub->sa_any[i]->bv_len;
+ for(i=0; sub->sa_any[i].bv_val != NULL; i++) {
+ inlen += sub->sa_any[i].bv_len;
}
}
- if( sub->sa_final ) {
- inlen += sub->sa_final->bv_len;
+ if( sub->sa_final.bv_val ) {
+ inlen += sub->sa_final.bv_len;
}
- if( sub->sa_initial ) {
+ if( sub->sa_initial.bv_val ) {
if( inlen > left.bv_len ) {
match = 1;
goto done;
}
- match = strncmp( sub->sa_initial->bv_val, left.bv_val,
- sub->sa_initial->bv_len );
+ match = strncmp( sub->sa_initial.bv_val, left.bv_val,
+ sub->sa_initial.bv_len );
if( match != 0 ) {
goto done;
}
- left.bv_val += sub->sa_initial->bv_len;
- left.bv_len -= sub->sa_initial->bv_len;
- inlen -= sub->sa_initial->bv_len;
+ left.bv_val += sub->sa_initial.bv_len;
+ left.bv_len -= sub->sa_initial.bv_len;
+ inlen -= sub->sa_initial.bv_len;
}
- if( sub->sa_final ) {
+ if( sub->sa_final.bv_val ) {
if( inlen > left.bv_len ) {
match = 1;
goto done;
}
- match = strncmp( sub->sa_final->bv_val,
- &left.bv_val[left.bv_len - sub->sa_final->bv_len],
- sub->sa_final->bv_len );
+ match = strncmp( sub->sa_final.bv_val,
+ &left.bv_val[left.bv_len - sub->sa_final.bv_len],
+ sub->sa_final.bv_len );
if( match != 0 ) {
goto done;
}
- left.bv_len -= sub->sa_final->bv_len;
- inlen -= sub->sa_final->bv_len;
+ left.bv_len -= sub->sa_final.bv_len;
+ inlen -= sub->sa_final.bv_len;
}
if( sub->sa_any ) {
- for(i=0; sub->sa_any[i]; i++) {
+ for(i=0; sub->sa_any[i].bv_val; i++) {
ber_len_t idx;
char *p;
goto done;
}
- if( sub->sa_any[i]->bv_len == 0 ) {
+ if( sub->sa_any[i].bv_len == 0 ) {
continue;
}
- p = strchr( left.bv_val, *sub->sa_any[i]->bv_val );
+ p = strchr( left.bv_val, *sub->sa_any[i].bv_val );
if( p == NULL ) {
match = 1;
if( idx >= left.bv_len ) {
/* this shouldn't happen */
+ free( nav );
+ if ( sub->sa_final.bv_val )
+ ch_free( sub->sa_final.bv_val );
+ if ( sub->sa_any )
+ bvarray_free( sub->sa_any );
+ if ( sub->sa_initial.bv_val )
+ ch_free( sub->sa_initial.bv_val );
+ ch_free( sub );
return LDAP_OTHER;
}
left.bv_val = p;
left.bv_len -= idx;
- if( sub->sa_any[i]->bv_len > left.bv_len ) {
+ if( sub->sa_any[i].bv_len > left.bv_len ) {
/* not enough left */
match = 1;
goto done;
}
match = strncmp( left.bv_val,
- sub->sa_any[i]->bv_val,
- sub->sa_any[i]->bv_len );
+ sub->sa_any[i].bv_val,
+ sub->sa_any[i].bv_len );
if( match != 0 ) {
left.bv_val++;
goto retry;
}
- left.bv_val += sub->sa_any[i]->bv_len;
- left.bv_len -= sub->sa_any[i]->bv_len;
- inlen -= sub->sa_any[i]->bv_len;
+ left.bv_val += sub->sa_any[i].bv_len;
+ left.bv_len -= sub->sa_any[i].bv_len;
+ inlen -= sub->sa_any[i].bv_len;
}
}
done:
free( nav );
if( sub != NULL ) {
- ch_free( sub->sa_final );
- ber_bvecfree( sub->sa_any );
- ch_free( sub->sa_initial );
+ if ( sub->sa_final.bv_val ) free( sub->sa_final.bv_val );
+ if ( sub->sa_any ) bvarray_free( sub->sa_any );
+ if ( sub->sa_initial.bv_val ) free( sub->sa_initial.bv_val );
ch_free( sub );
}
*matchp = match;
}
/* Index generation function */
-int caseExactIndexer(
+static int caseExactIgnoreIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
int i;
+ char casefold;
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- /* we should have at least one value at this point */
- assert( values != NULL && values[0] != NULL );
-
for( i=0; values[i] != NULL; i++ ) {
- /* just count them */
+ /* empty - just count them */
}
- keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
+ /* we should have at least one value at this point */
+ assert( i > 0 );
+
+ keys = ch_malloc( sizeof( struct berval ) * (i+1) );
+
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ casefold = strcmp( mr->smr_oid, caseExactMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
for( i=0; values[i] != NULL; i++ ) {
- struct berval *value;
- value = ber_bvstr( UTF8normalize( values[i]->bv_val,
- UTF8_NOCASEFOLD ) );
+ struct berval value;
+ ber_str2bv( UTF8normalize( values[i], casefold ), 0, 0,
+ &value );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- value->bv_val, value->bv_len );
+ value.bv_val, value.bv_len );
HASH_Final( HASHdigest, &HASHcontext );
- ber_bvfree( value );
+ free( value.bv_val );
- keys[i] = ber_bvdup( &digest );
+ ber_dupbv( &keys[i], &digest );
}
- keys[i] = NULL;
+ keys[i].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
/* Index generation function */
-int caseExactFilter(
+static int caseExactIgnoreFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
+ char casefold;
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
- struct berval *value;
+ struct berval value;
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
+
+ casefold = strcmp( mr->smr_oid, caseExactMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
- value = ber_bvstr( UTF8normalize( ((struct berval *) assertValue)->bv_val,
- UTF8_NOCASEFOLD ) );
+ ber_str2bv( UTF8normalize( ((struct berval *) assertValue), casefold ),
+ 0, 0, &value );
/* This usually happens if filter contains bad UTF8 */
- if( value == NULL ) {
- keys = ch_malloc( sizeof( struct berval * ) );
- keys[0] = NULL;
+ if( value.bv_val == NULL ) {
+ keys = ch_malloc( sizeof( struct berval ) );
+ keys[0].bv_val = NULL;
return LDAP_SUCCESS;
}
- keys = ch_malloc( sizeof( struct berval * ) * 2 );
+ keys = ch_malloc( sizeof( struct berval ) * 2 );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- value->bv_val, value->bv_len );
+ value.bv_val, value.bv_len );
HASH_Final( HASHdigest, &HASHcontext );
- keys[0] = ber_bvdup( &digest );
- keys[1] = NULL;
+ ber_dupbv( keys, &digest );
+ keys[1].bv_val = NULL;
- ber_bvfree( value );
+ free( value.bv_val );
*keysp = keys;
return LDAP_SUCCESS;
}
/* Substrings Index generation function */
-int caseExactSubstringsIndexer(
+static int caseExactIgnoreSubstringsIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
+ char casefold;
ber_len_t i, nkeys;
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
struct berval **nvalues;
HASH_CONTEXT HASHcontext;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- /* we should have at least one value at this point */
- assert( values != NULL && values[0] != NULL );
-
nkeys=0;
- /* create normalized copy of values */
for( i=0; values[i] != NULL; i++ ) {
- /* empty */
+ /* empty - just count them */
}
+
+ /* we should have at least one value at this point */
+ assert( i > 0 );
+
+ casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
nvalues = ch_malloc( sizeof( struct berval * ) * (i+1) );
for( i=0; values[i] != NULL; i++ ) {
- nvalues[i] = ber_bvstr( UTF8normalize( values[i]->bv_val,
- UTF8_NOCASEFOLD ) );
+ nvalues[i] = ber_str2bv( UTF8normalize( values[i], casefold ),
+ 0, 0, NULL );
}
nvalues[i] = NULL;
values = nvalues;
if( nkeys == 0 ) {
/* no keys to generate */
*keysp = NULL;
+ ber_bvecfree( nvalues );
return LDAP_SUCCESS;
}
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
+ keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
nkeys=0;
for( i=0; values[i] != NULL; i++ ) {
ber_len_t j,max;
- struct berval *value;
if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
- value = values[i];
-
if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
- ( value->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
+ ( values[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
{
char pre = SLAP_INDEX_SUBSTR_PREFIX;
- max = value->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
+ max = values[i]->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
for( j=0; j<max; j++ ) {
HASH_Init( &HASHcontext );
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- &value->bv_val[j],
+ &values[i]->bv_val[j],
SLAP_INDEX_SUBSTR_MAXLEN );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
}
- max = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
+ max = SLAP_INDEX_SUBSTR_MAXLEN < values[i]->bv_len
+ ? SLAP_INDEX_SUBSTR_MAXLEN : values[i]->bv_len;
for( j=SLAP_INDEX_SUBSTR_MINLEN; j<=max; j++ ) {
char pre;
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- value->bv_val, j );
+ values[i]->bv_val, j );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- &value->bv_val[value->bv_len-j], j );
+ &values[i]->bv_val[values[i]->bv_len-j], j );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
}
}
if( nkeys > 0 ) {
- keys[nkeys] = NULL;
+ keys[nkeys].bv_val = NULL;
*keysp = keys;
} else {
ch_free( keys );
return LDAP_SUCCESS;
}
-int caseExactSubstringsFilter(
+static int caseExactIgnoreSubstringsFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
SubstringsAssertion *sa;
- char pre;
+ char pre, casefold;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
- sa = UTF8SubstringsassertionNormalize( assertValue, UTF8_NOCASEFOLD );
+ casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
+ sa = UTF8SubstringsassertionNormalize( assertValue, casefold );
if( sa == NULL ) {
*keysp = NULL;
return LDAP_SUCCESS;
}
- if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL &&
+ sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
}
if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
ber_len_t i;
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
+ for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
+ if( sa->sa_any[i].bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
/* don't bother accounting for stepping */
- nkeys += sa->sa_any[i]->bv_len -
+ nkeys += sa->sa_any[i].bv_len -
( SLAP_INDEX_SUBSTR_MAXLEN - 1 );
}
}
}
- if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL &&
+ sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
}
if( nkeys == 0 ) {
+ if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
+ if ( sa->sa_any ) bvarray_free( sa->sa_any );
+ if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
+ ch_free( sa );
*keysp = NULL;
return LDAP_SUCCESS;
}
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
+ keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
nkeys = 0;
- if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL &&
+ sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- value = sa->sa_initial;
+ value = &sa->sa_initial;
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
value->bv_val, klen );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
pre = SLAP_INDEX_SUBSTR_PREFIX;
klen = SLAP_INDEX_SUBSTR_MAXLEN;
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
+ for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
+ if( sa->sa_any[i].bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
continue;
}
- value = sa->sa_any[i];
+ value = &sa->sa_any[i];
for(j=0;
j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
&value->bv_val[j], klen );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
}
}
- if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL &&
+ sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- value = sa->sa_final;
+ value = &sa->sa_final;
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
&value->bv_val[value->bv_len-klen], klen );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if( nkeys > 0 ) {
- keys[nkeys] = NULL;
+ keys[nkeys].bv_val = NULL;
*keysp = keys;
} else {
ch_free( keys );
*keysp = NULL;
}
- ch_free( sa->sa_final );
- ber_bvecfree( sa->sa_any );
- ch_free( sa->sa_initial );
+ if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
+ if ( sa->sa_any ) bvarray_free( sa->sa_any );
+ if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
ch_free( sa );
return LDAP_SUCCESS;
}
-
+
static int
caseIgnoreMatch(
int *matchp,
UTF8_CASEFOLD );
return LDAP_SUCCESS;
}
+
+static int
+oidValidate(
+ Syntax *syntax,
+ struct berval *val )
+{
+ ber_len_t i;
+
+ if( val->bv_len == 0 ) {
+ /* disallow empty strings */
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ if( OID_LEADCHAR(val->bv_val[0]) ) {
+ int dot = 0;
+ for(i=1; i < val->bv_len; i++) {
+ if( OID_SEPARATOR( val->bv_val[i] ) ) {
+ if( dot++ ) return 1;
+ } else if ( OID_CHAR( val->bv_val[i] ) ) {
+ dot = 0;
+ } else {
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+
+ return !dot ? LDAP_SUCCESS : LDAP_INVALID_SYNTAX;
+
+ } else if( DESC_LEADCHAR(val->bv_val[0]) ) {
+ for(i=1; i < val->bv_len; i++) {
+ if( !DESC_CHAR(val->bv_val[i] ) ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+
+ return LDAP_SUCCESS;
+ }
+
+ return LDAP_INVALID_SYNTAX;
+}
static int
-caseIgnoreSubstringsMatch(
+integerMatch(
int *matchp,
slap_mask_t flags,
Syntax *syntax,
struct berval *value,
void *assertedValue )
{
- int match = 0;
- SubstringsAssertion *sub;
- struct berval left;
- int i;
- ber_len_t inlen=0;
- char *nav;
+ char *v, *av;
+ int vsign=0, avsign=0;
+ struct berval *asserted;
+ ber_len_t vlen, avlen;
- nav = UTF8normalize( value->bv_val, UTF8_CASEFOLD );
- if( nav == NULL ) {
- match = 1;
- goto done;
- }
- left.bv_val = nav;
- left.bv_len = strlen( nav );
- sub = UTF8SubstringsassertionNormalize( assertedValue, UTF8_CASEFOLD );
- if( sub == NULL ) {
- match = -1;
- goto done;
- }
+ /* Start off pessimistic */
+ *matchp = 1;
- /* Add up asserted input length */
- if( sub->sa_initial ) {
- inlen += sub->sa_initial->bv_len;
- }
- if( sub->sa_any ) {
- for(i=0; sub->sa_any[i] != NULL; i++) {
- inlen += sub->sa_any[i]->bv_len;
+ /* Skip past leading spaces/zeros, and get the sign of the *value number */
+ v = value->bv_val;
+ vlen = value->bv_len;
+ while( vlen ) {
+ if( ASCII_SPACE(*v) || ( *v == '0' )) {
+ /* empty -- skip spaces */
}
- }
- if( sub->sa_final ) {
- inlen += sub->sa_final->bv_len;
- }
-
- if( sub->sa_initial ) {
- if( inlen > left.bv_len ) {
- match = 1;
- goto done;
- }
-
- match = strncmp( sub->sa_initial->bv_val, left.bv_val,
- sub->sa_initial->bv_len );
-
- if( match != 0 ) {
- goto done;
- }
-
- left.bv_val += sub->sa_initial->bv_len;
- left.bv_len -= sub->sa_initial->bv_len;
- inlen -= sub->sa_initial->bv_len;
- }
-
- if( sub->sa_final ) {
- if( inlen > left.bv_len ) {
- match = 1;
- goto done;
- }
-
- match = strncmp( sub->sa_final->bv_val,
- &left.bv_val[left.bv_len - sub->sa_final->bv_len],
- sub->sa_final->bv_len );
-
- if( match != 0 ) {
- goto done;
- }
-
- left.bv_len -= sub->sa_final->bv_len;
- inlen -= sub->sa_final->bv_len;
- }
-
- if( sub->sa_any ) {
- for(i=0; sub->sa_any[i]; i++) {
- ber_len_t idx;
- char *p;
-
-retry:
- if( inlen > left.bv_len ) {
- /* not enough length */
- match = 1;
- goto done;
- }
-
- if( sub->sa_any[i]->bv_len == 0 ) {
- continue;
- }
-
- p = strchr( left.bv_val, *sub->sa_any[i]->bv_val );
-
- if( p == NULL ) {
- match = 1;
- goto done;
- }
-
- idx = p - left.bv_val;
- assert( idx < left.bv_len );
-
- if( idx >= left.bv_len ) {
- /* this shouldn't happen */
- return LDAP_OTHER;
- }
-
- left.bv_val = p;
- left.bv_len -= idx;
-
- if( sub->sa_any[i]->bv_len > left.bv_len ) {
- /* not enough left */
- match = 1;
- goto done;
- }
-
- match = strncmp( left.bv_val,
- sub->sa_any[i]->bv_val,
- sub->sa_any[i]->bv_len );
-
- if( match != 0 ) {
- left.bv_val++;
- left.bv_len--;
-
- goto retry;
- }
-
- left.bv_val += sub->sa_any[i]->bv_len;
- left.bv_len -= sub->sa_any[i]->bv_len;
- inlen -= sub->sa_any[i]->bv_len;
- }
- }
-
-done:
- free( nav );
- if( sub != NULL ) {
- ch_free( sub->sa_final );
- ber_bvecfree( sub->sa_any );
- ch_free( sub->sa_initial );
- ch_free( sub );
- }
- *matchp = match;
- return LDAP_SUCCESS;
-}
-
-/* Index generation function */
-int caseIgnoreIndexer(
- slap_mask_t use,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *prefix,
- struct berval **values,
- struct berval ***keysp )
-{
- int i;
- size_t slen, mlen;
- struct berval **keys;
- HASH_CONTEXT HASHcontext;
- unsigned char HASHdigest[HASH_BYTES];
- struct berval digest;
- digest.bv_val = HASHdigest;
- digest.bv_len = sizeof(HASHdigest);
-
- /* we should have at least one value at this point */
- assert( values != NULL && values[0] != NULL );
-
- for( i=0; values[i] != NULL; i++ ) {
- /* just count them */
- }
-
- keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
-
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
-
- for( i=0; values[i] != NULL; i++ ) {
- struct berval *value;
- value = ber_bvstr( UTF8normalize( values[i]->bv_val, UTF8_CASEFOLD ) );
- HASH_Init( &HASHcontext );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- HASH_Update( &HASHcontext,
- prefix->bv_val, prefix->bv_len );
- }
- HASH_Update( &HASHcontext,
- syntax->ssyn_oid, slen );
- HASH_Update( &HASHcontext,
- mr->smr_oid, mlen );
- HASH_Update( &HASHcontext,
- value->bv_val, value->bv_len );
- HASH_Final( HASHdigest, &HASHcontext );
-
- ber_bvfree( value );
-
- keys[i] = ber_bvdup( &digest );
- }
-
- keys[i] = NULL;
- *keysp = keys;
- return LDAP_SUCCESS;
-}
-
-/* Index generation function */
-int caseIgnoreFilter(
- slap_mask_t use,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *prefix,
- void * assertValue,
- struct berval ***keysp )
-{
- size_t slen, mlen;
- struct berval **keys;
- HASH_CONTEXT HASHcontext;
- unsigned char HASHdigest[HASH_BYTES];
- struct berval *value;
- struct berval digest;
- digest.bv_val = HASHdigest;
- digest.bv_len = sizeof(HASHdigest);
-
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
-
- value = ber_bvstr( UTF8normalize( ((struct berval *) assertValue)->bv_val,
- UTF8_CASEFOLD ) );
- /* This usually happens if filter contains bad UTF8 */
- if( value == NULL ) {
- keys = ch_malloc( sizeof( struct berval * ) );
- keys[0] = NULL;
- return LDAP_SUCCESS;
- }
-
- keys = ch_malloc( sizeof( struct berval * ) * 2 );
-
- HASH_Init( &HASHcontext );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- HASH_Update( &HASHcontext,
- prefix->bv_val, prefix->bv_len );
- }
- HASH_Update( &HASHcontext,
- syntax->ssyn_oid, slen );
- HASH_Update( &HASHcontext,
- mr->smr_oid, mlen );
- HASH_Update( &HASHcontext,
- value->bv_val, value->bv_len );
- HASH_Final( HASHdigest, &HASHcontext );
-
- keys[0] = ber_bvdup( &digest );
- keys[1] = NULL;
-
- ber_bvfree( value );
-
- *keysp = keys;
-
- return LDAP_SUCCESS;
-}
-
-/* Substrings Index generation function */
-int caseIgnoreSubstringsIndexer(
- slap_mask_t use,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *prefix,
- struct berval **values,
- struct berval ***keysp )
-{
- ber_len_t i, nkeys;
- size_t slen, mlen;
- struct berval **keys;
- struct berval **nvalues;
-
- HASH_CONTEXT HASHcontext;
- unsigned char HASHdigest[HASH_BYTES];
- struct berval digest;
- digest.bv_val = HASHdigest;
- digest.bv_len = sizeof(HASHdigest);
-
- /* we should have at least one value at this point */
- assert( values != NULL && values[0] != NULL );
-
- nkeys=0;
-
- /* create normalized copy of values */
- for( i=0; values[i] != NULL; i++ ) {
- /* empty */
- }
- nvalues = ch_malloc( sizeof( struct berval * ) * (i+1) );
- for( i=0; values[i] != NULL; i++ ) {
- nvalues[i] = ber_bvstr( UTF8normalize( values[i]->bv_val,
- UTF8_CASEFOLD ) );
- }
- nvalues[i] = NULL;
- values = nvalues;
-
- for( i=0; values[i] != NULL; i++ ) {
- /* count number of indices to generate */
- if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) {
- continue;
- }
-
- if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
- if( values[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
- nkeys += SLAP_INDEX_SUBSTR_MAXLEN -
- ( SLAP_INDEX_SUBSTR_MINLEN - 1);
- } else {
- nkeys += values[i]->bv_len - ( SLAP_INDEX_SUBSTR_MINLEN - 1 );
- }
- }
-
- if( flags & SLAP_INDEX_SUBSTR_ANY ) {
- if( values[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
- nkeys += values[i]->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1 );
- }
- }
-
- if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
- if( values[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
- nkeys += SLAP_INDEX_SUBSTR_MAXLEN -
- ( SLAP_INDEX_SUBSTR_MINLEN - 1);
- } else {
- nkeys += values[i]->bv_len - ( SLAP_INDEX_SUBSTR_MINLEN - 1 );
- }
- }
- }
-
- if( nkeys == 0 ) {
- /* no keys to generate */
- *keysp = NULL;
- return LDAP_SUCCESS;
- }
-
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
-
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
-
- nkeys=0;
- for( i=0; values[i] != NULL; i++ ) {
- int j,max;
- struct berval *value;
-
- if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
-
- value = values[i];
-
- if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
- ( value->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
- {
- char pre = SLAP_INDEX_SUBSTR_PREFIX;
- max = value->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
-
- for( j=0; j<max; j++ ) {
- HASH_Init( &HASHcontext );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- HASH_Update( &HASHcontext,
- prefix->bv_val, prefix->bv_len );
- }
-
- HASH_Update( &HASHcontext,
- &pre, sizeof( pre ) );
- HASH_Update( &HASHcontext,
- syntax->ssyn_oid, slen );
- HASH_Update( &HASHcontext,
- mr->smr_oid, mlen );
- HASH_Update( &HASHcontext,
- &value->bv_val[j],
- SLAP_INDEX_SUBSTR_MAXLEN );
- HASH_Final( HASHdigest, &HASHcontext );
-
- keys[nkeys++] = ber_bvdup( &digest );
- }
- }
-
- max = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
-
- for( j=SLAP_INDEX_SUBSTR_MINLEN; j<=max; j++ ) {
- char pre;
-
- if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
- pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- HASH_Init( &HASHcontext );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- HASH_Update( &HASHcontext,
- prefix->bv_val, prefix->bv_len );
- }
- HASH_Update( &HASHcontext,
- &pre, sizeof( pre ) );
- HASH_Update( &HASHcontext,
- syntax->ssyn_oid, slen );
- HASH_Update( &HASHcontext,
- mr->smr_oid, mlen );
- HASH_Update( &HASHcontext,
- value->bv_val, j );
- HASH_Final( HASHdigest, &HASHcontext );
-
- keys[nkeys++] = ber_bvdup( &digest );
- }
-
- if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
- pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- HASH_Init( &HASHcontext );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- HASH_Update( &HASHcontext,
- prefix->bv_val, prefix->bv_len );
- }
- HASH_Update( &HASHcontext,
- &pre, sizeof( pre ) );
- HASH_Update( &HASHcontext,
- syntax->ssyn_oid, slen );
- HASH_Update( &HASHcontext,
- mr->smr_oid, mlen );
- HASH_Update( &HASHcontext,
- &value->bv_val[value->bv_len-j], j );
- HASH_Final( HASHdigest, &HASHcontext );
-
- keys[nkeys++] = ber_bvdup( &digest );
- }
-
+ else if ( *v == '+' ) {
+ vsign = 1;
}
- }
-
- if( nkeys > 0 ) {
- keys[nkeys] = NULL;
- *keysp = keys;
- } else {
- ch_free( keys );
- *keysp = NULL;
- }
-
- ber_bvecfree( nvalues );
- return LDAP_SUCCESS;
-}
-
-int caseIgnoreSubstringsFilter(
- slap_mask_t use,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *prefix,
- void * assertValue,
- struct berval ***keysp )
-{
- SubstringsAssertion *sa;
- char pre;
- ber_len_t nkeys = 0;
- size_t slen, mlen, klen;
- struct berval **keys;
- HASH_CONTEXT HASHcontext;
- unsigned char HASHdigest[HASH_BYTES];
- struct berval *value;
- struct berval digest;
-
- sa = UTF8SubstringsassertionNormalize( assertValue, UTF8_CASEFOLD );
- if( sa == NULL ) {
- *keysp = NULL;
- return LDAP_SUCCESS;
- }
-
- if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
- {
- nkeys++;
- }
-
- if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
- ber_len_t i;
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
- /* don't bother accounting for stepping */
- nkeys += sa->sa_any[i]->bv_len -
- ( SLAP_INDEX_SUBSTR_MAXLEN - 1 );
- }
+ else if ( *v == '-' ) {
+ vsign = -1;
}
- }
-
- if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
- {
- nkeys++;
- }
-
- if( nkeys == 0 ) {
- *keysp = NULL;
- return LDAP_SUCCESS;
- }
-
- digest.bv_val = HASHdigest;
- digest.bv_len = sizeof(HASHdigest);
-
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
-
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
- nkeys = 0;
-
- if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
- {
- pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- value = sa->sa_initial;
-
- klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
-
- HASH_Init( &HASHcontext );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- HASH_Update( &HASHcontext,
- prefix->bv_val, prefix->bv_len );
+ else if ( ASCII_DIGIT(*v) ) {
+ if ( vsign == 0 ) vsign = 1;
+ vsign *= 2;
+ break;
}
- HASH_Update( &HASHcontext,
- &pre, sizeof( pre ) );
- HASH_Update( &HASHcontext,
- syntax->ssyn_oid, slen );
- HASH_Update( &HASHcontext,
- mr->smr_oid, mlen );
- HASH_Update( &HASHcontext,
- value->bv_val, klen );
- HASH_Final( HASHdigest, &HASHcontext );
-
- keys[nkeys++] = ber_bvdup( &digest );
- }
-
- if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
- ber_len_t i, j;
- pre = SLAP_INDEX_SUBSTR_PREFIX;
- klen = SLAP_INDEX_SUBSTR_MAXLEN;
-
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
- continue;
- }
-
- value = sa->sa_any[i];
-
- for(j=0;
- j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
- j += SLAP_INDEX_SUBSTR_STEP )
- {
- HASH_Init( &HASHcontext );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- HASH_Update( &HASHcontext,
- prefix->bv_val, prefix->bv_len );
- }
- HASH_Update( &HASHcontext,
- &pre, sizeof( pre ) );
- HASH_Update( &HASHcontext,
- syntax->ssyn_oid, slen );
- HASH_Update( &HASHcontext,
- mr->smr_oid, mlen );
- HASH_Update( &HASHcontext,
- &value->bv_val[j], klen );
- HASH_Final( HASHdigest, &HASHcontext );
-
- keys[nkeys++] = ber_bvdup( &digest );
- }
+ v++;
+ vlen--;
+ }
+
+ /* Skip past leading spaces/zeros, and get the sign of the *assertedValue
+ number */
+ asserted = (struct berval *) assertedValue;
+ av = asserted->bv_val;
+ avlen = asserted->bv_len;
+ while( avlen ) {
+ if( ASCII_SPACE(*av) || ( *av == '0' )) {
+ /* empty -- skip spaces */
+ }
+ else if ( *av == '+' ) {
+ avsign = 1;
+ }
+ else if ( *av == '-' ) {
+ avsign = -1;
}
+ else if ( ASCII_DIGIT(*av) ) {
+ if ( avsign == 0 ) avsign = 1;
+ avsign *= 2;
+ break;
+ }
+ av++;
+ avlen--;
}
- if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
- {
- pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- value = sa->sa_final;
-
- klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
+ /* The two ?sign vars are now one of :
+ -2 negative non-zero number
+ -1 -0 \
+ 0 0 collapse these three to 0
+ +1 +0 /
+ +2 positive non-zero number
+ */
+ if ( abs( vsign ) == 1 ) vsign = 0;
+ if ( abs( avsign ) == 1 ) avsign = 0;
- HASH_Init( &HASHcontext );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- HASH_Update( &HASHcontext,
- prefix->bv_val, prefix->bv_len );
- }
- HASH_Update( &HASHcontext,
- &pre, sizeof( pre ) );
- HASH_Update( &HASHcontext,
- syntax->ssyn_oid, slen );
- HASH_Update( &HASHcontext,
- mr->smr_oid, mlen );
- HASH_Update( &HASHcontext,
- &value->bv_val[value->bv_len-klen], klen );
- HASH_Final( HASHdigest, &HASHcontext );
+ if( vsign != avsign ) return LDAP_SUCCESS;
- keys[nkeys++] = ber_bvdup( &digest );
+ /* Check the significant digits */
+ while( vlen && avlen ) {
+ if( *v != *av ) break;
+ v++;
+ vlen--;
+ av++;
+ avlen--;
}
- if( nkeys > 0 ) {
- keys[nkeys] = NULL;
- *keysp = keys;
- } else {
- ch_free( keys );
- *keysp = NULL;
+ /* If all digits compared equal, the numbers are equal */
+ if(( vlen == 0 ) && ( avlen == 0 )) {
+ *matchp = 0;
}
- ch_free( sa->sa_final );
- ber_bvecfree( sa->sa_any );
- ch_free( sa->sa_initial );
- ch_free( sa );
-
return LDAP_SUCCESS;
}
-static int
-oidValidate(
- Syntax *syntax,
- struct berval *val )
-{
- ber_len_t i;
-
- if( val->bv_len == 0 ) {
- /* disallow empty strings */
- return LDAP_INVALID_SYNTAX;
- }
-
- if( OID_LEADCHAR(val->bv_val[0]) ) {
- int dot = 0;
- for(i=1; i < val->bv_len; i++) {
- if( OID_SEPARATOR( val->bv_val[i] ) ) {
- if( dot++ ) return 1;
- } else if ( OID_CHAR( val->bv_val[i] ) ) {
- dot = 0;
- } else {
- return LDAP_INVALID_SYNTAX;
- }
- }
-
- return !dot ? LDAP_SUCCESS : LDAP_INVALID_SYNTAX;
-
- } else if( DESC_LEADCHAR(val->bv_val[0]) ) {
- for(i=1; i < val->bv_len; i++) {
- if( !DESC_CHAR(val->bv_val[i] ) ) {
- return LDAP_INVALID_SYNTAX;
- }
- }
-
- return LDAP_SUCCESS;
- }
-
- return LDAP_INVALID_SYNTAX;
-}
-
static int
integerValidate(
Syntax *syntax,
if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
- if( val->bv_val[0] == '+' || val->bv_val[0] == '-' ) {
+ if(( val->bv_val[0] == '+' ) || ( val->bv_val[0] == '-' )) {
if( val->bv_len < 2 ) return LDAP_INVALID_SYNTAX;
} else if( !ASCII_DIGIT(val->bv_val[0]) ) {
return LDAP_INVALID_SYNTAX;
}
- for(i=1; i < val->bv_len; i++) {
+ for( i=1; i < val->bv_len; i++ ) {
if( !ASCII_DIGIT(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
}
integerNormalize(
Syntax *syntax,
struct berval *val,
- struct berval **normalized )
+ struct berval *normalized )
{
- int negative;
- struct berval *newval;
char *p;
+ int negative=0;
+ ber_len_t len;
+
p = val->bv_val;
+ len = val->bv_len;
+
+ /* Ignore leading spaces */
+ while ( len && ( *p == ' ' )) {
+ p++;
+ len--;
+ }
/* save sign */
- negative = ( *p == '-' );
- if( *p == '-' || *p == '+' ) p++;
+ if( len ) {
+ negative = ( *p == '-' );
+ if(( *p == '-' ) || ( *p == '+' )) {
+ p++;
+ len--;
+ }
+ }
/* Ignore leading zeros */
- while ( *p == '0' ) p++;
-
- newval = (struct berval *) ch_malloc( sizeof(struct berval) );
+ while ( len && ( *p == '0' )) {
+ p++;
+ len--;
+ }
- if( *p == '\0' ) {
- newval->bv_val = ch_strdup("0");
- newval->bv_len = 1;
- goto done;
+ /* If there are no non-zero digits left, the number is zero, otherwise
+ allocate space for the number and copy it into the buffer */
+ if( len == 0 ) {
+ normalized->bv_val = ch_strdup("0");
+ normalized->bv_len = 1;
+ }
+ else {
+ normalized->bv_len = len+negative;
+ normalized->bv_val = ch_malloc( normalized->bv_len );
+ if( negative ) {
+ normalized->bv_val[0] = '-';
+ }
+ memcpy( normalized->bv_val + negative, p, len );
}
- newval->bv_val = ch_malloc( val->bv_len + 1 );
- newval->bv_len = 0;
+ return LDAP_SUCCESS;
+}
+
+/* Index generation function */
+static int integerIndexer(
+ slap_mask_t use,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *prefix,
+ struct berval **values,
+ struct berval **keysp )
+{
+ int i;
+ struct berval *keys;
+
+ /* we should have at least one value at this point */
+ assert( values != NULL && values[0] != NULL );
- if( negative ) {
- newval->bv_val[newval->bv_len++] = '-';
+ for( i=0; values[i] != NULL; i++ ) {
+ /* empty -- just count them */
}
- for( ; *p != '\0'; p++ ) {
- newval->bv_val[newval->bv_len++] = *p;
+ keys = ch_malloc( sizeof( struct berval ) * (i+1) );
+
+ for( i=0; values[i] != NULL; i++ ) {
+ integerNormalize( syntax, values[i], &keys[i] );
}
-done:
- *normalized = newval;
+ keys[i].bv_val = NULL;
+ *keysp = keys;
+ return LDAP_SUCCESS;
+}
+
+/* Index generation function */
+static int integerFilter(
+ slap_mask_t use,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *prefix,
+ void * assertValue,
+ struct berval **keysp )
+{
+ struct berval *keys;
+
+ keys = ch_malloc( sizeof( struct berval ) * 2 );
+ integerNormalize( syntax, assertValue, &keys[0] );
+ keys[1].bv_val = NULL;
+ *keysp = keys;
+
return LDAP_SUCCESS;
}
+
static int
countryStringValidate(
Syntax *syntax,
IA5StringNormalize(
Syntax *syntax,
struct berval *val,
- struct berval **normalized )
+ struct berval *normalized )
{
- struct berval *newval;
char *p, *q;
- newval = ch_malloc( sizeof( struct berval ) );
-
p = val->bv_val;
/* Ignore initial whitespace */
}
if( *p == '\0' ) {
- ch_free( newval );
return LDAP_INVALID_SYNTAX;
}
- newval->bv_val = ch_strdup( p );
- p = q = newval->bv_val;
+ normalized->bv_val = ch_strdup( p );
+ p = q = normalized->bv_val;
while ( *p ) {
if ( ASCII_SPACE( *p ) ) {
}
}
- assert( *newval->bv_val );
- assert( newval->bv_val < p );
+ assert( normalized->bv_val < p );
assert( q <= p );
/* cannot start with a space */
- assert( !ASCII_SPACE(*newval->bv_val) );
+ assert( !ASCII_SPACE(*normalized->bv_val) );
/*
* If the string ended in space, backup the pointer one
/* null terminate */
*q = '\0';
- newval->bv_len = q - newval->bv_val;
- *normalized = newval;
+ normalized->bv_len = q - normalized->bv_val;
return LDAP_SUCCESS;
}
ber_len_t inlen=0;
/* Add up asserted input length */
- if( sub->sa_initial ) {
- inlen += sub->sa_initial->bv_len;
+ if( sub->sa_initial.bv_val ) {
+ inlen += sub->sa_initial.bv_len;
}
if( sub->sa_any ) {
- for(i=0; sub->sa_any[i] != NULL; i++) {
- inlen += sub->sa_any[i]->bv_len;
+ for(i=0; sub->sa_any[i].bv_val != NULL; i++) {
+ inlen += sub->sa_any[i].bv_len;
}
}
- if( sub->sa_final ) {
- inlen += sub->sa_final->bv_len;
+ if( sub->sa_final.bv_val ) {
+ inlen += sub->sa_final.bv_len;
}
- if( sub->sa_initial ) {
+ if( sub->sa_initial.bv_val ) {
if( inlen > left.bv_len ) {
match = 1;
goto done;
}
- match = strncmp( sub->sa_initial->bv_val, left.bv_val,
- sub->sa_initial->bv_len );
+ match = strncmp( sub->sa_initial.bv_val, left.bv_val,
+ sub->sa_initial.bv_len );
if( match != 0 ) {
goto done;
}
- left.bv_val += sub->sa_initial->bv_len;
- left.bv_len -= sub->sa_initial->bv_len;
- inlen -= sub->sa_initial->bv_len;
+ left.bv_val += sub->sa_initial.bv_len;
+ left.bv_len -= sub->sa_initial.bv_len;
+ inlen -= sub->sa_initial.bv_len;
}
- if( sub->sa_final ) {
+ if( sub->sa_final.bv_val ) {
if( inlen > left.bv_len ) {
match = 1;
goto done;
}
- match = strncmp( sub->sa_final->bv_val,
- &left.bv_val[left.bv_len - sub->sa_final->bv_len],
- sub->sa_final->bv_len );
+ match = strncmp( sub->sa_final.bv_val,
+ &left.bv_val[left.bv_len - sub->sa_final.bv_len],
+ sub->sa_final.bv_len );
if( match != 0 ) {
goto done;
}
- left.bv_len -= sub->sa_final->bv_len;
- inlen -= sub->sa_final->bv_len;
+ left.bv_len -= sub->sa_final.bv_len;
+ inlen -= sub->sa_final.bv_len;
}
if( sub->sa_any ) {
- for(i=0; sub->sa_any[i]; i++) {
+ for(i=0; sub->sa_any[i].bv_val; i++) {
ber_len_t idx;
char *p;
goto done;
}
- if( sub->sa_any[i]->bv_len == 0 ) {
+ if( sub->sa_any[i].bv_len == 0 ) {
continue;
}
- p = strchr( left.bv_val, *sub->sa_any[i]->bv_val );
+ p = strchr( left.bv_val, *sub->sa_any[i].bv_val );
if( p == NULL ) {
match = 1;
left.bv_val = p;
left.bv_len -= idx;
- if( sub->sa_any[i]->bv_len > left.bv_len ) {
+ if( sub->sa_any[i].bv_len > left.bv_len ) {
/* not enough left */
match = 1;
goto done;
}
match = strncmp( left.bv_val,
- sub->sa_any[i]->bv_val,
- sub->sa_any[i]->bv_len );
+ sub->sa_any[i].bv_val,
+ sub->sa_any[i].bv_len );
if( match != 0 ) {
left.bv_val++;
goto retry;
}
- left.bv_val += sub->sa_any[i]->bv_len;
- left.bv_len -= sub->sa_any[i]->bv_len;
- inlen -= sub->sa_any[i]->bv_len;
+ left.bv_val += sub->sa_any[i].bv_len;
+ left.bv_len -= sub->sa_any[i].bv_len;
+ inlen -= sub->sa_any[i].bv_len;
}
}
}
/* Index generation function */
-int caseExactIA5Indexer(
+static int caseExactIA5Indexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
int i;
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- /* we should have at least one value at this point */
- assert( values != NULL && values[0] != NULL );
-
for( i=0; values[i] != NULL; i++ ) {
- /* just count them */
+ /* empty - just count them */
}
- keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
+ /* we should have at least one value at this point */
+ assert( i > 0 );
+
+ keys = ch_malloc( sizeof( struct berval ) * (i+1) );
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
for( i=0; values[i] != NULL; i++ ) {
struct berval *value = values[i];
value->bv_val, value->bv_len );
HASH_Final( HASHdigest, &HASHcontext );
- keys[i] = ber_bvdup( &digest );
+ ber_dupbv( &keys[i], &digest );
}
- keys[i] = NULL;
+ keys[i].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
/* Index generation function */
-int caseExactIA5Filter(
+static int caseExactIA5Filter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
value = (struct berval *) assertValue;
- keys = ch_malloc( sizeof( struct berval * ) * 2 );
+ keys = ch_malloc( sizeof( struct berval ) * 2 );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
value->bv_val, value->bv_len );
HASH_Final( HASHdigest, &HASHcontext );
- keys[0] = ber_bvdup( &digest );
- keys[1] = NULL;
+ ber_dupbv( &keys[0], &digest );
+ keys[1].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
/* Substrings Index generation function */
-int caseExactIA5SubstringsIndexer(
+static int caseExactIA5SubstringsIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
ber_len_t i, nkeys;
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
return LDAP_SUCCESS;
}
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
+ keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
nkeys=0;
for( i=0; values[i] != NULL; i++ ) {
SLAP_INDEX_SUBSTR_MAXLEN );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
}
value->bv_val, j );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
&value->bv_val[value->bv_len-j], j );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
}
}
if( nkeys > 0 ) {
- keys[nkeys] = NULL;
+ keys[nkeys].bv_val = NULL;
*keysp = keys;
} else {
ch_free( keys );
return LDAP_SUCCESS;
}
-int caseExactIA5SubstringsFilter(
+static int caseExactIA5SubstringsFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
SubstringsAssertion *sa = assertValue;
char pre;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
- if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL &&
+ sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
}
if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
ber_len_t i;
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
+ for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
+ if( sa->sa_any[i].bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
/* don't bother accounting for stepping */
- nkeys += sa->sa_any[i]->bv_len -
+ nkeys += sa->sa_any[i].bv_len -
( SLAP_INDEX_SUBSTR_MAXLEN - 1 );
}
}
}
- if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL &&
+ sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
}
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
+ keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
nkeys = 0;
- if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL &&
+ sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- value = sa->sa_initial;
+ value = &sa->sa_initial;
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
value->bv_val, klen );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
pre = SLAP_INDEX_SUBSTR_PREFIX;
klen = SLAP_INDEX_SUBSTR_MAXLEN;
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
+ for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
+ if( sa->sa_any[i].bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
continue;
}
- value = sa->sa_any[i];
+ value = &sa->sa_any[i];
for(j=0;
j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
&value->bv_val[j], klen );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
}
}
- if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL &&
+ sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- value = sa->sa_final;
+ value = &sa->sa_final;
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
&value->bv_val[value->bv_len-klen], klen );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if( nkeys > 0 ) {
- keys[nkeys] = NULL;
+ keys[nkeys].bv_val = NULL;
*keysp = keys;
} else {
ch_free( keys );
ber_len_t inlen=0;
/* Add up asserted input length */
- if( sub->sa_initial ) {
- inlen += sub->sa_initial->bv_len;
+ if( sub->sa_initial.bv_val ) {
+ inlen += sub->sa_initial.bv_len;
}
if( sub->sa_any ) {
- for(i=0; sub->sa_any[i] != NULL; i++) {
- inlen += sub->sa_any[i]->bv_len;
+ for(i=0; sub->sa_any[i].bv_val != NULL; i++) {
+ inlen += sub->sa_any[i].bv_len;
}
}
- if( sub->sa_final ) {
- inlen += sub->sa_final->bv_len;
+ if( sub->sa_final.bv_val ) {
+ inlen += sub->sa_final.bv_len;
}
- if( sub->sa_initial ) {
+ if( sub->sa_initial.bv_val ) {
if( inlen > left.bv_len ) {
match = 1;
goto done;
}
- match = strncasecmp( sub->sa_initial->bv_val, left.bv_val,
- sub->sa_initial->bv_len );
+ match = strncasecmp( sub->sa_initial.bv_val, left.bv_val,
+ sub->sa_initial.bv_len );
if( match != 0 ) {
goto done;
}
- left.bv_val += sub->sa_initial->bv_len;
- left.bv_len -= sub->sa_initial->bv_len;
- inlen -= sub->sa_initial->bv_len;
+ left.bv_val += sub->sa_initial.bv_len;
+ left.bv_len -= sub->sa_initial.bv_len;
+ inlen -= sub->sa_initial.bv_len;
}
- if( sub->sa_final ) {
+ if( sub->sa_final.bv_val ) {
if( inlen > left.bv_len ) {
match = 1;
goto done;
}
- match = strncasecmp( sub->sa_final->bv_val,
- &left.bv_val[left.bv_len - sub->sa_final->bv_len],
- sub->sa_final->bv_len );
+ match = strncasecmp( sub->sa_final.bv_val,
+ &left.bv_val[left.bv_len - sub->sa_final.bv_len],
+ sub->sa_final.bv_len );
if( match != 0 ) {
goto done;
}
- left.bv_len -= sub->sa_final->bv_len;
- inlen -= sub->sa_final->bv_len;
+ left.bv_len -= sub->sa_final.bv_len;
+ inlen -= sub->sa_final.bv_len;
}
if( sub->sa_any ) {
- for(i=0; sub->sa_any[i]; i++) {
+ for(i=0; sub->sa_any[i].bv_val; i++) {
ber_len_t idx;
char *p;
goto done;
}
- if( sub->sa_any[i]->bv_len == 0 ) {
+ if( sub->sa_any[i].bv_len == 0 ) {
continue;
}
- p = strcasechr( left.bv_val, *sub->sa_any[i]->bv_val );
+ p = strcasechr( left.bv_val, *sub->sa_any[i].bv_val );
if( p == NULL ) {
match = 1;
left.bv_val = p;
left.bv_len -= idx;
- if( sub->sa_any[i]->bv_len > left.bv_len ) {
+ if( sub->sa_any[i].bv_len > left.bv_len ) {
/* not enough left */
match = 1;
goto done;
}
match = strncasecmp( left.bv_val,
- sub->sa_any[i]->bv_val,
- sub->sa_any[i]->bv_len );
+ sub->sa_any[i].bv_val,
+ sub->sa_any[i].bv_len );
if( match != 0 ) {
left.bv_val++;
goto retry;
}
- left.bv_val += sub->sa_any[i]->bv_len;
- left.bv_len -= sub->sa_any[i]->bv_len;
- inlen -= sub->sa_any[i]->bv_len;
+ left.bv_val += sub->sa_any[i].bv_len;
+ left.bv_len -= sub->sa_any[i].bv_len;
+ inlen -= sub->sa_any[i].bv_len;
}
}
}
/* Index generation function */
-int caseIgnoreIA5Indexer(
+static int caseIgnoreIA5Indexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
int i;
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
/* just count them */
}
- keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
+ keys = ch_malloc( sizeof( struct berval ) * (i+1) );
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
for( i=0; values[i] != NULL; i++ ) {
- struct berval *value = ber_bvdup( values[i] );
- ldap_pvt_str2upper( value->bv_val );
+ struct berval value;
+ ber_dupbv( &value, values[i] );
+ ldap_pvt_str2upper( value.bv_val );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- value->bv_val, value->bv_len );
+ value.bv_val, value.bv_len );
HASH_Final( HASHdigest, &HASHcontext );
- ber_bvfree( value );
+ free( value.bv_val );
- keys[i] = ber_bvdup( &digest );
+ ber_dupbv( &keys[i], &digest );
}
- keys[i] = NULL;
+ keys[i].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
/* Index generation function */
-int caseIgnoreIA5Filter(
+static int caseIgnoreIA5Filter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
- struct berval *value;
+ struct berval value;
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
- value = ber_bvdup( (struct berval *) assertValue );
- ldap_pvt_str2upper( value->bv_val );
+ ber_dupbv( &value, (struct berval *) assertValue );
+ ldap_pvt_str2upper( value.bv_val );
- keys = ch_malloc( sizeof( struct berval * ) * 2 );
+ keys = ch_malloc( sizeof( struct berval ) * 2 );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- value->bv_val, value->bv_len );
+ value.bv_val, value.bv_len );
HASH_Final( HASHdigest, &HASHcontext );
- keys[0] = ber_bvdup( &digest );
- keys[1] = NULL;
+ ber_dupbv( &keys[0], &digest );
+ keys[1].bv_val = NULL;
- ber_bvfree( value );
+ free( value.bv_val );
*keysp = keys;
}
/* Substrings Index generation function */
-int caseIgnoreIA5SubstringsIndexer(
+static int caseIgnoreIA5SubstringsIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
struct berval **values,
- struct berval ***keysp )
+ struct berval **keysp )
{
ber_len_t i, nkeys;
size_t slen, mlen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
return LDAP_SUCCESS;
}
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
+ keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
nkeys=0;
for( i=0; values[i] != NULL; i++ ) {
int j,max;
- struct berval *value;
+ struct berval value;
if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
- value = ber_bvdup( values[i] );
- ldap_pvt_str2upper( value->bv_val );
+ ber_dupbv( &value, values[i] );
+ ldap_pvt_str2upper( value.bv_val );
if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
- ( value->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
+ ( value.bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
{
char pre = SLAP_INDEX_SUBSTR_PREFIX;
- max = value->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
+ max = value.bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
for( j=0; j<max; j++ ) {
HASH_Init( &HASHcontext );
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- &value->bv_val[j],
+ &value.bv_val[j],
SLAP_INDEX_SUBSTR_MAXLEN );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
}
- max = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
+ max = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len
+ ? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;
for( j=SLAP_INDEX_SUBSTR_MINLEN; j<=max; j++ ) {
char pre;
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- value->bv_val, j );
+ value.bv_val, j );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- &value->bv_val[value->bv_len-j], j );
+ &value.bv_val[value.bv_len-j], j );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
}
- ber_bvfree( value );
+ free( value.bv_val );
}
if( nkeys > 0 ) {
- keys[nkeys] = NULL;
+ keys[nkeys].bv_val = NULL;
*keysp = keys;
} else {
ch_free( keys );
return LDAP_SUCCESS;
}
-int caseIgnoreIA5SubstringsFilter(
+static int caseIgnoreIA5SubstringsFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- struct berval ***keysp )
+ struct berval **keysp )
{
SubstringsAssertion *sa = assertValue;
char pre;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
- struct berval **keys;
+ struct berval *keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
- struct berval *value;
+ struct berval value;
struct berval digest;
- if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial.bv_val != NULL &&
+ sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
}
if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
ber_len_t i;
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
+ for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
+ if( sa->sa_any[i].bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
/* don't bother accounting for stepping */
- nkeys += sa->sa_any[i]->bv_len -
+ nkeys += sa->sa_any[i].bv_len -
( SLAP_INDEX_SUBSTR_MAXLEN - 1 );
}
}
}
- if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final.bv_val != NULL &&
+ sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
}
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
+ keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
nkeys = 0;
- if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial.bv_val != NULL &&
+ sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- value = ber_bvdup( sa->sa_initial );
- ldap_pvt_str2upper( value->bv_val );
+ ber_dupbv( &value, &sa->sa_initial );
+ ldap_pvt_str2upper( value.bv_val );
- klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
+ klen = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len
+ ? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- value->bv_val, klen );
+ value.bv_val, klen );
HASH_Final( HASHdigest, &HASHcontext );
- ber_bvfree( value );
- keys[nkeys++] = ber_bvdup( &digest );
+ free( value.bv_val );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
pre = SLAP_INDEX_SUBSTR_PREFIX;
klen = SLAP_INDEX_SUBSTR_MAXLEN;
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
+ for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
+ if( sa->sa_any[i].bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
continue;
}
- value = ber_bvdup( sa->sa_any[i] );
- ldap_pvt_str2upper( value->bv_val );
+ ber_dupbv( &value, &sa->sa_any[i] );
+ ldap_pvt_str2upper( value.bv_val );
for(j=0;
- j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
+ j <= value.bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
j += SLAP_INDEX_SUBSTR_STEP )
{
HASH_Init( &HASHcontext );
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- &value->bv_val[j], klen );
+ &value.bv_val[j], klen );
HASH_Final( HASHdigest, &HASHcontext );
- keys[nkeys++] = ber_bvdup( &digest );
+ ber_dupbv( &keys[nkeys++], &digest );
}
- ber_bvfree( value );
+ free( value.bv_val );
}
}
- if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+ if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final.bv_val != NULL &&
+ sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- value = ber_bvdup( sa->sa_final );
- ldap_pvt_str2upper( value->bv_val );
+ ber_dupbv( &value, &sa->sa_final );
+ ldap_pvt_str2upper( value.bv_val );
- klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
+ klen = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len
+ ? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- &value->bv_val[value->bv_len-klen], klen );
+ &value.bv_val[value.bv_len-klen], klen );
HASH_Final( HASHdigest, &HASHcontext );
- ber_bvfree( value );
- keys[nkeys++] = ber_bvdup( &digest );
+ free( value.bv_val );
+ ber_dupbv( &keys[nkeys++], &digest );
}
if( nkeys > 0 ) {
- keys[nkeys] = NULL;
+ keys[nkeys].bv_val = NULL;
*keysp = keys;
} else {
ch_free( keys );
numericStringNormalize(
Syntax *syntax,
struct berval *val,
- struct berval **normalized )
+ struct berval *normalized )
{
/* removal all spaces */
- struct berval *newval;
char *p, *q;
- newval = ch_malloc( sizeof( struct berval ) );
- newval->bv_val = ch_malloc( val->bv_len + 1 );
+ normalized->bv_val = ch_malloc( val->bv_len + 1 );
p = val->bv_val;
- q = newval->bv_val;
+ q = normalized->bv_val;
while ( *p ) {
if ( ASCII_SPACE( *p ) ) {
}
}
- assert( newval->bv_val <= p );
- assert( q <= p );
+ /* we should have copied no more then is in val */
+ assert( (q - normalized->bv_val) <= (p - val->bv_val) );
/* null terminate */
*q = '\0';
- newval->bv_len = q - newval->bv_val;
- *normalized = newval;
+ normalized->bv_len = q - normalized->bv_val;
return LDAP_SUCCESS;
}
rc = objectIdentifierMatch( &match, flags, syntax, mr, &oid, asserted );
} else {
- char *stored = ch_malloc( oid.bv_len + 1 );
- AC_MEMCPY( stored, oid.bv_val, oid.bv_len );
- stored[oid.bv_len] = '\0';
-
if ( !strcmp( syntax->ssyn_oid, SLAP_SYNTAX_MATCHINGRULES_OID ) ) {
- MatchingRule *asserted_mr = mr_find( asserted->bv_val );
- MatchingRule *stored_mr = mr_find( stored );
+ MatchingRule *asserted_mr = mr_bvfind( asserted );
+ MatchingRule *stored_mr = mr_bvfind( &oid );
if( asserted_mr == NULL ) {
rc = SLAPD_COMPARE_UNDEFINED;
} else if ( !strcmp( syntax->ssyn_oid,
SLAP_SYNTAX_ATTRIBUTETYPES_OID ) )
{
- AttributeType *asserted_at = at_find( asserted->bv_val );
- AttributeType *stored_at = at_find( stored );
+ AttributeType *asserted_at = at_bvfind( asserted );
+ AttributeType *stored_at = at_bvfind( &oid );
if( asserted_at == NULL ) {
rc = SLAPD_COMPARE_UNDEFINED;
} else if ( !strcmp( syntax->ssyn_oid,
SLAP_SYNTAX_OBJECTCLASSES_OID ) )
{
- ObjectClass *asserted_oc = oc_find( asserted->bv_val );
- ObjectClass *stored_oc = oc_find( stored );
+ ObjectClass *asserted_oc = oc_bvfind( asserted );
+ ObjectClass *stored_oc = oc_bvfind( &oid );
if( asserted_oc == NULL ) {
rc = SLAPD_COMPARE_UNDEFINED;
match = asserted_oc != stored_oc;
}
}
-
- ch_free( stored );
}
#ifdef NEW_LOGGING
return rc;
}
+static int
+integerBitAndMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ long lValue, lAssertedValue;
+
+ /* safe to assume integers are NUL terminated? */
+ lValue = strtoul(value->bv_val, NULL, 10);
+ if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE )
+ return LDAP_CONSTRAINT_VIOLATION;
+
+ lAssertedValue = strtol(((struct berval *)assertedValue)->bv_val, NULL, 10);
+ if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX) && errno == ERANGE )
+ return LDAP_CONSTRAINT_VIOLATION;
+
+ *matchp = (lValue & lAssertedValue);
+ return LDAP_SUCCESS;
+}
+
+static int
+integerBitOrMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ long lValue, lAssertedValue;
+
+ /* safe to assume integers are NUL terminated? */
+ lValue = strtoul(value->bv_val, NULL, 10);
+ if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE )
+ return LDAP_CONSTRAINT_VIOLATION;
+
+ lAssertedValue = strtol(((struct berval *)assertedValue)->bv_val, NULL, 10);
+ if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX) && errno == ERANGE )
+ return LDAP_CONSTRAINT_VIOLATION;
+
+ *matchp = (lValue | lAssertedValue);
+ return LDAP_SUCCESS;
+}
+
+#ifdef HAVE_TLS
+#include <openssl/x509.h>
+#include <openssl/err.h>
+char digit[] = "0123456789";
+
+/*
+ * Next function returns a string representation of a ASN1_INTEGER.
+ * It works for unlimited lengths.
+ */
+
+static struct berval *
+asn1_integer2str(ASN1_INTEGER *a)
+{
+ char buf[256];
+ char *p;
+
+ /* We work backwards, make it fill from the end of buf */
+ p = buf + sizeof(buf) - 1;
+ *p = '\0';
+
+ if ( a == NULL || a->length == 0 ) {
+ *--p = '0';
+ } else {
+ int i;
+ int n = a->length;
+ int base = 0;
+ unsigned int *copy;
+
+ /* We want to preserve the original */
+ copy = ch_malloc(n*sizeof(unsigned int));
+ for (i = 0; i<n; i++) {
+ copy[i] = a->data[i];
+ }
+
+ /*
+ * base indicates the index of the most significant
+ * byte that might be nonzero. When it goes off the
+ * end, we now there is nothing left to do.
+ */
+ while (base < n) {
+ unsigned int carry;
+
+ carry = 0;
+ for (i = base; i<n; i++ ) {
+ copy[i] += carry*256;
+ carry = copy[i] % 10;
+ copy[i] /= 10;
+ }
+ if (p <= buf+1) {
+ /*
+ * Way too large, we need to leave
+ * room for sign if negative
+ */
+ free(copy);
+ return NULL;
+ }
+ *--p = digit[carry];
+ if (copy[base] == 0)
+ base++;
+ }
+ free(copy);
+ }
+
+ if ( a->type == V_ASN1_NEG_INTEGER ) {
+ *--p = '-';
+ }
+
+ return ber_bvstrdup(p);
+}
+
+/* Get a DN in RFC2253 format from a X509_NAME internal struct */
+static struct berval *
+dn_openssl2ldap(X509_NAME *name)
+{
+ char issuer_dn[1024];
+ BIO *bio;
+
+ bio = BIO_new(BIO_s_mem());
+ if ( !bio ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "dn_openssl2ldap: error creating BIO_s_mem: %s\n",
+ ERR_error_string(ERR_get_error(),NULL)));
+#else
+ Debug( LDAP_DEBUG_ARGS, "dn_openssl2ldap: "
+ "error creating BIO: %s\n",
+ ERR_error_string(ERR_get_error(),NULL), NULL, NULL );
+#endif
+ return NULL;
+ }
+ X509_NAME_print_ex(bio, name, 0, XN_FLAG_RFC2253);
+
+ BIO_gets(bio, issuer_dn, 1024);
+
+ BIO_free(bio);
+ return ber_bvstrdup(issuer_dn);
+}
+
+/*
+ * Given a certificate in DER format, extract the corresponding
+ * assertion value for certificateExactMatch
+ */
+static int
+certificateExactConvert(
+ struct berval * in,
+ struct berval * out )
+{
+ X509 *xcert;
+ unsigned char *p = in->bv_val;
+ struct berval *serial;
+ struct berval *issuer_dn;
+ struct berval *bv_tmp;
+
+ xcert = d2i_X509(NULL, &p, in->bv_len);
+ if ( !xcert ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "certificateExactConvert: error parsing cert: %s\n",
+ ERR_error_string(ERR_get_error(),NULL)));
+#else
+ Debug( LDAP_DEBUG_ARGS, "certificateExactConvert: "
+ "error parsing cert: %s\n",
+ ERR_error_string(ERR_get_error(),NULL), NULL, NULL );
+#endif
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ serial = asn1_integer2str(xcert->cert_info->serialNumber);
+ if ( !serial ) {
+ X509_free(xcert);
+ return LDAP_INVALID_SYNTAX;
+ }
+ issuer_dn = dn_openssl2ldap(X509_get_issuer_name(xcert));
+ if ( !issuer_dn ) {
+ X509_free(xcert);
+ ber_bvfree(serial);
+ return LDAP_INVALID_SYNTAX;
+ }
+ /* Actually, dn_openssl2ldap returns in a normalized format, but
+ it is different from our normalized format */
+ bv_tmp = issuer_dn;
+ if ( dnNormalize(NULL, bv_tmp, &issuer_dn) != LDAP_SUCCESS ) {
+ X509_free(xcert);
+ ber_bvfree(serial);
+ ber_bvfree(bv_tmp);
+ return LDAP_INVALID_SYNTAX;
+ }
+ ber_bvfree(bv_tmp);
+
+ X509_free(xcert);
+
+ out->bv_len = serial->bv_len + 3 + issuer_dn->bv_len + 1;
+ out->bv_val = ch_malloc(out->bv_len);
+ p = out->bv_val;
+ AC_MEMCPY(p, serial->bv_val, serial->bv_len);
+ p += serial->bv_len;
+ AC_MEMCPY(p, " $ ", 3);
+ p += 3;
+ AC_MEMCPY(p, issuer_dn->bv_val, issuer_dn->bv_len);
+ p += issuer_dn->bv_len;
+ *p++ = '\0';
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "certificateExactConvert: \n %s\n",
+ out->bv_val));
+#else
+ Debug( LDAP_DEBUG_ARGS, "certificateExactConvert "
+ "\n\t\"%s\"\n",
+ out->bv_val, NULL, NULL );
+#endif
+
+ ber_bvfree(serial);
+ ber_bvfree(issuer_dn);
+
+ return LDAP_SUCCESS;
+}
+
+static int
+serial_and_issuer_parse(
+ struct berval *assertion,
+ struct berval **serial,
+ struct berval **issuer_dn
+)
+{
+ char *begin;
+ char *end;
+ char *p;
+ struct berval bv;
+
+ begin = assertion->bv_val;
+ end = assertion->bv_val+assertion->bv_len-1;
+ for (p=begin; p<=end && *p != '$'; p++)
+ ;
+ if ( p > end )
+ return LDAP_INVALID_SYNTAX;
+
+ /* p now points at the $ sign, now use begin and end to delimit the
+ serial number */
+ while (ASCII_SPACE(*begin))
+ begin++;
+ end = p-1;
+ while (ASCII_SPACE(*end))
+ end--;
+
+ bv.bv_len = end-begin+1;
+ bv.bv_val = begin;
+ *serial = ber_bvdup(&bv);
+
+ /* now extract the issuer, remember p was at the dollar sign */
+ begin = p+1;
+ end = assertion->bv_val+assertion->bv_len-1;
+ while (ASCII_SPACE(*begin))
+ begin++;
+ /* should we trim spaces at the end too? is it safe always? */
+
+ bv.bv_len = end-begin+1;
+ bv.bv_val = begin;
+ dnNormalize( NULL, &bv, issuer_dn );
+
+ return LDAP_SUCCESS;
+}
+
+static int
+certificateExactMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ X509 *xcert;
+ unsigned char *p = value->bv_val;
+ struct berval *serial;
+ struct berval *issuer_dn;
+ struct berval *asserted_serial;
+ struct berval *asserted_issuer_dn;
+ int ret;
+
+ xcert = d2i_X509(NULL, &p, value->bv_len);
+ if ( !xcert ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "certificateExactMatch: error parsing cert: %s\n",
+ ERR_error_string(ERR_get_error(),NULL)));
+#else
+ Debug( LDAP_DEBUG_ARGS, "certificateExactMatch: "
+ "error parsing cert: %s\n",
+ ERR_error_string(ERR_get_error(),NULL), NULL, NULL );
+#endif
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ serial = asn1_integer2str(xcert->cert_info->serialNumber);
+ issuer_dn = dn_openssl2ldap(X509_get_issuer_name(xcert));
+
+ X509_free(xcert);
+
+ serial_and_issuer_parse(assertedValue,
+ &asserted_serial,
+ &asserted_issuer_dn);
+
+ ret = integerMatch(
+ matchp,
+ flags,
+ slap_schema.si_syn_integer,
+ slap_schema.si_mr_integerMatch,
+ serial,
+ asserted_serial);
+ if ( ret == LDAP_SUCCESS ) {
+ if ( *matchp == 0 ) {
+ /* We need to normalize everything for dnMatch */
+ ret = dnMatch(
+ matchp,
+ flags,
+ slap_schema.si_syn_distinguishedName,
+ slap_schema.si_mr_distinguishedNameMatch,
+ issuer_dn,
+ asserted_issuer_dn);
+ }
+ }
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "certificateExactMatch: %d\n %s $ %s\n %s $ %s\n",
+ *matchp, serial->bv_val, issuer_dn->bv_val,
+ asserted->serial->bv_val, asserted_issuer_dn->bv_val));
+#else
+ Debug( LDAP_DEBUG_ARGS, "certificateExactMatch "
+ "%d\n\t\"%s $ %s\"\n",
+ *matchp, serial->bv_val, issuer_dn->bv_val );
+ Debug( LDAP_DEBUG_ARGS, "\t\"%s $ %s\"\n",
+ asserted_serial->bv_val, asserted_issuer_dn->bv_val,
+ NULL );
+#endif
+
+ ber_bvfree(serial);
+ ber_bvfree(issuer_dn);
+ ber_bvfree(asserted_serial);
+ ber_bvfree(asserted_issuer_dn);
+
+ return ret;
+}
+
+/*
+ * Index generation function
+ * We just index the serials, in most scenarios the issuer DN is one of
+ * a very small set of values.
+ */
+static int certificateExactIndexer(
+ slap_mask_t use,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *prefix,
+ struct berval **values,
+ struct berval **keysp )
+{
+ int i;
+ struct berval *keys;
+ X509 *xcert;
+ unsigned char *p;
+ struct berval * serial;
+
+ /* we should have at least one value at this point */
+ assert( values != NULL && values[0] != NULL );
+
+ for( i=0; values[i] != NULL; i++ ) {
+ /* empty -- just count them */
+ }
+
+ keys = ch_malloc( sizeof( struct berval ) * (i+1) );
+
+ for( i=0; values[i] != NULL; i++ ) {
+ p = values[i]->bv_val;
+ xcert = d2i_X509(NULL, &p, values[i]->bv_len);
+ if ( !xcert ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "certificateExactIndexer: error parsing cert: %s\n",
+ ERR_error_string(ERR_get_error(),NULL)));
+#else
+ Debug( LDAP_DEBUG_ARGS, "certificateExactIndexer: "
+ "error parsing cert: %s\n",
+ ERR_error_string(ERR_get_error(),NULL),
+ NULL, NULL );
+#endif
+ /* Do we leak keys on error? */
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ serial = asn1_integer2str(xcert->cert_info->serialNumber);
+ X509_free(xcert);
+ integerNormalize( slap_schema.si_syn_integer,
+ serial,
+ &keys[i] );
+ ber_bvfree(serial);
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "certificateExactIndexer: returning: %s\n",
+ keys[i].bv_val));
+#else
+ Debug( LDAP_DEBUG_ARGS, "certificateExactIndexer: "
+ "returning: %s\n",
+ keys[i].bv_val,
+ NULL, NULL );
+#endif
+ }
+
+ keys[i].bv_val = NULL;
+ *keysp = keys;
+ return LDAP_SUCCESS;
+}
+
+/* Index generation function */
+/* We think this is always called with a value in matching rule syntax */
+static int certificateExactFilter(
+ slap_mask_t use,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *prefix,
+ void * assertValue,
+ struct berval **keysp )
+{
+ struct berval *keys;
+ struct berval *asserted_serial;
+ struct berval *asserted_issuer_dn;
+
+ serial_and_issuer_parse(assertValue,
+ &asserted_serial,
+ &asserted_issuer_dn);
+
+ keys = ch_malloc( sizeof( struct berval ) * 2 );
+ integerNormalize( syntax, asserted_serial, &keys[0] );
+ keys[1].bv_val = NULL;
+ *keysp = keys;
+
+ ber_bvfree(asserted_serial);
+ ber_bvfree(asserted_issuer_dn);
+ return LDAP_SUCCESS;
+}
+#endif
+
static int
check_time_syntax (struct berval *val,
int start,
utcTimeNormalize(
Syntax *syntax,
struct berval *val,
- struct berval **normalized )
+ struct berval *normalized )
{
- struct berval *out;
int parts[9], rc;
rc = check_time_syntax(val, 1, parts);
return rc;
}
- *normalized = NULL;
- out = ch_malloc( sizeof(struct berval) );
- if( out == NULL ) {
+ normalized->bv_val = ch_malloc( 14 );
+ if ( normalized->bv_val == NULL ) {
return LBER_ERROR_MEMORY;
}
- out->bv_val = ch_malloc( 14 );
- if ( out->bv_val == NULL ) {
- ch_free( out );
- return LBER_ERROR_MEMORY;
- }
-
- sprintf( out->bv_val, "%02ld%02ld%02ld%02ld%02ld%02ldZ",
+ sprintf( normalized->bv_val, "%02d%02d%02d%02d%02d%02dZ",
parts[1], parts[2] + 1, parts[3] + 1,
parts[4], parts[5], parts[6] );
- out->bv_len = 13;
- *normalized = out;
+ normalized->bv_len = 13;
return LDAP_SUCCESS;
}
generalizedTimeNormalize(
Syntax *syntax,
struct berval *val,
- struct berval **normalized )
+ struct berval *normalized )
{
- struct berval *out;
int parts[9], rc;
rc = check_time_syntax(val, 0, parts);
return rc;
}
- *normalized = NULL;
- out = ch_malloc( sizeof(struct berval) );
- if( out == NULL ) {
- return LBER_ERROR_MEMORY;
- }
-
- out->bv_val = ch_malloc( 16 );
- if ( out->bv_val == NULL ) {
- ch_free( out );
+ normalized->bv_val = ch_malloc( 16 );
+ if ( normalized->bv_val == NULL ) {
return LBER_ERROR_MEMORY;
}
- sprintf( out->bv_val, "%02ld%02ld%02ld%02ld%02ld%02ld%02ldZ",
+ sprintf( normalized->bv_val, "%02d%02d%02d%02d%02d%02d%02dZ",
parts[0], parts[1], parts[2] + 1, parts[3] + 1,
parts[4], parts[5], parts[6] );
- out->bv_len = 15;
- *normalized = out;
+ normalized->bv_len = 15;
return LDAP_SUCCESS;
}
return LDAP_SUCCESS;
}
-struct syntax_defs_rec {
+static struct syntax_defs_rec {
char *sd_desc;
+#define X_BINARY "X-BINARY-TRANSFER-REQUIRED 'TRUE' "
+#define X_NOT_H_R "X-NOT-HUMAN-READABLE 'TRUE' "
int sd_flags;
slap_syntax_validate_func *sd_validate;
slap_syntax_transform_func *sd_normalize;
slap_syntax_transform_func *sd_ber2str;
slap_syntax_transform_func *sd_str2ber;
#endif
-};
-
-#define X_BINARY "X-BINARY-TRANSFER-REQUIRED 'TRUE' "
-#define X_NOT_H_R "X-NOT-HUMAN-READABLE 'TRUE' "
-
-struct syntax_defs_rec syntax_defs[] = {
+} syntax_defs[] = {
{"( 1.3.6.1.4.1.1466.115.121.1.1 DESC 'ACI Item' " X_BINARY X_NOT_H_R ")",
SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.2 DESC 'Access Point' " X_NOT_H_R ")",
{"( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' " X_NOT_H_R ")",
SLAP_SYNTAX_BER, berValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' )",
- 0, bitStringValidate, NULL, NULL },
+ 0, bitStringValidate, bitStringNormalize, NULL },
{"( 1.3.6.1.4.1.1466.115.121.1.7 DESC 'Boolean' )",
0, booleanValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.8 DESC 'Certificate' "
{"( 1.3.6.1.4.1.1466.115.121.1.11 DESC 'Country String' )",
0, countryStringValidate, IA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'Distinguished Name' )",
- 0, dnValidate, dnNormalize, dnPretty},
+ 0, dnValidate, dnNormalize2, dnPretty2},
{"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'Data Quality' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.14 DESC 'Delivery Method' )",
{"( 1.3.6.1.4.1.1466.115.121.1.26 DESC 'IA5 String' )",
0, IA5StringValidate, IA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.27 DESC 'Integer' )",
- 0, integerValidate, integerNormalize, integerPretty},
+ 0, integerValidate, integerNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.28 DESC 'JPEG' " X_NOT_H_R ")",
SLAP_SYNTAX_BLOB, blobValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.29 DESC 'Master And Shadow Access Points' )",
{"( 1.3.6.1.4.1.1466.115.121.1.51 DESC 'Teletex Terminal Identifier' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.52 DESC 'Telex Number' )",
- 0, printableStringValidate, IA5StringNormalize, NULL},
+ 0, printablesStringValidate, IA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.53 DESC 'UTC Time' )",
0, utcTimeValidate, utcTimeNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.54 DESC 'LDAP Syntax Description' )",
{"( 1.3.6.1.1.1.0.1 DESC 'RFC2307 Boot Parameter' )",
0, bootParameterValidate, NULL, NULL},
+#ifdef HAVE_TLS
+ /* From PKIX */
+ /* These OIDs are not published yet, but will be in the next
+ * I-D for PKIX LDAPv3 schema as have been advanced by David
+ * Chadwick in private mail.
+ */
+ {"( 1.2.826.0.1.3344810.7.1 DESC 'Serial Number and Issuer' )",
+ 0, NULL, NULL, NULL},
+#endif
+
/* OpenLDAP Experimental Syntaxes */
{"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )",
- 0, UTF8StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */,
+ SLAP_SYNTAX_HIDE,
+ UTF8StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */,
NULL, NULL},
+
+ /* needs updating */
{"( 1.3.6.1.4.1.4203.666.2.2 DESC 'OpenLDAP authPassword' )",
- 0, NULL, NULL, NULL},
+ SLAP_SYNTAX_HIDE, NULL, NULL, NULL},
/* OpenLDAP Void Syntax */
{"( 1.3.6.1.4.1.4203.1.1.1 DESC 'OpenLDAP void' )" ,
{NULL, 0, NULL, NULL, NULL}
};
-struct mrule_defs_rec {
- char * mrd_desc;
- slap_mask_t mrd_usage;
- slap_mr_convert_func * mrd_convert;
- slap_mr_normalize_func * mrd_normalize;
- slap_mr_match_func * mrd_match;
- slap_mr_indexer_func * mrd_indexer;
- slap_mr_filter_func * mrd_filter;
-
- char * mrd_associated;
-};
-
/*
* Other matching rules in X.520 that we do not use (yet):
*
* 2.5.13.31 directoryStringFirstComponentMatch
* 2.5.13.32 wordMatch
* 2.5.13.33 keywordMatch
- * 2.5.13.34 certificateExactMatch
* 2.5.13.35 certificateMatch
* 2.5.13.36 certificatePairExactMatch
* 2.5.13.37 certificatePairMatch
* 2.5.13.43 readerAndKeyIDMatch
* 2.5.13.44 attributeIntegrityMatch
*/
+static struct mrule_defs_rec {
+ char * mrd_desc;
+ slap_mask_t mrd_usage;
+ slap_mr_convert_func * mrd_convert;
+ slap_mr_normalize_func * mrd_normalize;
+ slap_mr_match_func * mrd_match;
+ slap_mr_indexer_func * mrd_indexer;
+ slap_mr_filter_func * mrd_filter;
-struct mrule_defs_rec mrule_defs[] = {
+ char * mrd_associated;
+} mrule_defs[] = {
/*
* EQUALITY matching rules must be listed after associated APPROX
* matching rules. So, we list all APPROX matching rules first.
{"( 2.5.13.2 NAME 'caseIgnoreMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
NULL, NULL,
- caseIgnoreMatch, caseIgnoreIndexer, caseIgnoreFilter,
+ caseIgnoreMatch, caseExactIgnoreIndexer, caseExactIgnoreFilter,
directoryStringApproxMatchOID },
{"( 2.5.13.3 NAME 'caseIgnoreOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
SLAP_MR_SUBSTR | SLAP_MR_EXT,
NULL, NULL,
- caseIgnoreSubstringsMatch,
- caseIgnoreSubstringsIndexer,
- caseIgnoreSubstringsFilter,
+ caseExactIgnoreSubstringsMatch,
+ caseExactIgnoreSubstringsIndexer,
+ caseExactIgnoreSubstringsFilter,
NULL},
{"( 2.5.13.5 NAME 'caseExactMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
NULL, NULL,
- caseExactMatch, caseExactIndexer, caseExactFilter,
+ caseExactMatch, caseExactIgnoreIndexer, caseExactIgnoreFilter,
directoryStringApproxMatchOID },
{"( 2.5.13.6 NAME 'caseExactOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
SLAP_MR_SUBSTR | SLAP_MR_EXT,
NULL, NULL,
- caseExactSubstringsMatch,
- caseExactSubstringsIndexer,
- caseExactSubstringsFilter,
+ caseExactIgnoreSubstringsMatch,
+ caseExactIgnoreSubstringsIndexer,
+ caseExactIgnoreSubstringsFilter,
NULL},
{"( 2.5.13.8 NAME 'numericStringMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
NULL, NULL,
caseIgnoreIA5Match,
caseIgnoreIA5Indexer,
{"( 2.5.13.11 NAME 'caseIgnoreListMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
NULL, NULL,
caseIgnoreListMatch, NULL, NULL,
NULL},
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
NULL, NULL,
- bitStringMatch, NULL, NULL,
+ bitStringMatch, bitStringIndexer, bitStringFilter,
NULL},
{"( 2.5.13.17 NAME 'octetStringMatch' "
{"( 2.5.13.20 NAME 'telephoneNumberMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
NULL, NULL,
telephoneNumberMatch,
telephoneNumberIndexer,
objectIdentifierFirstComponentMatch, NULL, NULL,
NULL},
+#ifdef HAVE_TLS
+ {"( 2.5.13.34 NAME 'certificateExactMatch' "
+ "SYNTAX 1.2.826.0.1.3344810.7.1 )",
+ SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ certificateExactConvert, NULL,
+ certificateExactMatch,
+ certificateExactIndexer, certificateExactFilter,
+ NULL},
+#endif
+
{"( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
{"( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
NULL, NULL,
caseIgnoreIA5Match, caseIgnoreIA5Indexer, caseIgnoreIA5Filter,
IA5StringApproxMatchOID },
caseExactIA5SubstringsFilter,
NULL},
+ /* needs updating */
{"( 1.3.6.1.4.1.4203.666.4.1 NAME 'authPasswordMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
SLAP_MR_EQUALITY,
OpenLDAPaciMatch, NULL, NULL,
NULL},
+ {"( 1.2.840.113556.1.4.803 NAME 'integerBitAndMatch' "
+ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
+ SLAP_MR_EXT,
+ NULL, NULL,
+ integerBitAndMatch, NULL, NULL,
+ NULL},
+
+ {"( 1.2.840.113556.1.4.804 NAME 'integerBitOrMatch' "
+ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
+ SLAP_MR_EXT,
+ NULL, NULL,
+ integerBitOrMatch, NULL, NULL,
+ NULL},
+
{NULL, SLAP_MR_NONE, NULL, NULL, NULL, NULL}
};
schema_init_done = 1;
return LDAP_SUCCESS;
}
+
+void
+schema_destroy( void )
+{
+ oidm_destroy();
+ oc_destroy();
+ at_destroy();
+ mr_destroy();
+ syn_destroy();
+}