#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 "slap.h"
#include "ldap_pvt.h"
-#define UTF8MATCH 1
+#include "ldap_utf8.h"
-#ifdef USE_MD5
-#include "lutil_md5.h"
-/* We should replace MD5 with a faster hash */
-#define HASH_BYTES LUTIL_MD5_BYTES
-#define HASH_CONTEXT lutil_MD5_CTX
-#define HASH_Init(c) lutil_MD5Init(c)
-#define HASH_Update(c,buf,len) lutil_MD5Update(c,buf,len)
-#define HASH_Final(d,c) lutil_MD5Final(d,c)
-#else
#include "lutil_hash.h"
/* We should replace MD5 with a faster hash */
#define HASH_BYTES LUTIL_HASH_BYTES
#define HASH_Init(c) lutil_HASHInit(c)
#define HASH_Update(c,buf,len) lutil_HASHUpdate(c,buf,len)
#define HASH_Final(d,c) lutil_HASHFinal(d,c)
-#endif
/* recycled validatation routines */
#define berValidate blobValidate
/* recycled matching routines */
#define bitStringMatch octetStringMatch
-#define integerMatch caseIgnoreIA5Match
#define numericStringMatch caseIgnoreIA5Match
#define objectIdentifierMatch caseIgnoreIA5Match
#define telephoneNumberMatch caseIgnoreIA5Match
/* unimplemented matching routines */
#define caseIgnoreListMatch NULL
#define caseIgnoreListSubstringsMatch NULL
-#define presentationAddressMatch NULL
#define protocolInformationMatch NULL
#define integerFirstComponentMatch NULL
#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 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 )
{
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 */
}
+ /* 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 );
dn = ch_strdup( in->bv_val );
- rc = dn_validate( dn ) == NULL
- ? LDAP_INVALID_SYNTAX : LDAP_SUCCESS;
+ 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;
if ( val->bv_len != 0 ) {
char *dn;
-#ifdef USE_DN_NORMALIZE
out = ber_bvstr( UTF8normalize( val->bv_val, UTF8_CASEFOLD ) );
-#else
- out = ber_bvdup( val );
- ldap_pvt_str2upper( out->bv_val );
-#endif
+
dn = dn_validate( out->bv_val );
if( dn == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
- "dnMatch: %d\n %s\n %s\n", match,
- value->bv_val, asserted->bv_val ));
+ "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 );
+ match, value->bv_val, asserted->bv_val );
#endif
if( in->bv_len < 3 ) {
return LDAP_INVALID_SYNTAX;
}
+
if( in->bv_val[0] != 'B' ||
in->bv_val[1] != '\'' ||
in->bv_val[in->bv_len-1] != '\'' )
return LDAP_SUCCESS;
}
-#if UTF8MATCH
-/* case insensitive UTF8 strncmp with offset for second string */
-static int
-UTF8oncasecmp(
- struct berval *right,
- struct berval *left,
- ber_len_t len,
- ber_len_t offset )
-{
- ber_len_t r, l;
- int rlen, llen;
- int rslen, lslen;
- ldap_unicode_t ru, lu;
- ldap_unicode_t ruu, luu;
-
- rslen = len < right->bv_len ? len : right->bv_len;
- lslen = len + offset < left->bv_len ? len : left->bv_len;
-
- for( r = 0, l = offset;
- r < rslen && l < lslen;
- r+=rlen, l+=llen )
- {
- /*
- * XXYYZ: we convert to ucs4 even though -llunicode
- * expects ucs2 in an unsigned long
- */
- ru = ldap_utf8_to_ucs4( &right->bv_val[r] );
- if( ru == LDAP_UCS4_INVALID ) {
- return 1;
- }
-
- lu = ldap_utf8_to_ucs4( &left->bv_val[l] );
- if( lu == LDAP_UCS4_INVALID ) {
- return -1;
- }
-
- ruu = uctoupper( ru );
- luu = uctoupper( lu );
-
- if( ruu > luu ) {
- return 1;
- } else if( luu > ruu ) {
- return -1;
- }
-
- rlen = LDAP_UTF8_CHARLEN( &right->bv_val[r] );
- llen = LDAP_UTF8_CHARLEN( &left->bv_val[l] );
- }
-
- if( r < rslen ) {
- /* less left */
- return -1;
- }
-
- if( l < lslen ) {
- /* less right */
- return 1;
- }
-
- return 0;
-}
-
-static char *UTF8casechr( const char *str, const char *c )
-{
- char *p, *lower, *upper;
- ldap_ucs4_t tch, ch = ldap_utf8_to_ucs4(c);
-
- tch = uctolower ( ch );
- for( p = (char *) str; *p != '\0'; LDAP_UTF8_INCR(p) ) {
- if( ldap_utf8_to_ucs4( p ) == tch ) {
- break;
- }
- }
- lower = *p != '\0' ? p : NULL;
-
- tch = uctoupper ( ch );
- for( p = (char *) str; *p != '\0'; LDAP_UTF8_INCR(p) ) {
- if( ldap_utf8_to_ucs4( p ) == tch ) {
- break;
- }
- }
- upper = *p != '\0' ? p : NULL;
-
- if( lower && upper ) {
- return lower < upper ? lower : upper;
- } else if ( lower ) {
- return lower;
- } else {
- return upper;
- }
-}
-#endif
-
static int
UTF8StringValidate(
Syntax *syntax,
return LDAP_SUCCESS;
}
-#if defined(SLAPD_APPROX_MULTISTRING)
+/* Returns Unicode cannonically normalized copy of a substring assertion
+ * Skipping attribute description */
+SubstringsAssertion *
+UTF8SubstringsassertionNormalize(
+ SubstringsAssertion *sa,
+ char casefold )
+{
+ SubstringsAssertion *nsa;
+ int i;
+
+ nsa = (SubstringsAssertion *)ch_calloc( 1, sizeof(SubstringsAssertion) );
+ if( nsa == NULL ) {
+ return NULL;
+ }
+
+ if( sa->sa_initial != NULL ) {
+ nsa->sa_initial = ber_bvstr( UTF8normalize( sa->sa_initial->bv_val, casefold ) );
+ if( nsa->sa_initial == NULL ) {
+ goto err;
+ }
+ }
+
+ if( sa->sa_any != NULL ) {
+ for( i=0; sa->sa_any[i] != 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 ) {
+ goto err;
+ }
+ }
+ nsa->sa_any[i] = NULL;
+ }
+
+ if( sa->sa_final != NULL ) {
+ nsa->sa_final = ber_bvstr( UTF8normalize( sa->sa_final->bv_val, casefold ) );
+ if( nsa->sa_final == NULL ) {
+ goto err;
+ }
+ }
+
+ return nsa;
+
+err:
+ ch_free( nsa->sa_final );
+ ber_bvecfree( nsa->sa_any );
+ ch_free( nsa->sa_initial );
+ ch_free( nsa );
+ return NULL;
+}
+
+/* Strip characters with the 8th bit set */
+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 "._ "
{
char *val, *assertv, **values, **words, *c;
int i, count, len, nextchunk=0, nextavail=0;
+ size_t avlen;
+
+ /* Yes, this is necessary */
+ val = UTF8normalize( value->bv_val, UTF8_NOCASEFOLD );
+ if( val == NULL ) {
+ *matchp = 1;
+ return LDAP_SUCCESS;
+ }
+ strip8bitChars( val );
+ /* Yes, this is necessary */
+ assertv = UTF8normalize( ((struct berval *)assertedValue)->bv_val,
+ UTF8_NOCASEFOLD );
+ if( assertv == NULL ) {
+ free( val );
+ *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++ ) {
c = strpbrk( c, SLAPD_APPROX_DELIMITER );
if ( c == NULL ) break;
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 ( nextchunk < avlen ) {
len = strcspn( assertv + nextchunk, SLAPD_APPROX_DELIMITER);
if( len == 0 ) {
nextchunk++;
}
/* 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 );
+ free( val );
return LDAP_SUCCESS;
}
-
int
approxIndexer(
slap_mask_t use,
int i,j, len, wordcount, keycount=0;
struct berval **newkeys, **keys=NULL;
-
for( j=0; values[j] != NULL; j++ ) {
+ /* Yes, this is necessary */
+ val = UTF8normalize( values[j]->bv_val, 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 *) );
+ * sizeof(struct berval *) );
memcpy( newkeys, keys, keycount * sizeof(struct berval *) );
if( keys ) ch_free( keys );
keys = newkeys;
i++;
}
- ch_free( val );
+ free( val );
}
keys[keycount] = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
-
int
approxFilter(
slap_mask_t use,
int i, count, len;
struct berval **keys;
+ /* Yes, this is necessary */
+ val = UTF8normalize( ((struct berval *)assertValue)->bv_val,
+ UTF8_NOCASEFOLD );
+ if( val == NULL ) {
+ keys = (struct berval **)ch_malloc( sizeof(struct berval *) );
+ keys[0] = 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++;
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 );
+ keys[i] = ber_bvstr( phonetic( c ) );
i++;
}
- ch_free( val );
+ free( val );
keys[count] = NULL;
*keysp = keys;
void *assertedValue )
{
char *vapprox, *avapprox;
+ char *s, *t;
+
+ /* Yes, this is necessary */
+ s = UTF8normalize( value->bv_val, UTF8_NOCASEFOLD );
+ if( s == NULL ) {
+ *matchp = 1;
+ return LDAP_SUCCESS;
+ }
+
+ /* Yes, this is necessary */
+ t = UTF8normalize( ((struct berval *)assertedValue)->bv_val,
+ UTF8_NOCASEFOLD );
+ if( t == NULL ) {
+ free( s );
+ *matchp = -1;
+ return LDAP_SUCCESS;
+ }
- vapprox = phonetic( value->bv_val );
- avapprox = phonetic( ((struct berval *)assertedValue)->bv_val);
+ vapprox = phonetic( strip8bitChars( s ) );
+ avapprox = phonetic( strip8bitChars( t ) );
+
+ free( s );
+ free( t );
*matchp = strcmp( vapprox, avapprox );
{
int i;
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) );
/* 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]->bv_val, UTF8_NOCASEFOLD );
+
+ /* strip 8-bit chars and run through phonetic() */
+ keys[i] = ber_bvstr( phonetic( strip8bitChars( s ) ) );
+ free( s );
}
keys[i] = NULL;
struct berval ***keysp )
{
struct berval **keys;
-
+ char *s;
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)->bv_val,
+ 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;
struct berval *value,
void *assertedValue )
{
- int match = value->bv_len - ((struct berval *) assertedValue)->bv_len;
-
- if( match == 0 ) {
- match = strncmp( value->bv_val,
- ((struct berval *) assertedValue)->bv_val,
- value->bv_len );
- }
-
- *matchp = match;
+ *matchp = UTF8normcmp( value->bv_val,
+ ((struct berval *) assertedValue)->bv_val,
+ UTF8_NOCASEFOLD );
return LDAP_SUCCESS;
}
static int
-caseExactSubstringsMatch(
+caseExactIgnoreSubstringsMatch(
int *matchp,
slap_mask_t flags,
Syntax *syntax,
void *assertedValue )
{
int match = 0;
- SubstringsAssertion *sub = assertedValue;
- struct berval left = *value;
+ SubstringsAssertion *sub;
+ struct berval left;
int i;
ber_len_t inlen=0;
+ char *nav, casefold;
+
+ casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
+ nav = UTF8normalize( value->bv_val, casefold );
+ if( nav == NULL ) {
+ match = 1;
+ goto done;
+ }
+ left.bv_val = nav;
+ left.bv_len = strlen( nav );
+
+ sub = UTF8SubstringsassertionNormalize( assertedValue, casefold );
+ if( sub == NULL ) {
+ match = -1;
+ goto done;
+ }
/* Add up asserted input length */
if( sub->sa_initial ) {
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:
- *matchp = match;
- return LDAP_SUCCESS;
-}
-
-/* Index generation function */
-int caseExactIndexer(
- 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;
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( values[i]->bv_val, UTF8_NOCASEFOLD ) );
-#else
- value = values[i];
-#endif
-
- 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 );
-
-#if UTF8MATCH
- ber_bvfree( value );
-#endif
-
- keys[i] = ber_bvdup( &digest );
- }
-
- keys[i] = NULL;
- *keysp = keys;
- return LDAP_SUCCESS;
-}
-
-/* Index generation function */
-int caseExactFilter(
- 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 );
-
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( ((struct berval *) assertValue)->bv_val, UTF8_NOCASEFOLD ) );
-#else
- value = (struct berval *) assertValue;
-#endif
-
- 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;
-
-#if UTF8MATCH
- ber_bvfree( value );
-#endif
-
- *keysp = keys;
- return LDAP_SUCCESS;
-}
-
-/* Substrings Index generation function */
-int caseExactSubstringsIndexer(
- 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;
- 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;
- 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++ ) {
- ber_len_t j,max;
- struct berval *value;
-
- if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
-
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( values[i]->bv_val, UTF8_NOCASEFOLD ) );
-#else
- value = values[i];
-#endif
-
- 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 );
- }
-
- }
-
-#if UTF8MATCH
- ber_bvfree( value );
-#endif
-
- }
-
- if( nkeys > 0 ) {
- keys[nkeys] = NULL;
- *keysp = keys;
- } else {
- ch_free( keys );
- *keysp = NULL;
- }
-
- return LDAP_SUCCESS;
-}
-
-int caseExactSubstringsFilter(
- slap_mask_t use,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *prefix,
- void * assertValue,
- struct berval ***keysp )
-{
- SubstringsAssertion *sa = assertValue;
- 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;
-
- 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 );
- }
- }
- }
-
- 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;
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( sa->sa_initial->bv_val, UTF8_NOCASEFOLD ) );
-#else
- value = sa->sa_initial;
-#endif
-
- 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 );
- }
- 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 );
-
-#if UTF8MATCH
- ber_bvfree( value );
-#endif
- 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;
- }
-
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( sa->sa_any[i]->bv_val, UTF8_NOCASEFOLD ) );
-#else
- value = sa->sa_any[i];
-#endif
-
- 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 );
- }
-
-#if UTF8MATCH
- ber_bvfree( value );
-#endif
- }
- }
-
- 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;
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( sa->sa_final->bv_val, UTF8_NOCASEFOLD ) );
-#else
- value = sa->sa_final;
-#endif
-
- 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 );
- }
- 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 UTF8MATCH
- ber_bvfree( value );
-#endif
- keys[nkeys++] = ber_bvdup( &digest );
- }
-
- if( nkeys > 0 ) {
- keys[nkeys] = NULL;
- *keysp = keys;
- } else {
- ch_free( keys );
- *keysp = NULL;
- }
-
- return LDAP_SUCCESS;
-}
-
-static int
-caseIgnoreMatch(
- int *matchp,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *value,
- void *assertedValue )
-{
-#if UTF8MATCH
- *matchp = UTF8normcmp( value->bv_val,
- ((struct berval *) assertedValue)->bv_val,
- UTF8_CASEFOLD );
-#else
- int match = value->bv_len - ((struct berval *) assertedValue)->bv_len;
-
- if( match == 0 ) {
- match = strncasecmp( value->bv_val,
- ((struct berval *) assertedValue)->bv_val,
- value->bv_len );
- }
-
- *matchp = match;
-#endif
- return LDAP_SUCCESS;
-}
-
-static int
-caseIgnoreSubstringsMatch(
- int *matchp,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *value,
- void *assertedValue )
-{
- int match = 0;
- SubstringsAssertion *sub = assertedValue;
- struct berval left = *value;
- int i;
- ber_len_t inlen=0;
-
- /* 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;
- }
- }
- if( sub->sa_final ) {
- inlen += sub->sa_final->bv_len;
- }
-
- if( sub->sa_initial ) {
- if( inlen > left.bv_len ) {
- match = 1;
- goto done;
- }
-
-#if UTF8MATCH
- match = UTF8oncasecmp( sub->sa_initial, &left,
- sub->sa_initial->bv_len, 0 );
-#else
- match = strncasecmp( sub->sa_initial->bv_val, left.bv_val,
- sub->sa_initial->bv_len );
-#endif
-
- 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;
- }
-
-#if UTF8MATCH
- match = UTF8oncasecmp( sub->sa_final, &left,
- sub->sa_final->bv_len,
- left.bv_len - sub->sa_final->bv_len );
-#else
- match = strncasecmp( sub->sa_final->bv_val,
- &left.bv_val[left.bv_len - sub->sa_final->bv_len],
- sub->sa_final->bv_len );
-#endif
-
- 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;
- }
-
-#if UTF8MATCH
- p = UTF8casechr( left.bv_val, sub->sa_any[i]->bv_val );
-#else
- p = strcasechr( left.bv_val, *sub->sa_any[i]->bv_val );
-#endif
-
- 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;
- }
-
-#if UTF8MATCH
- match = UTF8oncasecmp( &left, sub->sa_any[i],
- sub->sa_any[i]->bv_len, 0 );
-
- if( match != 0 ) {
- int len = LDAP_UTF8_CHARLEN( left.bv_val );
- left.bv_val += len;
- left.bv_len -= len;
- goto retry;
+ goto done;
}
-#else
- match = strncasecmp( left.bv_val,
+
+ 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;
}
-#endif
left.bv_val += sub->sa_any[i]->bv_len;
left.bv_len -= 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(
+int caseExactIgnoreIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
struct berval ***keysp )
{
int i;
+ char casefold;
size_t slen, mlen;
struct berval **keys;
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 );
-
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 = ch_malloc( sizeof( struct berval * ) * (i+1) );
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;
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( values[i]->bv_val, UTF8_CASEFOLD ) );
-#else
- value = ber_bvdup( values[i] );
- ldap_pvt_str2upper( value->bv_val );
-#endif
+ value = ber_bvstr( UTF8normalize( values[i]->bv_val,
+ casefold ) );
+
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
HASH_Update( &HASHcontext,
}
/* Index generation function */
-int caseIgnoreFilter(
+int caseExactIgnoreFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
void * assertValue,
struct berval ***keysp )
{
+ char casefold;
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( ((struct berval *) assertValue)->bv_val, UTF8_CASEFOLD ) );
-#else
- value = ber_bvdup( (struct berval *) assertValue );
- ldap_pvt_str2upper( value->bv_val );
-#endif
+ casefold = strcmp( mr->smr_oid, caseExactMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
+ value = ber_bvstr( UTF8normalize( ((struct berval *) assertValue)->bv_val,
+ 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 );
ber_bvfree( value );
*keysp = keys;
-
return LDAP_SUCCESS;
}
/* Substrings Index generation function */
-int caseIgnoreSubstringsIndexer(
+int caseExactIgnoreSubstringsIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
struct berval **values,
struct berval ***keysp )
{
+ char casefold;
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);
+ nkeys=0;
+
+ for( i=0; values[i] != NULL; i++ ) {
+ /* empty - just count them */
+ }
+
/* we should have at least one value at this point */
- assert( values != NULL && values[0] != NULL );
+ 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,
+ casefold ) );
+ }
+ nvalues[i] = NULL;
+ values = nvalues;
- nkeys=0;
for( i=0; values[i] != NULL; i++ ) {
/* count number of indices to generate */
if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) {
nkeys=0;
for( i=0; values[i] != NULL; i++ ) {
- int j,max;
+ ber_len_t j,max;
struct berval *value;
if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( values[i]->bv_val, UTF8_CASEFOLD ) );
-#else
- value = ber_bvdup( values[i] );
- ldap_pvt_str2upper( value->bv_val );
-#endif
+ value = values[i];
if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
( value->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
}
- ber_bvfree( value );
}
if( nkeys > 0 ) {
*keysp = NULL;
}
+ ber_bvecfree( nvalues );
+
return LDAP_SUCCESS;
}
-int caseIgnoreSubstringsFilter(
+int caseExactIgnoreSubstringsFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
void * assertValue,
struct berval ***keysp )
{
- SubstringsAssertion *sa = assertValue;
- char pre;
+ SubstringsAssertion *sa;
+ char pre, casefold;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
struct berval **keys;
struct berval *value;
struct berval digest;
- if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial != NULL &&
+ 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 )
{
nkeys++;
}
- if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
+ 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 ) {
}
}
- if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final != NULL &&
+ if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
nkeys = 0;
- if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial != NULL &&
+ 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;
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( sa->sa_initial->bv_val, UTF8_CASEFOLD ) );
-#else
- value = ber_bvdup( sa->sa_initial );
- ldap_pvt_str2upper( value->bv_val );
-#endif
+ 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 );
- ber_bvfree( value );
keys[nkeys++] = ber_bvdup( &digest );
}
- if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
+ 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;
continue;
}
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( sa->sa_any[i]->bv_val, UTF8_CASEFOLD ) );
-#else
- value = ber_bvdup( sa->sa_any[i] );
- ldap_pvt_str2upper( value->bv_val );
-#endif
+ value = sa->sa_any[i];
for(j=0;
j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
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_bvfree( value );
}
}
- if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final != NULL &&
+ 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;
-#if UTF8MATCH
- value = ber_bvstr( UTF8normalize( sa->sa_final->bv_val, UTF8_CASEFOLD ) );
-#else
- value = ber_bvdup( sa->sa_final );
- ldap_pvt_str2upper( value->bv_val );
-#endif
+ 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 );
- ber_bvfree( value );
keys[nkeys++] = ber_bvdup( &digest );
}
ch_free( keys );
*keysp = NULL;
}
+ ch_free( sa->sa_final );
+ ber_bvecfree( sa->sa_any );
+ ch_free( sa->sa_initial );
+ ch_free( sa );
+
+ return LDAP_SUCCESS;
+}
+static int
+caseIgnoreMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ *matchp = UTF8normcmp( value->bv_val,
+ ((struct berval *) assertedValue)->bv_val,
+ UTF8_CASEFOLD );
return LDAP_SUCCESS;
}
return LDAP_INVALID_SYNTAX;
}
+static int
+integerMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ char *v, *av;
+ int vsign=0, avsign=0;
+ struct berval *asserted;
+ ber_len_t vlen, avlen;
+
+
+ /* Start off pessimistic */
+ *matchp = 1;
+
+ /* 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 */
+ }
+ else if ( *v == '+' ) {
+ vsign = 1;
+ }
+ else if ( *v == '-' ) {
+ vsign = -1;
+ }
+ else if ( ASCII_DIGIT(*v) ) {
+ if ( vsign == 0 ) vsign = 1;
+ vsign *= 2;
+ break;
+ }
+ 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--;
+ }
+
+ /* 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;
+
+ if( vsign != avsign ) return LDAP_SUCCESS;
+
+ /* Check the significant digits */
+ while( vlen && avlen ) {
+ if( *v != *av ) break;
+ v++;
+ vlen--;
+ av++;
+ avlen--;
+ }
+
+ /* If all digits compared equal, the numbers are equal */
+ if(( vlen == 0 ) && ( avlen == 0 )) {
+ *matchp = 0;
+ }
+ return LDAP_SUCCESS;
+}
+
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;
}
struct berval *val,
struct berval **normalized )
{
- int negative;
- struct berval *newval;
char *p;
+ int negative=0;
+ struct berval *newval;
+ 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++;
+ while ( len && ( *p == '0' )) {
+ p++;
+ len--;
+ }
newval = (struct berval *) ch_malloc( sizeof(struct berval) );
- if( *p == '\0' ) {
+ /* 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 ) {
newval->bv_val = ch_strdup("0");
newval->bv_len = 1;
- goto done;
+ }
+ else {
+ newval->bv_len = len+negative;
+ newval->bv_val = ch_malloc( newval->bv_len );
+ if( negative ) {
+ newval->bv_val[0] = '-';
+ }
+ memcpy( newval->bv_val + negative, p, len );
}
- newval->bv_val = ch_malloc( val->bv_len + 1 );
- newval->bv_len = 0;
+ *normalized = newval;
+ return LDAP_SUCCESS;
+}
+
+/* Index generation function */
+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] = NULL;
+ *keysp = keys;
+ return LDAP_SUCCESS;
+}
+
+/* Index generation function */
+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] = NULL;
+ *keysp = keys;
+
return LDAP_SUCCESS;
}
+
static int
countryStringValidate(
Syntax *syntax,
struct berval *val )
{
- ber_len_t i;
-
if( val->bv_len != 2 ) return LDAP_INVALID_SYNTAX;
if( !SLAP_PRINTABLE(val->bv_val[0]) ) {
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 */
}
+ /* 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 );
{
ber_len_t i;
- /* disallow empty numeric strings */
-
for(i=0; i < in->bv_len; i++) {
if( !SLAP_NUMERIC(in->bv_val[i]) ) {
return LDAP_INVALID_SYNTAX;
}
}
- assert( newval->bv_val < p );
- assert( q <= p );
+ /* we should have copied no more then is in val */
+ assert( (q - newval->bv_val) <= (p - val->bv_val) );
/* null terminate */
*q = '\0';
#else
Debug( LDAP_DEBUG_ARGS, "objectIdentifierFirstComponentMatch "
"%d\n\t\"%s\"\n\t\"%s\"\n",
- match, value->bv_val, asserted->bv_val );
+ match, value->bv_val, asserted->bv_val );
#endif
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;
+}
+
static int
check_time_syntax (struct berval *val,
int start,
p = (char *)val->bv_val;
e = p + val->bv_len;
-#if 0
- /* syntax does not allow leading white space */
- /* Ignore initial whitespace */
- while ( ( p < e ) && ASCII_SPACE( *p ) ) {
- p++;
- }
-#endif
-
if ( *p != '(' /*')'*/ ) {
return LDAP_INVALID_SYNTAX;
}
p++;
-#if 0
- /* syntax does not allow trailing white space */
- /* Ignore trailing whitespace */
- while ( ( p < e ) && ASCII_SPACE( *p ) ) {
- p++;
- }
-#endif
-
if (p != e) {
return LDAP_INVALID_SYNTAX;
}
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
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.50 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
NULL, NULL,
- telephoneNumberMatch, NULL, NULL,
+ telephoneNumberMatch,
+ telephoneNumberIndexer,
+ telephoneNumberFilter,
NULL},
{"( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
SLAP_MR_SUBSTR | SLAP_MR_EXT,
NULL, NULL,
- telephoneNumberSubstringsMatch, NULL, NULL,
+ telephoneNumberSubstringsMatch,
+ telephoneNumberSubstringsIndexer,
+ telephoneNumberSubstringsFilter,
NULL},
{"( 2.5.13.22 NAME 'presentationAddressMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
NULL, NULL,
- presentationAddressMatch, NULL, NULL,
+ NULL, NULL, NULL,
NULL},
{"( 2.5.13.23 NAME 'uniqueMemberMatch' "
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}
};
for ( i=0; syntax_defs[i].sd_desc != NULL; i++ ) {
res = register_syntax( syntax_defs[i].sd_desc,
- syntax_defs[i].sd_flags,
- syntax_defs[i].sd_validate,
- syntax_defs[i].sd_normalize,
+ syntax_defs[i].sd_flags,
+ syntax_defs[i].sd_validate,
+ syntax_defs[i].sd_normalize,
syntax_defs[i].sd_pretty
#ifdef SLAPD_BINARY_CONVERSION
,
- syntax_defs[i].sd_ber2str,
+ syntax_defs[i].sd_ber2str,
syntax_defs[i].sd_str2ber
#endif
);
mrule_defs[i].mrd_usage,
mrule_defs[i].mrd_convert,
mrule_defs[i].mrd_normalize,
- mrule_defs[i].mrd_match,
+ mrule_defs[i].mrd_match,
mrule_defs[i].mrd_indexer,
mrule_defs[i].mrd_filter,
mrule_defs[i].mrd_associated );
projects / openldap / blobdiff