X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema_init.c;h=52cb7f8550e5a78cc7f3209bbffb464cdeac1896;hb=0a465343fb6d6d8df9091699885bf352c3b1d4b3;hp=a3cd70f295b0159d874af52bee4be9eb0581468a;hpb=80fa73bf8c08b9acbae058012bcf048bcca57226;p=openldap diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index a3cd70f295..52cb7f8550 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -1,14 +1,25 @@ /* schema_init.c - init builtin schema */ /* $OpenLDAP$ */ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2006 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . */ #include "portable.h" #include +#ifdef HAVE_LIMITS_H #include +#endif #include #include @@ -16,8 +27,6 @@ #include #include "slap.h" -#include "ldap_pvt.h" -#include "lber_pvt.h" #include "ldap_utf8.h" @@ -33,6 +42,7 @@ #include #endif +#include "lutil.h" #include "lutil_hash.h" #define HASH_BYTES LUTIL_HASH_BYTES #define HASH_CONTEXT lutil_HASH_CTX @@ -40,8 +50,6 @@ #define HASH_Update(c,buf,len) lutil_HASHUpdate(c,buf,len) #define HASH_Final(d,c) lutil_HASHFinal(d,c) -#define OpenLDAPaciMatch NULL - /* approx matching rules */ #define directoryStringApproxMatchOID "1.3.6.1.4.1.4203.666.4.4" #define directoryStringApproxMatch approxMatch @@ -52,6 +60,26 @@ #define IA5StringApproxIndexer approxIndexer #define IA5StringApproxFilter approxFilter +/* Change Sequence Number (CSN) - much of this will change */ +#define csnValidate blobValidate +#define csnMatch octetStringMatch +#define csnOrderingMatch octetStringOrderingMatch +#define csnIndexer generalizedTimeIndexer +#define csnFilter generalizedTimeFilter + +#ifdef SLAP_AUTHZ_SYNTAX +/* FIXME: temporary */ +#define authzMatch octetStringMatch +#endif /* SLAP_AUTHZ_SYNTAX */ + +unsigned int index_substr_if_minlen = SLAP_INDEX_SUBSTR_IF_MINLEN_DEFAULT; +unsigned int index_substr_if_maxlen = SLAP_INDEX_SUBSTR_IF_MAXLEN_DEFAULT; +unsigned int index_substr_any_len = SLAP_INDEX_SUBSTR_ANY_LEN_DEFAULT; +unsigned int index_substr_any_step = SLAP_INDEX_SUBSTR_ANY_STEP_DEFAULT; + +ldap_pvt_thread_mutex_t ad_undef_mutex; +ldap_pvt_thread_mutex_t oc_undef_mutex; + static int inValidate( Syntax *syntax, @@ -88,7 +116,7 @@ sequenceValidate( static int certificateValidate( Syntax *syntax, struct berval *in ) { X509 *xcert=NULL; - unsigned char *p = in->bv_val; + unsigned char *p = (unsigned char *)in->bv_val; xcert = d2i_X509(NULL, &p, in->bv_len); if ( !xcert ) return LDAP_INVALID_SYNTAX; @@ -99,7 +127,7 @@ static int certificateValidate( Syntax *syntax, struct berval *in ) #define certificateValidate sequenceValidate #endif -static int +int octetStringMatch( int *matchp, slap_mask_t flags, @@ -141,6 +169,37 @@ octetStringOrderingMatch( return LDAP_SUCCESS; } +static void +hashPreset( + HASH_CONTEXT *HASHcontext, + struct berval *prefix, + char pre, + Syntax *syntax, + MatchingRule *mr) +{ + HASH_Init(HASHcontext); + if(prefix && prefix->bv_len > 0) { + HASH_Update(HASHcontext, + (unsigned char *)prefix->bv_val, prefix->bv_len); + } + if(pre) HASH_Update(HASHcontext, (unsigned char*)&pre, sizeof(pre)); + HASH_Update(HASHcontext, (unsigned char*)syntax->ssyn_oid, syntax->ssyn_oidlen); + HASH_Update(HASHcontext, (unsigned char*)mr->smr_oid, mr->smr_oidlen); + return; +} + +static void +hashIter( + HASH_CONTEXT *HASHcontext, + unsigned char *HASHdigest, + unsigned char *value, + int len) +{ + HASH_CONTEXT ctx = *HASHcontext; + HASH_Update( &ctx, value, len ); + HASH_Final( HASHdigest, &ctx ); +} + /* Index generation function */ int octetStringIndexer( slap_mask_t use, @@ -158,40 +217,29 @@ int octetStringIndexer( HASH_CONTEXT HASHcontext; unsigned char HASHdigest[HASH_BYTES]; struct berval digest; - digest.bv_val = HASHdigest; + digest.bv_val = (char *)HASHdigest; digest.bv_len = sizeof(HASHdigest); - for( i=0; values[i].bv_val != NULL; i++ ) { + for( i=0; !BER_BVISNULL( &values[i] ); i++ ) { /* just count them */ } /* we should have at least one value at this point */ assert( i > 0 ); - keys = sl_malloc( sizeof( struct berval ) * (i+1), ctx ); + keys = slap_sl_malloc( sizeof( struct berval ) * (i+1), ctx ); slen = syntax->ssyn_oidlen; mlen = mr->smr_oidlen; - for( i=0; values[i].bv_val != NULL; i++ ) { - 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, - values[i].bv_val, values[i].bv_len ); - HASH_Final( HASHdigest, &HASHcontext ); - + hashPreset( &HASHcontext, prefix, 0, syntax, mr); + for( i=0; !BER_BVISNULL( &values[i] ); i++ ) { + hashIter( &HASHcontext, HASHdigest, + (unsigned char *)values[i].bv_val, values[i].bv_len ); ber_dupbv_x( &keys[i], &digest, ctx ); } - keys[i].bv_val = NULL; - keys[i].bv_len = 0; + BER_BVZERO( &keys[i] ); *keysp = keys; @@ -215,30 +263,20 @@ int octetStringFilter( unsigned char HASHdigest[HASH_BYTES]; struct berval *value = (struct berval *) assertedValue; struct berval digest; - digest.bv_val = HASHdigest; + digest.bv_val = (char *)HASHdigest; digest.bv_len = sizeof(HASHdigest); slen = syntax->ssyn_oidlen; mlen = mr->smr_oidlen; - keys = sl_malloc( sizeof( struct berval ) * 2, ctx ); + keys = slap_sl_malloc( sizeof( struct berval ) * 2, ctx ); - 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 ); + hashPreset( &HASHcontext, prefix, 0, syntax, mr ); + hashIter( &HASHcontext, HASHdigest, + (unsigned char *)value->bv_val, value->bv_len ); ber_dupbv_x( keys, &digest, ctx ); - keys[1].bv_val = NULL; - keys[1].bv_len = 0; + BER_BVZERO( &keys[1] ); *keysp = keys; @@ -261,20 +299,20 @@ octetStringSubstringsMatch( ber_len_t inlen = 0; /* Add up asserted input length */ - if( sub->sa_initial.bv_val ) { + if ( !BER_BVISNULL( &sub->sa_initial ) ) { inlen += sub->sa_initial.bv_len; } - if( sub->sa_any ) { - for(i=0; sub->sa_any[i].bv_val != NULL; i++) { + if ( sub->sa_any ) { + for ( i = 0; !BER_BVISNULL( &sub->sa_any[i] ); i++ ) { inlen += sub->sa_any[i].bv_len; } } - if( sub->sa_final.bv_val ) { + if ( !BER_BVISNULL( &sub->sa_final ) ) { inlen += sub->sa_final.bv_len; } - if( sub->sa_initial.bv_val ) { - if( inlen > left.bv_len ) { + if ( !BER_BVISNULL( &sub->sa_initial ) ) { + if ( inlen > left.bv_len ) { match = 1; goto done; } @@ -282,7 +320,7 @@ octetStringSubstringsMatch( match = memcmp( sub->sa_initial.bv_val, left.bv_val, sub->sa_initial.bv_len ); - if( match != 0 ) { + if ( match != 0 ) { goto done; } @@ -291,8 +329,8 @@ octetStringSubstringsMatch( inlen -= sub->sa_initial.bv_len; } - if( sub->sa_final.bv_val ) { - if( inlen > left.bv_len ) { + if ( !BER_BVISNULL( &sub->sa_final ) ) { + if ( inlen > left.bv_len ) { match = 1; goto done; } @@ -301,7 +339,7 @@ octetStringSubstringsMatch( &left.bv_val[left.bv_len - sub->sa_final.bv_len], sub->sa_final.bv_len ); - if( match != 0 ) { + if ( match != 0 ) { goto done; } @@ -309,19 +347,19 @@ octetStringSubstringsMatch( inlen -= sub->sa_final.bv_len; } - if( sub->sa_any ) { - for(i=0; sub->sa_any[i].bv_val; i++) { + if ( sub->sa_any ) { + for ( i = 0; !BER_BVISNULL( &sub->sa_any[i] ); i++ ) { ber_len_t idx; char *p; retry: - if( inlen > left.bv_len ) { + if ( inlen > left.bv_len ) { /* not enough length */ match = 1; goto done; } - if( sub->sa_any[i].bv_len == 0 ) { + if ( BER_BVISEMPTY( &sub->sa_any[i] ) ) { continue; } @@ -334,7 +372,7 @@ retry: idx = p - left.bv_val; - if( idx >= left.bv_len ) { + if ( idx >= left.bv_len ) { /* this shouldn't happen */ return LDAP_OTHER; } @@ -342,7 +380,7 @@ retry: 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; @@ -352,7 +390,7 @@ retry: sub->sa_any[i].bv_val, sub->sa_any[i].bv_len ); - if( match != 0 ) { + if ( match != 0 ) { left.bv_val++; left.bv_len--; goto retry; @@ -381,45 +419,41 @@ octetStringSubstringsIndexer( BerVarray *keysp, void *ctx ) { - ber_len_t i, j, nkeys; + ber_len_t i, nkeys; size_t slen, mlen; BerVarray keys; - HASH_CONTEXT HASHcontext; + HASH_CONTEXT HCany, HCini, HCfin; unsigned char HASHdigest[HASH_BYTES]; struct berval digest; - digest.bv_val = HASHdigest; + digest.bv_val = (char *)HASHdigest; digest.bv_len = sizeof(HASHdigest); - nkeys=0; + nkeys = 0; - for( i=0; values[i].bv_val != NULL; i++ ) { + for ( i = 0; !BER_BVISNULL( &values[i] ); 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( values[i].bv_len >= index_substr_if_maxlen ) { + nkeys += index_substr_if_maxlen - + (index_substr_if_minlen - 1); + } else if( values[i].bv_len >= index_substr_if_minlen ) { + nkeys += values[i].bv_len - (index_substr_if_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( values[i].bv_len >= index_substr_any_len ) { + nkeys += values[i].bv_len - (index_substr_any_len - 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( values[i].bv_len >= index_substr_if_maxlen ) { + nkeys += index_substr_if_maxlen - + (index_substr_if_minlen - 1); + } else if( values[i].bv_len >= index_substr_if_minlen ) { + nkeys += values[i].bv_len - (index_substr_if_minlen - 1); } } } @@ -430,97 +464,60 @@ octetStringSubstringsIndexer( return LDAP_SUCCESS; } - keys = sl_malloc( sizeof( struct berval ) * (nkeys+1), ctx ); + keys = slap_sl_malloc( sizeof( struct berval ) * (nkeys+1), ctx ); slen = syntax->ssyn_oidlen; mlen = mr->smr_oidlen; - nkeys=0; - for( i=0; values[i].bv_val != NULL; i++ ) { - ber_len_t j,max; + if ( flags & SLAP_INDEX_SUBSTR_ANY ) + hashPreset( &HCany, prefix, SLAP_INDEX_SUBSTR_PREFIX, syntax, mr ); + if( flags & SLAP_INDEX_SUBSTR_INITIAL ) + hashPreset( &HCini, prefix, SLAP_INDEX_SUBSTR_INITIAL_PREFIX, syntax, mr ); + if( flags & SLAP_INDEX_SUBSTR_FINAL ) + hashPreset( &HCfin, prefix, SLAP_INDEX_SUBSTR_FINAL_PREFIX, syntax, mr ); - if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue; + nkeys = 0; + for ( i = 0; !BER_BVISNULL( &values[i] ); i++ ) { + ber_len_t j,max; if( ( flags & SLAP_INDEX_SUBSTR_ANY ) && - ( values[i].bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) ) + ( values[i].bv_len >= index_substr_any_len ) ) { - char pre = SLAP_INDEX_SUBSTR_PREFIX; - max = values[i].bv_len - (SLAP_INDEX_SUBSTR_MAXLEN - 1); + max = values[i].bv_len - (index_substr_any_len - 1); for( j=0; jbv_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, - &values[i].bv_val[j], - SLAP_INDEX_SUBSTR_MAXLEN ); - HASH_Final( HASHdigest, &HASHcontext ); - + hashIter( &HCany, HASHdigest, + (unsigned char *)&values[i].bv_val[j], + index_substr_any_len ); ber_dupbv_x( &keys[nkeys++], &digest, ctx ); } } - max = SLAP_INDEX_SUBSTR_MAXLEN < values[i].bv_len - ? SLAP_INDEX_SUBSTR_MAXLEN : values[i].bv_len; + /* skip if too short */ + if( values[i].bv_len < index_substr_if_minlen ) continue; - for( j=SLAP_INDEX_SUBSTR_MINLEN; j<=max; j++ ) { - char pre; + max = index_substr_if_maxlen < values[i].bv_len + ? index_substr_if_maxlen : values[i].bv_len; - 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, - values[i].bv_val, j ); - HASH_Final( HASHdigest, &HASHcontext ); + for( j=index_substr_if_minlen; j<=max; j++ ) { + if( flags & SLAP_INDEX_SUBSTR_INITIAL ) { + hashIter( &HCini, HASHdigest, + (unsigned char *)values[i].bv_val, j ); ber_dupbv_x( &keys[nkeys++], &digest, ctx ); } 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, - &values[i].bv_val[values[i].bv_len-j], j ); - HASH_Final( HASHdigest, &HASHcontext ); - + hashIter( &HCfin, HASHdigest, + (unsigned char *)&values[i].bv_val[values[i].bv_len-j], j ); ber_dupbv_x( &keys[nkeys++], &digest, ctx ); } } - } if( nkeys > 0 ) { - keys[nkeys].bv_val = NULL; + BER_BVZERO( &keys[nkeys] ); *keysp = keys; } else { ch_free( keys ); @@ -553,27 +550,39 @@ octetStringSubstringsFilter ( sa = (SubstringsAssertion *) assertedValue; - if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL - && sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN ) + if( flags & SLAP_INDEX_SUBSTR_INITIAL && + !BER_BVISNULL( &sa->sa_initial ) && + sa->sa_initial.bv_len >= index_substr_if_minlen ) { nkeys++; + if ( sa->sa_initial.bv_len > index_substr_if_maxlen && + ( flags & SLAP_INDEX_SUBSTR_ANY )) + { + nkeys += 1 + (sa->sa_initial.bv_len - index_substr_if_maxlen) / index_substr_any_step; + } } - 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].bv_val != NULL; i++ ) { - if( sa->sa_any[i].bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) { - /* don't bother accounting for stepping */ + for( i=0; !BER_BVISNULL( &sa->sa_any[i] ); i++ ) { + if( sa->sa_any[i].bv_len >= index_substr_any_len ) { + /* don't bother accounting with stepping */ nkeys += sa->sa_any[i].bv_len - - ( SLAP_INDEX_SUBSTR_MAXLEN - 1 ); + ( index_substr_any_len - 1 ); } } } - if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL && - sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN ) + if( flags & SLAP_INDEX_SUBSTR_FINAL && + !BER_BVISNULL( &sa->sa_final ) && + sa->sa_final.bv_len >= index_substr_if_minlen ) { nkeys++; + if ( sa->sa_final.bv_len > index_substr_if_maxlen && + ( flags & SLAP_INDEX_SUBSTR_ANY )) + { + nkeys += 1 + (sa->sa_final.bv_len - index_substr_if_maxlen) / index_substr_any_step; + } } if( nkeys == 0 ) { @@ -581,107 +590,105 @@ octetStringSubstringsFilter ( return LDAP_SUCCESS; } - digest.bv_val = HASHdigest; + digest.bv_val = (char *)HASHdigest; digest.bv_len = sizeof(HASHdigest); slen = syntax->ssyn_oidlen; mlen = mr->smr_oidlen; - keys = sl_malloc( sizeof( struct berval ) * (nkeys+1), ctx ); + keys = slap_sl_malloc( sizeof( struct berval ) * (nkeys+1), ctx ); nkeys = 0; - if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL && - sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN ) + if( flags & SLAP_INDEX_SUBSTR_INITIAL && + !BER_BVISNULL( &sa->sa_initial ) && + sa->sa_initial.bv_len >= index_substr_if_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 ); - } - 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 ); + klen = index_substr_if_maxlen < value->bv_len + ? index_substr_if_maxlen : value->bv_len; + hashPreset( &HASHcontext, prefix, pre, syntax, mr ); + hashIter( &HASHcontext, HASHdigest, + (unsigned char *)value->bv_val, klen ); ber_dupbv_x( &keys[nkeys++], &digest, ctx ); + + /* If initial is too long and we have subany indexed, use it + * to match the excess... + */ + if (value->bv_len > index_substr_if_maxlen && (flags & SLAP_INDEX_SUBSTR_ANY)) + { + ber_len_t j; + pre = SLAP_INDEX_SUBSTR_PREFIX; + hashPreset( &HASHcontext, prefix, pre, syntax, mr); + for ( j=index_substr_if_maxlen-1; j <= value->bv_len - index_substr_any_len; j+=index_substr_any_step ) + { + hashIter( &HASHcontext, HASHdigest, + (unsigned char *)&value->bv_val[j], index_substr_any_len ); + ber_dupbv_x( &keys[nkeys++], &digest, ctx ); + } + } } 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; + klen = index_substr_any_len; - for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) { - if( sa->sa_any[i].bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) { + for( i=0; !BER_BVISNULL( &sa->sa_any[i] ); i++ ) { + if( sa->sa_any[i].bv_len < index_substr_any_len ) { continue; } value = &sa->sa_any[i]; + hashPreset( &HASHcontext, prefix, pre, syntax, mr); for(j=0; - j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN; - j += SLAP_INDEX_SUBSTR_STEP ) + j <= value->bv_len - index_substr_any_len; + j += index_substr_any_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 ); - + hashIter( &HASHcontext, HASHdigest, + (unsigned char *)&value->bv_val[j], klen ); ber_dupbv_x( &keys[nkeys++], &digest, ctx ); } } } - if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL && - sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN ) + if( flags & SLAP_INDEX_SUBSTR_FINAL && + !BER_BVISNULL( &sa->sa_final ) && + sa->sa_final.bv_len >= index_substr_if_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; - - 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 ); + klen = index_substr_if_maxlen < value->bv_len + ? index_substr_if_maxlen : value->bv_len; + hashPreset( &HASHcontext, prefix, pre, syntax, mr ); + hashIter( &HASHcontext, HASHdigest, + (unsigned char *)&value->bv_val[value->bv_len-klen], klen ); ber_dupbv_x( &keys[nkeys++], &digest, ctx ); + + /* If final is too long and we have subany indexed, use it + * to match the excess... + */ + if (value->bv_len > index_substr_if_maxlen && (flags & SLAP_INDEX_SUBSTR_ANY)) + { + ber_len_t j; + pre = SLAP_INDEX_SUBSTR_PREFIX; + hashPreset( &HASHcontext, prefix, pre, syntax, mr); + for ( j=0; j <= value->bv_len - index_substr_if_maxlen; j+=index_substr_any_step ) + { + hashIter( &HASHcontext, HASHdigest, + (unsigned char *)&value->bv_val[j], index_substr_any_len ); + ber_dupbv_x( &keys[nkeys++], &digest, ctx ); + } + } } if( nkeys > 0 ) { - keys[nkeys].bv_val = NULL; + BER_BVZERO( &keys[nkeys] ); *keysp = keys; } else { ch_free( keys ); @@ -713,13 +720,13 @@ bitStringValidate( */ if( in->bv_val[0] != '\'' || - in->bv_val[in->bv_len-2] != '\'' || - in->bv_val[in->bv_len-1] != 'B' ) + in->bv_val[in->bv_len - 2] != '\'' || + in->bv_val[in->bv_len - 1] != 'B' ) { return LDAP_INVALID_SYNTAX; } - for( i=in->bv_len-3; i>0; 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; } @@ -728,38 +735,172 @@ bitStringValidate( return LDAP_SUCCESS; } +/* + * Syntax is [RFC2252]: + * + +6.3. Bit String + + ( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' ) + + Values in this syntax are encoded according to the following BNF: + + bitstring = "'" *binary-digit "'B" + + binary-digit = "0" / "1" + + ... + +6.21. Name And Optional UID + + ( 1.3.6.1.4.1.1466.115.121.1.34 DESC 'Name And Optional UID' ) + + Values in this syntax are encoded according to the following BNF: + + NameAndOptionalUID = DistinguishedName [ "#" bitstring ] + + Although the '#' character may occur in a string representation of a + distinguished name, no additional special quoting is done. This + syntax has been added subsequent to RFC 1778. + + Example: + + 1.3.6.1.4.1.1466.0=#04024869,O=Test,C=GB#'0101'B + + * + * draft-ietf-ldapbis-syntaxes-xx.txt says: + * + +3.3.2. Bit String + + A value of the Bit String syntax is a sequence of binary digits. The + LDAP-specific encoding of a value of this syntax is defined by the + following ABNF: + + BitString = SQUOTE *binary-digit SQUOTE "B" + + binary-digit = "0" / "1" + + The rule is defined in [MODELS]. + + Example: + '0101111101'B + + The LDAP definition for the Bit String syntax is: + + ( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' ) + + This syntax corresponds to the BIT STRING ASN.1 type from [ASN.1]. + + ... + +3.3.21. Name and Optional UID + + A value of the Name and Optional UID syntax is the distinguished name + [MODELS] of an entity optionally accompanied by a unique identifier + that serves to differentiate the entity from others with an identical + distinguished name. + + The LDAP-specific encoding of a value of this syntax is defined by + the following ABNF: + + NameAndOptionalUID = distinguishedName [ SHARP BitString ] + + The rule is defined in Section 3.3.2. The + rule is defined in [LDAPDN]. The rule is + defined in [MODELS]. + + Note that although the '#' character may occur in the string + representation of a distinguished name, no additional escaping of + this character is performed when a is encoded in + a . + + Example: + 1.3.6.1.4.1.1466.0=#04024869,O=Test,C=GB#'0101'B + + The LDAP definition for the Name and Optional UID syntax is: + + ( 1.3.6.1.4.1.1466.115.121.1.34 DESC 'Name And Optional UID' ) + + This syntax corresponds to the NameAndOptionalUID ASN.1 type from + [X.520]. + + * + * draft-ietf-ldapbis-models-xx.txt [MODELS] says: + * + +1.4. Common ABNF Productions + + ... + SHARP = %x23 ; octothorpe (or sharp sign) ("#") + ... + SQUOTE = %x27 ; single quote ("'") + ... + + * + * Note: normalization strips any leading "0"s, unless the + * bit string is exactly "'0'B", so the normalized example, + * in slapd, would result in + * + * 1.3.6.1.4.1.1466.0=#04024869,o=test,c=gb#'101'B + * + * Since draft-ietf-ldapbis-dn-xx.txt clarifies that SHARP, + * i.e. "#", doesn't have to be escaped except when at the + * beginning of a value, the definition of Name and Optional + * UID appears to be flawed, because there is no clear means + * to determine whether the UID part is present or not. + * + * Example: + * + * cn=Someone,dc=example,dc=com#'1'B + * + * could be either a NameAndOptionalUID with trailing UID, i.e. + * + * DN = "cn=Someone,dc=example,dc=com" + * UID = "'1'B" + * + * or a NameAndOptionalUID with no trailing UID, and the AVA + * in the last RDN made of + * + * attributeType = dc + * attributeValue = com#'1'B + * + * in fact "com#'1'B" is a valid IA5 string. + * + * As a consequence, current slapd code assumes that the + * presence of portions of a BitString at the end of the string + * representation of a NameAndOptionalUID means a BitString + * is expected, and cause an error otherwise. This is quite + * arbitrary, and might change in the future. + */ + + static int nameUIDValidate( Syntax *syntax, struct berval *in ) { int rc; - struct berval dn; + struct berval dn, uid; - if( in->bv_len == 0 ) return LDAP_SUCCESS; + if( BER_BVISEMPTY( in ) ) return LDAP_SUCCESS; ber_dupbv( &dn, in ); if( !dn.bv_val ) return LDAP_OTHER; - 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-3; i>1; i--) { - if( dn.bv_val[i] != '0' && dn.bv_val[i] != '1' ) { - break; - } - } - if( dn.bv_val[i] != '\'' || dn.bv_val[i-1] != '#' ) { - ber_memfree( dn.bv_val ); - return LDAP_INVALID_SYNTAX; + /* if there's a "#", try bitStringValidate()... */ + uid.bv_val = strrchr( dn.bv_val, '#' ); + if ( !BER_BVISNULL( &uid ) ) { + uid.bv_val++; + uid.bv_len = dn.bv_len - ( uid.bv_val - dn.bv_val ); + + rc = bitStringValidate( NULL, &uid ); + if ( rc == LDAP_SUCCESS ) { + /* in case of success, trim the UID, + * otherwise treat it as part of the DN */ + dn.bv_len -= uid.bv_len + 1; + uid.bv_val[-1] = '\0'; } - - /* trim the UID to allow use of dnValidate */ - dn.bv_val[i-1] = '\0'; - dn.bv_len = i-1; } rc = dnValidate( NULL, &dn ); @@ -775,55 +916,65 @@ nameUIDPretty( struct berval *out, void *ctx ) { - assert( val ); - assert( out ); + assert( val != NULL ); + assert( out != NULL ); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, ">>> nameUIDPretty: <%s>\n", val->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, ">>> nameUIDPretty: <%s>\n", val->bv_val, 0, 0 ); -#endif - if( val->bv_len == 0 ) { + if( BER_BVISEMPTY( val ) ) { ber_dupbv_x( out, val, ctx ); } else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) { return LDAP_INVALID_SYNTAX; } else { - int rc; - struct berval dnval = *val; - struct berval uidval = { 0, NULL }; + int rc; + struct berval dnval = *val; + struct berval uidval = BER_BVNULL; - if( val->bv_val[val->bv_len-1] == 'B' - && val->bv_val[val->bv_len-2] == '\'' ) - { - uidval.bv_val=strrchr( val->bv_val, '#' ); - if( uidval.bv_val ) { - dnval.bv_len = uidval.bv_val - dnval.bv_val; - uidval.bv_len = val->bv_len - dnval.bv_len; + uidval.bv_val = strrchr( val->bv_val, '#' ); + if ( !BER_BVISNULL( &uidval ) ) { + uidval.bv_val++; + uidval.bv_len = val->bv_len - ( uidval.bv_val - val->bv_val ); - uidval.bv_len--; - uidval.bv_val++; + rc = bitStringValidate( NULL, &uidval ); + + if ( rc == LDAP_SUCCESS ) { + ber_dupbv_x( &dnval, val, ctx ); + dnval.bv_len -= uidval.bv_len + 1; + dnval.bv_val[dnval.bv_len] = '\0'; + + } else { + BER_BVZERO( &uidval ); } } rc = dnPretty( syntax, &dnval, out, ctx ); - if( rc != LDAP_SUCCESS ) return rc; + if ( dnval.bv_val != val->bv_val ) { + slap_sl_free( dnval.bv_val, ctx ); + } + if( rc != LDAP_SUCCESS ) { + return rc; + } - if( uidval.bv_val ) { - char *tmp = sl_realloc( out->bv_val, out->bv_len + uidval.bv_len + 2, ctx ); - int i, c, got1; + if( !BER_BVISNULL( &uidval ) ) { + int i, c, got1; + char *tmp; + + tmp = slap_sl_realloc( out->bv_val, out->bv_len + + STRLENOF( "#" ) + uidval.bv_len + 1, + ctx ); if( tmp == NULL ) { ber_memfree_x( out->bv_val, ctx ); return LDAP_OTHER; } out->bv_val = tmp; out->bv_val[out->bv_len++] = '#'; + out->bv_val[out->bv_len++] = '\''; got1 = uidval.bv_len < sizeof("'0'B"); - for(i=0; ibv_val[out->bv_len++] = c; + break; } } + out->bv_val[out->bv_len++] = '\''; + out->bv_val[out->bv_len++] = 'B'; out->bv_val[out->bv_len] = '\0'; } } -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, "<<< nameUIDPretty: <%s>\n", out->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "<<< nameUIDPretty: <%s>\n", out->bv_val, 0, 0 ); -#endif return LDAP_SUCCESS; } @@ -863,38 +1012,46 @@ uniqueMemberNormalize( assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage )); - ber_dupbv( &out, val ); - if( out.bv_len != 0 ) { - struct berval uid = { 0, NULL }; - - if( out.bv_val[out.bv_len-1] == 'B' - && out.bv_val[out.bv_len-2] == '\'' ) - { - /* assume presence of optional UID */ - uid.bv_val = strrchr( out.bv_val, '#' ); + ber_dupbv_x( &out, val, ctx ); + if ( BER_BVISEMPTY( &out ) ) { + *normalized = out; - if( uid.bv_val == NULL ) { - free( out.bv_val ); - return LDAP_INVALID_SYNTAX; - } + } else { + struct berval uid = BER_BVNULL; - uid.bv_len = out.bv_len - (uid.bv_val - out.bv_val); - out.bv_len -= uid.bv_len--; + uid.bv_val = strrchr( out.bv_val, '#' ); + if ( !BER_BVISNULL( &uid ) ) { + uid.bv_val++; + uid.bv_len = out.bv_len - ( uid.bv_val - out.bv_val ); - /* temporarily trim the UID */ - *(uid.bv_val++) = '\0'; + rc = bitStringValidate( NULL, &uid ); + if ( rc == LDAP_SUCCESS ) { + uid.bv_val[-1] = '\0'; + out.bv_len -= uid.bv_len + 1; + } else { + BER_BVZERO( &uid ); + } } rc = dnNormalize( 0, NULL, NULL, &out, normalized, ctx ); if( rc != LDAP_SUCCESS ) { - free( out.bv_val ); + slap_sl_free( out.bv_val, ctx ); return LDAP_INVALID_SYNTAX; } - if( uid.bv_len ) { - normalized->bv_val = ch_realloc( normalized->bv_val, - normalized->bv_len + uid.bv_len + sizeof("#") ); + if( !BER_BVISNULL( &uid ) ) { + char *tmp; + + tmp = ch_realloc( normalized->bv_val, + normalized->bv_len + uid.bv_len + + STRLENOF("#") + 1 ); + if ( tmp == NULL ) { + ber_memfree_x( normalized->bv_val, ctx ); + return LDAP_OTHER; + } + + normalized->bv_val = tmp; /* insert the separator */ normalized->bv_val[normalized->bv_len++] = '#'; @@ -908,7 +1065,7 @@ uniqueMemberNormalize( normalized->bv_val[normalized->bv_len] = '\0'; } - free( out.bv_val ); + slap_sl_free( out.bv_val, ctx ); } return LDAP_SUCCESS; @@ -925,66 +1082,160 @@ uniqueMemberMatch( { int match; struct berval *asserted = (struct berval *) assertedValue; - struct berval assertedDN = { 0, NULL }; - struct berval assertedUID = { 0, NULL }; - struct berval valueDN = { 0, NULL }; - struct berval valueUID = { 0, NULL }; - - if( asserted->bv_len != 0 ) { - assertedDN = *asserted; + struct berval assertedDN = *asserted; + struct berval assertedUID = BER_BVNULL; + struct berval valueDN = *value; + struct berval valueUID = BER_BVNULL; + int approx = ((flags & SLAP_MR_EQUALITY_APPROX) == SLAP_MR_EQUALITY_APPROX); + + if ( !BER_BVISEMPTY( asserted ) ) { + assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' ); + if ( !BER_BVISNULL( &assertedUID ) ) { + assertedUID.bv_val++; + assertedUID.bv_len = assertedDN.bv_len + - ( assertedUID.bv_val - assertedDN.bv_val ); - if( assertedDN.bv_val[assertedDN.bv_len-1] == 'B' - && assertedDN.bv_val[assertedDN.bv_len-2] == '\'' ) - { - /* assume presence of optional UID */ - assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' ); + if ( bitStringValidate( NULL, &assertedUID ) == LDAP_SUCCESS ) { + assertedDN.bv_len -= assertedUID.bv_len + 1; - if( assertedUID.bv_val == NULL ) { - return LDAP_INVALID_SYNTAX; + } else { + BER_BVZERO( &assertedUID ); } - - assertedUID.bv_len = assertedDN.bv_len - - (assertedUID.bv_val - assertedDN.bv_val); - assertedDN.bv_len -= assertedUID.bv_len--; - - /* trim the separator */ - assertedUID.bv_val++; } } - if( value->bv_len != 0 ) { - valueDN = *value; - - if( valueDN.bv_val[valueDN.bv_len-1] == 'B' - && valueDN.bv_val[valueDN.bv_len-2] == '\'' ) - { - /* assume presence of optional UID */ - valueUID.bv_val = strrchr( valueDN.bv_val, '#' ); + if ( !BER_BVISEMPTY( value ) ) { - if( valueUID.bv_val == NULL ) { - return LDAP_INVALID_SYNTAX; - } + valueUID.bv_val = strrchr( valueDN.bv_val, '#' ); + if ( !BER_BVISNULL( &valueUID ) ) { + valueUID.bv_val++; + valueUID.bv_len = valueDN.bv_len + - ( valueUID.bv_val - valueDN.bv_val ); - valueUID.bv_len = valueDN.bv_len - - (assertedUID.bv_val - assertedDN.bv_val); - valueDN.bv_len -= valueUID.bv_len--; + if ( bitStringValidate( NULL, &valueUID ) == LDAP_SUCCESS ) { + valueDN.bv_len -= valueUID.bv_len + 1; - /* trim the separator */ - valueUID.bv_val++; + } else { + BER_BVZERO( &valueUID ); + } } } if( valueUID.bv_len && assertedUID.bv_len ) { + match = valueUID.bv_len - assertedUID.bv_len; + if ( match ) { + *matchp = match; + return LDAP_SUCCESS; + } + match = memcmp( valueUID.bv_val, assertedUID.bv_val, valueUID.bv_len ); if( match ) { *matchp = match; return LDAP_SUCCESS; } + + } else if ( !approx && valueUID.bv_len ) { + match = -1; + *matchp = match; + return LDAP_SUCCESS; + + } else if ( !approx && assertedUID.bv_len ) { + match = 1; + *matchp = match; + return LDAP_SUCCESS; } return dnMatch( matchp, flags, syntax, mr, &valueDN, &assertedDN ); } +static int +uniqueMemberIndexer( + slap_mask_t use, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *prefix, + BerVarray values, + BerVarray *keysp, + void *ctx ) +{ + BerVarray dnvalues; + int rc; + int i; + for( i=0; !BER_BVISNULL( &values[i] ); i++ ) { + /* just count them */ + } + assert( i > 0 ); + + dnvalues = slap_sl_malloc( sizeof( struct berval ) * (i+1), ctx ); + + for( i=0; !BER_BVISNULL( &values[i] ); i++ ) { + struct berval assertedDN = values[i]; + struct berval assertedUID = BER_BVNULL; + + if ( !BER_BVISEMPTY( &assertedDN ) ) { + assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' ); + if ( !BER_BVISNULL( &assertedUID ) ) { + assertedUID.bv_val++; + assertedUID.bv_len = assertedDN.bv_len + - ( assertedUID.bv_val - assertedDN.bv_val ); + + if ( bitStringValidate( NULL, &assertedUID ) == LDAP_SUCCESS ) { + assertedDN.bv_len -= assertedUID.bv_len + 1; + + } else { + BER_BVZERO( &assertedUID ); + } + } + } + + dnvalues[i] = assertedDN; + } + BER_BVZERO( &dnvalues[i] ); + + rc = octetStringIndexer( use, flags, syntax, mr, prefix, + dnvalues, keysp, ctx ); + + slap_sl_free( dnvalues, ctx ); + return rc; +} + +static int +uniqueMemberFilter( + slap_mask_t use, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *prefix, + void * assertedValue, + BerVarray *keysp, + void *ctx ) +{ + struct berval *asserted = (struct berval *) assertedValue; + struct berval assertedDN = *asserted; + struct berval assertedUID = BER_BVNULL; + + if ( !BER_BVISEMPTY( asserted ) ) { + assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' ); + if ( !BER_BVISNULL( &assertedUID ) ) { + assertedUID.bv_val++; + assertedUID.bv_len = assertedDN.bv_len + - ( assertedUID.bv_val - assertedDN.bv_val ); + + if ( bitStringValidate( NULL, &assertedUID ) == LDAP_SUCCESS ) { + assertedDN.bv_len -= assertedUID.bv_len + 1; + + } else { + BER_BVZERO( &assertedUID ); + } + } + } + + return octetStringFilter( use, flags, syntax, mr, prefix, + &assertedDN, keysp, ctx ); +} + + /* * Handling boolean syntax and matching is quite rigid. * A more flexible approach would be to allow a variety @@ -1107,14 +1358,14 @@ UTF8StringValidate( { ber_len_t count; int len; - unsigned char *u = in->bv_val; + unsigned char *u = (unsigned char *)in->bv_val; - if( in->bv_len == 0 && syntax == slap_schema.si_syn_directoryString ) { + if( BER_BVISEMPTY( in ) && syntax == slap_schema.si_syn_directoryString ) { /* directory strings cannot be empty */ return LDAP_INVALID_SYNTAX; } - for( count = in->bv_len; count > 0; count-=len, u+=len ) { + for( count = in->bv_len; count > 0; count -= len, u += len ) { /* get the length indicated by the first byte */ len = LDAP_UTF8_CHARLEN2( u, len ); @@ -1149,7 +1400,7 @@ UTF8StringValidate( /* make sure len corresponds with the offset to the next character */ - if( LDAP_UTF8_OFFSET( u ) != len ) return LDAP_INVALID_SYNTAX; + if( LDAP_UTF8_OFFSET( (char *)u ) != len ) return LDAP_INVALID_SYNTAX; } if( count != 0 ) { @@ -1174,12 +1425,11 @@ UTF8StringNormalize( assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use )); - if( val->bv_val == NULL ) { + if( BER_BVISNULL( val ) ) { /* assume we're dealing with a syntax (e.g., UTF8String) * which allows empty strings */ - normalized->bv_len = 0; - normalized->bv_val = NULL; + BER_BVZERO( normalized ); return LDAP_SUCCESS; } @@ -1197,8 +1447,11 @@ UTF8StringNormalize( nvalue.bv_len = 0; nvalue.bv_val = tmp.bv_val; - wasspace=1; /* trim leading spaces */ - for( i=0; isa_initial ) ) { + if ( sub->sa_initial.bv_len > left.bv_len ) { + /* not enough left */ + match = 1; + goto done; + } + + match = memcmp( 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; + + priorspace = ASCII_SPACE( + sub->sa_initial.bv_val[sub->sa_initial.bv_len] ); + } + + if ( sub->sa_any ) { + for ( i = 0; !BER_BVISNULL( &sub->sa_any[i] ); i++ ) { + ber_len_t idx; + char *p; + + if( priorspace && !BER_BVISEMPTY( &sub->sa_any[i] ) + && ASCII_SPACE( sub->sa_any[i].bv_val[0] )) + { + /* allow next space to match */ + left.bv_val--; + left.bv_len++; + } + priorspace=0; + +retry: + if ( BER_BVISEMPTY( &sub->sa_any[i] ) ) { + continue; + } + + if ( sub->sa_any[i].bv_len > left.bv_len ) { + /* not enough left */ + match = 1; + goto done; + } + + p = memchr( left.bv_val, *sub->sa_any[i].bv_val, left.bv_len ); + + if( p == NULL ) { + match = 1; + goto done; + } + + idx = p - left.bv_val; + + 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 = memcmp( 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; + + priorspace = ASCII_SPACE( + sub->sa_any[i].bv_val[sub->sa_any[i].bv_len] ); + } + } + + if ( !BER_BVISNULL( &sub->sa_final ) ) { + if( priorspace && !BER_BVISEMPTY( &sub->sa_final ) + && ASCII_SPACE( sub->sa_final.bv_val[0] )) + { + /* allow next space to match */ + left.bv_val--; + left.bv_len++; + } + + if ( sub->sa_final.bv_len > left.bv_len ) { + /* not enough left */ + match = 1; + goto done; + } + + match = memcmp( 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; + } + } + +done: + *matchp = match; + return LDAP_SUCCESS; +} + +#if defined(SLAPD_APPROX_INITIALS) +# define SLAPD_APPROX_DELIMITER "._ " +# define SLAPD_APPROX_WORDLEN 2 +#else +# define SLAPD_APPROX_DELIMITER " " +# define SLAPD_APPROX_WORDLEN 1 +#endif + +static int +approxMatch( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue ) +{ + struct berval *nval, *assertv; + char *val, **values, **words, *c; + int i, count, len, nextchunk=0, nextavail=0; + + /* Yes, this is necessary */ + nval = UTF8bvnormalize( value, NULL, LDAP_UTF8_APPROX, NULL ); if( nval == NULL ) { *matchp = 1; return LDAP_SUCCESS; @@ -1361,11 +1748,11 @@ approxIndexer( struct berval *newkeys; BerVarray keys=NULL; - for( j=0; values[j].bv_val != NULL; j++ ) { - struct berval val = { 0, NULL }; + for( j = 0; !BER_BVISNULL( &values[j] ); j++ ) { + struct berval val = BER_BVNULL; /* Yes, this is necessary */ UTF8bvnormalize( &values[j], &val, LDAP_UTF8_APPROX, NULL ); - assert( val.bv_val != NULL ); + assert( !BER_BVISNULL( &val ) ); /* Isolate how many words there are. There will be a key for each */ for( wordcount = 0, c = val.bv_val; *c; c++) { @@ -1394,7 +1781,7 @@ approxIndexer( ber_memfree( val.bv_val ); } - keys[keycount].bv_val = NULL; + BER_BVZERO( &keys[keycount] ); *keysp = keys; return LDAP_SUCCESS; @@ -1419,9 +1806,9 @@ approxFilter( /* Yes, this is necessary */ val = UTF8bvnormalize( ((struct berval *)assertedValue), NULL, LDAP_UTF8_APPROX, NULL ); - if( val == NULL || val->bv_val == NULL ) { + if( val == NULL || BER_BVISNULL( val ) ) { keys = (struct berval *)ch_malloc( sizeof(struct berval) ); - keys[0].bv_val = NULL; + BER_BVZERO( &keys[0] ); *keysp = keys; ber_bvfree( val ); return LDAP_SUCCESS; @@ -1449,7 +1836,7 @@ approxFilter( ber_bvfree( val ); - keys[count].bv_val = NULL; + BER_BVZERO( &keys[count] ); *keysp = keys; return LDAP_SUCCESS; @@ -1470,9 +1857,9 @@ telephoneNumberNormalize( assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage )); /* validator should have refused an empty string */ - assert( val->bv_len ); + assert( !BER_BVISEMPTY( val ) ); - q = normalized->bv_val = sl_malloc( val->bv_len + 1, ctx ); + q = normalized->bv_val = slap_sl_malloc( val->bv_len + 1, ctx ); for( p = val->bv_val; *p; p++ ) { if ( ! ( ASCII_SPACE( *p ) || *p == '-' )) { @@ -1483,23 +1870,23 @@ telephoneNumberNormalize( normalized->bv_len = q - normalized->bv_val; - if( normalized->bv_len == 0 ) { - sl_free( normalized->bv_val, ctx ); - normalized->bv_val = NULL; + if( BER_BVISEMPTY( normalized ) ) { + slap_sl_free( normalized->bv_val, ctx ); + BER_BVZERO( normalized ); return LDAP_INVALID_SYNTAX; } return LDAP_SUCCESS; } -static int +int numericoidValidate( Syntax *syntax, struct berval *in ) { struct berval val = *in; - if( val.bv_len == 0 ) { + if( BER_BVISEMPTY( &val ) ) { /* disallow empty strings */ return LDAP_INVALID_SYNTAX; } @@ -1509,7 +1896,7 @@ numericoidValidate( return LDAP_SUCCESS; } - if ( val.bv_val[0] == '0' ) { + if ( val.bv_val[0] == '0' && !OID_SEPARATOR( val.bv_val[1] )) { break; } @@ -1544,13 +1931,13 @@ integerValidate( ber_len_t i; struct berval val = *in; - if( val.bv_len == 0 ) return LDAP_INVALID_SYNTAX; + if ( BER_BVISEMPTY( &val ) ) return LDAP_INVALID_SYNTAX; if ( val.bv_val[0] == '-' ) { val.bv_len--; val.bv_val++; - if( val.bv_len == 0 ) { /* bare "-" */ + if( BER_BVISEMPTY( &val ) ) { /* bare "-" */ return LDAP_INVALID_SYNTAX; } @@ -1596,7 +1983,7 @@ integerMatch( v.bv_len--; } - if( v.bv_len == 0 ) vsign = 0; + if( BER_BVISEMPTY( &v ) ) vsign = 0; a = *asserted; if( a.bv_val[0] == '-' ) { @@ -1605,7 +1992,7 @@ integerMatch( a.bv_len--; } - if( a.bv_len == 0 ) vsign = 0; + if( BER_BVISEMPTY( &a ) ) vsign = 0; match = vsign - asign; if( match == 0 ) { @@ -1643,7 +2030,7 @@ printableStringValidate( { ber_len_t i; - if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX; + if( BER_BVISEMPTY( val ) ) return LDAP_INVALID_SYNTAX; for(i=0; i < val->bv_len; i++) { if( !SLAP_PRINTABLE(val->bv_val[i]) ) { @@ -1661,7 +2048,7 @@ printablesStringValidate( { ber_len_t i, len; - if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX; + if( BER_BVISEMPTY( val ) ) return LDAP_INVALID_SYNTAX; for(i=0,len=0; i < val->bv_len; i++) { int c = val->bv_val[i]; @@ -1693,7 +2080,7 @@ IA5StringValidate( { ber_len_t i; - if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX; + if( BER_BVISEMPTY( val ) ) return LDAP_INVALID_SYNTAX; for(i=0; i < val->bv_len; i++) { if( !LDAP_ASCII(val->bv_val[i]) ) { @@ -1714,9 +2101,10 @@ IA5StringNormalize( void *ctx ) { char *p, *q; - int casefold = !SLAP_MR_ASSOCIATED(mr, slap_schema.si_mr_caseExactIA5Match); + int casefold = !SLAP_MR_ASSOCIATED( mr, + slap_schema.si_mr_caseExactIA5Match ); - assert( val->bv_len ); + assert( !BER_BVISEMPTY( val ) ); assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use )); @@ -1739,7 +2127,7 @@ IA5StringNormalize( } else if ( casefold ) { /* Most IA5 rules require casefolding */ - *q++ = TOLOWER(*p++); + *q++ = TOLOWER(*p); p++; } else { *q++ = *p++; @@ -1760,8 +2148,8 @@ IA5StringNormalize( *q = '\0'; normalized->bv_len = q - normalized->bv_val; - if( normalized->bv_len == 0 ) { - normalized->bv_val = sl_realloc( normalized->bv_val, 2, ctx ); + if( BER_BVISEMPTY( normalized ) ) { + normalized->bv_val = slap_sl_realloc( normalized->bv_val, 2, ctx ); normalized->bv_val[0] = ' '; normalized->bv_val[1] = '\0'; normalized->bv_len = 1; @@ -1777,7 +2165,6 @@ UUIDValidate( { int i; if( in->bv_len != 36 ) { - assert(0); return LDAP_INVALID_SYNTAX; } @@ -1802,6 +2189,56 @@ UUIDValidate( } static int +UUIDPretty( + Syntax *syntax, + struct berval *in, + struct berval *out, + void *ctx ) +{ + int i; + int rc=LDAP_INVALID_SYNTAX; + + assert( in != NULL ); + assert( out != NULL ); + + if( in->bv_len != 36 ) return LDAP_INVALID_SYNTAX; + + out->bv_len = 36; + out->bv_val = slap_sl_malloc( out->bv_len + 1, ctx ); + + for( i=0; i<36; i++ ) { + switch(i) { + case 8: + case 13: + case 18: + case 23: + if( in->bv_val[i] != '-' ) { + goto handle_error; + } + out->bv_val[i] = '-'; + break; + + default: + if( !ASCII_HEX( in->bv_val[i]) ) { + goto handle_error; + } + out->bv_val[i] = TOLOWER( in->bv_val[i] ); + } + } + + rc = LDAP_SUCCESS; + out->bv_val[ out->bv_len ] = '\0'; + + if( 0 ) { +handle_error: + slap_sl_free( out->bv_val, ctx ); + out->bv_val = NULL; + } + + return rc; +} + +int UUIDNormalize( slap_mask_t usage, Syntax *syntax, @@ -1810,11 +2247,11 @@ UUIDNormalize( struct berval *normalized, void *ctx ) { - unsigned char octet; + unsigned char octet = '\0'; int i; int j; normalized->bv_len = 16; - normalized->bv_val = sl_malloc( normalized->bv_len+1, ctx ); + normalized->bv_val = slap_sl_malloc( normalized->bv_len + 1, ctx ); for( i=0, j=0; i<36; i++ ) { unsigned char nibble; @@ -1831,15 +2268,15 @@ UUIDNormalize( nibble = val->bv_val[i] - ('A'-10); } else { - sl_free( normalized->bv_val, ctx ); + slap_sl_free( normalized->bv_val, ctx ); return LDAP_INVALID_SYNTAX; } - if( j % 2 ) { - octet = nibble << 4; - } else { + if( j & 1 ) { octet |= nibble; normalized->bv_val[j>>1] = octet; + } else { + octet = nibble << 4; } j++; } @@ -1857,7 +2294,7 @@ numericStringValidate( { ber_len_t i; - if( in->bv_len == 0 ) return LDAP_INVALID_SYNTAX; + if( BER_BVISEMPTY( in ) ) return LDAP_INVALID_SYNTAX; for(i=0; i < in->bv_len; i++) { if( !SLAP_NUMERIC(in->bv_val[i]) ) { @@ -1880,9 +2317,9 @@ numericStringNormalize( /* removal all spaces */ char *p, *q; - assert( val->bv_len ); + assert( !BER_BVISEMPTY( val ) ); - normalized->bv_val = sl_malloc( val->bv_len + 1, ctx ); + normalized->bv_val = slap_sl_malloc( val->bv_len + 1, ctx ); p = val->bv_val; q = normalized->bv_val; @@ -1904,8 +2341,8 @@ numericStringNormalize( normalized->bv_len = q - normalized->bv_val; - if( normalized->bv_len == 0 ) { - normalized->bv_val = sl_realloc( normalized->bv_val, 2, ctx ); + if( BER_BVISEMPTY( normalized ) ) { + normalized->bv_val = slap_sl_realloc( normalized->bv_val, 2, ctx ); normalized->bv_val[0] = ' '; normalized->bv_val[1] = '\0'; normalized->bv_len = 1; @@ -1918,7 +2355,8 @@ numericStringNormalize( * Integer conversion macros that will use the largest available * type. */ -#if defined(HAVE_STRTOLL) && defined(LLONG_MAX) && defined(LLONG_MIN) && defined(HAVE_LONG_LONG) +#if defined(HAVE_STRTOLL) && defined(LLONG_MAX) \ + && defined(LLONG_MIN) && defined(HAVE_LONG_LONG) # define SLAP_STRTOL(n,e,b) strtoll(n,e,b) # define SLAP_LONG_MAX LLONG_MAX # define SLAP_LONG_MIN LLONG_MIN @@ -1943,18 +2381,21 @@ integerBitAndMatch( /* safe to assume integers are NUL terminated? */ lValue = SLAP_STRTOL(value->bv_val, NULL, 10); - if(( lValue == SLAP_LONG_MIN || lValue == SLAP_LONG_MAX) && errno == ERANGE ) { + if(( lValue == SLAP_LONG_MIN || lValue == SLAP_LONG_MAX) && + errno == ERANGE ) + { return LDAP_CONSTRAINT_VIOLATION; } - lAssertedValue = SLAP_STRTOL(((struct berval *)assertedValue)->bv_val, NULL, 10); - if(( lAssertedValue == SLAP_LONG_MIN || lAssertedValue == SLAP_LONG_MAX ) - && errno == ERANGE ) + lAssertedValue = SLAP_STRTOL(((struct berval *)assertedValue)->bv_val, + NULL, 10); + if(( lAssertedValue == SLAP_LONG_MIN || lAssertedValue == SLAP_LONG_MAX ) && + errno == ERANGE ) { return LDAP_CONSTRAINT_VIOLATION; } - *matchp = (lValue & lAssertedValue) ? 0 : 1; + *matchp = ((lValue & lAssertedValue) == lAssertedValue) ? 0 : 1; return LDAP_SUCCESS; } @@ -1971,18 +2412,21 @@ integerBitOrMatch( /* safe to assume integers are NUL terminated? */ lValue = SLAP_STRTOL(value->bv_val, NULL, 10); - if(( lValue == SLAP_LONG_MIN || lValue == SLAP_LONG_MAX ) && errno == ERANGE ) { + if(( lValue == SLAP_LONG_MIN || lValue == SLAP_LONG_MAX ) && + errno == ERANGE ) + { return LDAP_CONSTRAINT_VIOLATION; } - lAssertedValue = SLAP_STRTOL(((struct berval *)assertedValue)->bv_val, NULL, 10); - if(( lAssertedValue == SLAP_LONG_MIN || lAssertedValue == SLAP_LONG_MAX ) - && errno == ERANGE ) + lAssertedValue = SLAP_STRTOL( ((struct berval *)assertedValue)->bv_val, + NULL, 10); + if(( lAssertedValue == SLAP_LONG_MIN || lAssertedValue == SLAP_LONG_MAX ) && + errno == ERANGE ) { return LDAP_CONSTRAINT_VIOLATION; } - *matchp = (lValue | lAssertedValue) ? 0 : -1; + *matchp = ((lValue & lAssertedValue) != 0) ? 0 : -1; return LDAP_SUCCESS; } @@ -1992,198 +2436,818 @@ serialNumberAndIssuerValidate( struct berval *in ) { int rc; - int state; ber_len_t n; struct berval sn, i; + + Debug( LDAP_DEBUG_TRACE, ">>> serialNumberAndIssuerValidate: <%s>\n", + in->bv_val, 0, 0 ); + if( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX; - i.bv_val = strchr( in->bv_val, '$' ); - if( i.bv_val == NULL ) return LDAP_INVALID_SYNTAX; + if( in->bv_val[0] != '{' && in->bv_val[in->bv_len-1] != '}' ) { + /* Parse old format */ + i.bv_val = ber_bvchr( in, '$' ); + if( BER_BVISNULL( &i ) ) return LDAP_INVALID_SYNTAX; + + sn.bv_val = in->bv_val; + sn.bv_len = i.bv_val - in->bv_val; - sn.bv_val = in->bv_val; - sn.bv_len = i.bv_val - in->bv_val; + i.bv_val++; + i.bv_len = in->bv_len - (sn.bv_len + 1); - i.bv_val++; - i.bv_len = in->bv_len - (sn.bv_len + 1); + /* eat leading zeros */ + for( n=0; n < (sn.bv_len-1); n++ ) { + if( sn.bv_val[n] != '0' ) break; + } + sn.bv_val += n; + sn.bv_len -= n; + + for( n=0; n < sn.bv_len; n++ ) { + if( !ASCII_DIGIT(sn.bv_val[n]) ) return LDAP_INVALID_SYNTAX; + } - /* validate serial number (strict for now) */ - for( n=0; n < sn.bv_len; n++ ) { - if( !ASCII_DIGIT(sn.bv_val[n]) ) { + } else { + /* Parse GSER format */ + int havesn=0,haveissuer=0; + struct berval x = *in; + x.bv_val++; + x.bv_len-=2; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if ( x.bv_len < STRLENOF("serialNumber 0,issuer \"\"")) { return LDAP_INVALID_SYNTAX; } + + /* should be at issuer or serialNumber NamedValue */ + if( strncasecmp( x.bv_val, "issuer", STRLENOF("issuer")) == 0 ) { + /* parse issuer */ + x.bv_val += STRLENOF("issuer"); + x.bv_len -= STRLENOF("issuer"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if( x.bv_val[0] != '"' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + i.bv_val = x.bv_val; + i.bv_len = 0; + + for( ; i.bv_len < x.bv_len; ) { + if ( i.bv_val[i.bv_len] != '"' ) { + i.bv_len++; + continue; + } + if ( i.bv_val[i.bv_len+1] == '"' ) { + /* double dquote */ + i.bv_len+=2; + continue; + } + break; + } + x.bv_val += i.bv_len+1; + x.bv_len -= i.bv_len+1; + + if ( x.bv_len < STRLENOF(",serialNumber 0")) { + return LDAP_INVALID_SYNTAX; + } + + haveissuer++; + + } else if( strncasecmp( x.bv_val, "serialNumber", + STRLENOF("serialNumber")) == 0 ) + { + /* parse serialNumber */ + int neg=0; + x.bv_val += STRLENOF("serialNumber"); + x.bv_len -= STRLENOF("serialNumber"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + sn.bv_val = x.bv_val; + sn.bv_len = 0; + + if( sn.bv_val[0] == '-' ) { + neg++; + sn.bv_len++; + } + + for( ; sn.bv_len < x.bv_len; sn.bv_len++ ) { + if ( !ASCII_DIGIT( sn.bv_val[sn.bv_len] )) break; + } + + if (!( sn.bv_len > neg )) return LDAP_INVALID_SYNTAX; + if (( sn.bv_len > 1+neg ) && ( sn.bv_val[neg] == '0' )) { + return LDAP_INVALID_SYNTAX; + } + + x.bv_val += sn.bv_len; x.bv_len -= sn.bv_len; + + if ( x.bv_len < STRLENOF( ",issuer \"\"" )) { + return LDAP_INVALID_SYNTAX; + } + + havesn++; + + } else return LDAP_INVALID_SYNTAX; + + if( x.bv_val[0] != ',' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + /* should be at remaining NamedValue */ + if( !haveissuer && (strncasecmp( x.bv_val, "issuer", + STRLENOF("issuer" )) == 0 )) + { + /* parse issuer */ + x.bv_val += STRLENOF("issuer"); + x.bv_len -= STRLENOF("issuer"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if( x.bv_val[0] != '"' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + i.bv_val = x.bv_val; + i.bv_len = 0; + + for( ; i.bv_len < x.bv_len; ) { + if ( i.bv_val[i.bv_len] != '"' ) { + i.bv_len++; + continue; + } + if ( i.bv_val[i.bv_len+1] == '"' ) { + /* double dquote */ + i.bv_len+=2; + continue; + } + break; + } + x.bv_val += i.bv_len+1; + x.bv_len -= i.bv_len+1; + + } else if( !havesn && (strncasecmp( x.bv_val, "serialNumber", + STRLENOF("serialNumber")) == 0 )) + { + /* parse serialNumber */ + int neg=0; + x.bv_val += STRLENOF("serialNumber"); + x.bv_len -= STRLENOF("serialNumber"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len ; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + sn.bv_val = x.bv_val; + sn.bv_len = 0; + + if( sn.bv_val[0] == '-' ) { + neg++; + sn.bv_len++; + } + + for( ; sn.bv_len < x.bv_len; sn.bv_len++ ) { + if ( !ASCII_DIGIT( sn.bv_val[sn.bv_len] )) break; + } + + if (!( sn.bv_len > neg )) return LDAP_INVALID_SYNTAX; + if (( sn.bv_len > 1+neg ) && ( sn.bv_val[neg] == '0' )) { + return LDAP_INVALID_SYNTAX; + } + + x.bv_val += sn.bv_len; + x.bv_len -= sn.bv_len; + + } else return LDAP_INVALID_SYNTAX; + + /* eat trailing spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + /* should have no characters left... */ + if( x.bv_len ) return LDAP_INVALID_SYNTAX; } - /* validate DN */ + /* validate DN -- doesn't handle double dquote */ rc = dnValidate( NULL, &i ); if( rc ) return LDAP_INVALID_SYNTAX; + Debug( LDAP_DEBUG_TRACE, "<<< serialNumberAndIssuerValidate: OKAY\n", + in->bv_val, 0, 0 ); return LDAP_SUCCESS; } int serialNumberAndIssuerPretty( Syntax *syntax, - struct berval *val, + struct berval *in, struct berval *out, void *ctx ) { int rc; - int state; ber_len_t n; - struct berval sn, i, newi; + struct berval sn, i, ni; - assert( val ); - assert( out ); + assert( in != NULL ); + assert( out != NULL ); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, ">>> serialNumberAndIssuerPretty: <%s>\n", - val->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, ">>> serialNumberAndIssuerPretty: <%s>\n", - val->bv_val, 0, 0 ); -#endif + in->bv_val, 0, 0 ); - if( val->bv_len < 3 ) return LDAP_INVALID_SYNTAX; + if( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX; - i.bv_val = strchr( val->bv_val, '$' ); - if( i.bv_val == NULL ) return LDAP_INVALID_SYNTAX; + if( in->bv_val[0] != '{' && in->bv_val[in->bv_len-1] != '}' ) { + /* Parse old format */ + i.bv_val = ber_bvchr( in, '$' ); + if( BER_BVISNULL( &i ) ) return LDAP_INVALID_SYNTAX; - sn.bv_val = val->bv_val; - sn.bv_len = i.bv_val - val->bv_val; + sn.bv_val = in->bv_val; + sn.bv_len = i.bv_val - in->bv_val; - i.bv_val++; - i.bv_len = val->bv_len - (sn.bv_len + 1); + i.bv_val++; + i.bv_len = in->bv_len - (sn.bv_len + 1); - /* eat leading zeros */ - for( n=0; n < (sn.bv_len-1); n++ ) { - if( sn.bv_val[n] != '0' ) break; - } - sn.bv_val += n; - sn.bv_len -= n; + /* eat leading zeros */ + for( n=0; n < (sn.bv_len-1); n++ ) { + if( sn.bv_val[n] != '0' ) break; + } + sn.bv_val += n; + sn.bv_len -= n; + + for( n=0; n < sn.bv_len; n++ ) { + if( !ASCII_DIGIT(sn.bv_val[n]) ) return LDAP_INVALID_SYNTAX; + } + + } else { + /* Parse GSER format */ + int havesn=0,haveissuer=0; + struct berval x = *in; + x.bv_val++; + x.bv_len-=2; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } - for( n=0; n < sn.bv_len; n++ ) { - if( !ASCII_DIGIT(sn.bv_val[n]) ) { + if ( x.bv_len < STRLENOF("serialNumber 0,issuer \"\"")) { return LDAP_INVALID_SYNTAX; } + + /* should be at issuer or serialNumber NamedValue */ + if( strncasecmp( x.bv_val, "issuer", STRLENOF("issuer")) == 0 ) { + /* parse issuer */ + x.bv_val += STRLENOF("issuer"); + x.bv_len -= STRLENOF("issuer"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if( x.bv_val[0] != '"' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + i.bv_val = x.bv_val; + i.bv_len = 0; + + for( ; i.bv_len < x.bv_len; ) { + if ( i.bv_val[i.bv_len] != '"' ) { + i.bv_len++; + continue; + } + if ( i.bv_val[i.bv_len+1] == '"' ) { + /* double dquote */ + i.bv_len+=2; + continue; + } + break; + } + x.bv_val += i.bv_len+1; + x.bv_len -= i.bv_len+1; + + if ( x.bv_len < STRLENOF(",serialNumber 0")) { + return LDAP_INVALID_SYNTAX; + } + + haveissuer++; + + } else if( strncasecmp( x.bv_val, "serialNumber", + STRLENOF("serialNumber")) == 0 ) + { + /* parse serialNumber */ + int neg=0; + x.bv_val += STRLENOF("serialNumber"); + x.bv_len -= STRLENOF("serialNumber"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + sn.bv_val = x.bv_val; + sn.bv_len = 0; + + if( sn.bv_val[0] == '-' ) { + neg++; + sn.bv_len++; + } + + for( ; sn.bv_len < x.bv_len; sn.bv_len++ ) { + if ( !ASCII_DIGIT( sn.bv_val[sn.bv_len] )) break; + } + + if (!( sn.bv_len > neg )) return LDAP_INVALID_SYNTAX; + if (( sn.bv_len > 1+neg ) && ( sn.bv_val[neg] == '0' )) { + return LDAP_INVALID_SYNTAX; + } + + x.bv_val += sn.bv_len; x.bv_len -= sn.bv_len; + + if ( x.bv_len < STRLENOF( ",issuer \"\"" )) { + return LDAP_INVALID_SYNTAX; + } + + havesn++; + + } else return LDAP_INVALID_SYNTAX; + + if( x.bv_val[0] != ',' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + /* should be at remaining NamedValue */ + if( !haveissuer && (strncasecmp( x.bv_val, "issuer", + STRLENOF("issuer" )) == 0 )) + { + /* parse issuer */ + x.bv_val += STRLENOF("issuer"); + x.bv_len -= STRLENOF("issuer"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if( x.bv_val[0] != '"' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + i.bv_val = x.bv_val; + i.bv_len = 0; + + for( ; i.bv_len < x.bv_len; ) { + if ( i.bv_val[i.bv_len] != '"' ) { + i.bv_len++; + continue; + } + if ( i.bv_val[i.bv_len+1] == '"' ) { + /* double dquote */ + i.bv_len+=2; + continue; + } + break; + } + x.bv_val += i.bv_len+1; + x.bv_len -= i.bv_len+1; + + } else if( !havesn && (strncasecmp( x.bv_val, "serialNumber", + STRLENOF("serialNumber")) == 0 )) + { + /* parse serialNumber */ + int neg=0; + x.bv_val += STRLENOF("serialNumber"); + x.bv_len -= STRLENOF("serialNumber"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len ; x.bv_val++, x.bv_len--) { + /* empty */; + } + + sn.bv_val = x.bv_val; + sn.bv_len = 0; + + if( sn.bv_val[0] == '-' ) { + neg++; + sn.bv_len++; + } + + for( ; sn.bv_len < x.bv_len; sn.bv_len++ ) { + if ( !ASCII_DIGIT( sn.bv_val[sn.bv_len] )) break; + } + + if (!( sn.bv_len > neg )) return LDAP_INVALID_SYNTAX; + if (( sn.bv_len > 1+neg ) && ( sn.bv_val[neg] == '0' )) { + return LDAP_INVALID_SYNTAX; + } + + x.bv_val += sn.bv_len; + x.bv_len -= sn.bv_len; + + } else return LDAP_INVALID_SYNTAX; + + /* eat trailing spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + /* should have no characters left... */ + if( x.bv_len ) return LDAP_INVALID_SYNTAX; + + ber_dupbv_x( &ni, &i, ctx ); + i = ni; + + /* need to handle double dquotes here */ + } + + rc = dnPretty( syntax, &i, &ni, ctx ); + + if( in->bv_val[0] == '{' && in->bv_val[in->bv_len-1] == '}' ) { + slap_sl_free( i.bv_val, ctx ); } - /* pretty DN */ - rc = dnPretty( syntax, &i, &newi, ctx ); if( rc ) return LDAP_INVALID_SYNTAX; /* make room from sn + "$" */ - out->bv_len = sn.bv_len + newi.bv_len + 1; - out->bv_val = sl_realloc( newi.bv_val, out->bv_len + 1, ctx ); + out->bv_len = STRLENOF("{ serialNumber , issuer \"\" }") + + sn.bv_len + ni.bv_len; + out->bv_val = slap_sl_malloc( out->bv_len + 1, ctx ); if( out->bv_val == NULL ) { - sl_free( newi.bv_val, ctx ); + out->bv_len = 0; + slap_sl_free( ni.bv_val, ctx ); return LDAP_OTHER; } - /* push issuer over */ - AC_MEMCPY( &out->bv_val[sn.bv_len+1], newi.bv_val, newi.bv_len ); - /* insert sn and "$" */ - AC_MEMCPY( out->bv_val, sn.bv_val, sn.bv_len ); - out->bv_val[sn.bv_len] = '$'; - /* terminate */ - out->bv_val[out->bv_len] = '\0'; + n = 0; + AC_MEMCPY( &out->bv_val[n], "{ serialNumber ", + STRLENOF("{ serialNumber ")); + n = STRLENOF("{ serialNumber "); + + AC_MEMCPY( &out->bv_val[n], sn.bv_val, sn.bv_len ); + n += sn.bv_len; + + AC_MEMCPY( &out->bv_val[n], ", issuer \"", STRLENOF(", issuer \"")); + n += STRLENOF(", issuer \""); + + AC_MEMCPY( &out->bv_val[n], ni.bv_val, ni.bv_len ); + n += ni.bv_len; + + AC_MEMCPY( &out->bv_val[n], "\" }", STRLENOF("\" }")); + n += STRLENOF("\" }"); + + out->bv_val[n] = '\0'; + + assert( n == out->bv_len ); + + Debug( LDAP_DEBUG_TRACE, "<<< serialNumberAndIssuerPretty: <%s>\n", + out->bv_val, 0, 0 ); + + slap_sl_free( ni.bv_val, ctx ); + + return LDAP_SUCCESS; +} + +/* + * This routine is called by certificateExactNormalize when + * certificateExactNormalize receives a search string instead of + * a certificate. This routine checks if the search value is valid + * and then returns the normalized value + */ +static int +serialNumberAndIssuerNormalize( + slap_mask_t usage, + Syntax *syntax, + MatchingRule *mr, + struct berval *in, + struct berval *out, + void *ctx ) +{ + int rc; + ber_len_t n; + struct berval sn, i, ni; + + assert( in != NULL ); + assert( out != NULL ); + + Debug( LDAP_DEBUG_TRACE, ">>> serialNumberAndIssuerNormalize: <%s>\n", + in->bv_val, 0, 0 ); + + if( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX; + + if( in->bv_val[0] != '{' && in->bv_val[in->bv_len-1] != '}' ) { + /* Parse old format */ + i.bv_val = ber_bvchr( in, '$' ); + if( BER_BVISNULL( &i ) ) return LDAP_INVALID_SYNTAX; + + sn.bv_val = in->bv_val; + sn.bv_len = i.bv_val - in->bv_val; + + i.bv_val++; + i.bv_len = in->bv_len - (sn.bv_len + 1); + + /* eat leading zeros */ + for( n=0; n < (sn.bv_len-1); n++ ) { + if( sn.bv_val[n] != '0' ) break; + } + sn.bv_val += n; + sn.bv_len -= n; + + for( n=0; n < sn.bv_len; n++ ) { + if( !ASCII_DIGIT(sn.bv_val[n]) ) return LDAP_INVALID_SYNTAX; + } + + } else { + /* Parse GSER format */ + int havesn=0,haveissuer=0; + struct berval x = *in; + x.bv_val++; + x.bv_len-=2; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if ( x.bv_len < STRLENOF("serialNumber 0,issuer \"\"")) { + return LDAP_INVALID_SYNTAX; + } + + /* should be at issuer or serialNumber NamedValue */ + if( strncasecmp( x.bv_val, "issuer", STRLENOF("issuer")) == 0 ) { + /* parse issuer */ + x.bv_val += STRLENOF("issuer"); + x.bv_len -= STRLENOF("issuer"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if( x.bv_val[0] != '"' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + i.bv_val = x.bv_val; + i.bv_len = 0; + + for( ; i.bv_len < x.bv_len; ) { + if ( i.bv_val[i.bv_len] != '"' ) { + i.bv_len++; + continue; + } + if ( i.bv_val[i.bv_len+1] == '"' ) { + /* double dquote */ + i.bv_len+=2; + continue; + } + break; + } + x.bv_val += i.bv_len+1; + x.bv_len -= i.bv_len+1; + + if ( x.bv_len < STRLENOF(",serialNumber 0")) { + return LDAP_INVALID_SYNTAX; + } + + haveissuer++; + + } else if( strncasecmp( x.bv_val, "serialNumber", + STRLENOF("serialNumber")) == 0 ) + { + /* parse serialNumber */ + int neg=0; + x.bv_val += STRLENOF("serialNumber"); + x.bv_len -= STRLENOF("serialNumber"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + sn.bv_val = x.bv_val; + sn.bv_len = 0; + + if( sn.bv_val[0] == '-' ) { + neg++; + sn.bv_len++; + } + + for( ; sn.bv_len < x.bv_len; sn.bv_len++ ) { + if ( !ASCII_DIGIT( sn.bv_val[sn.bv_len] )) break; + } + + if (!( sn.bv_len > neg )) return LDAP_INVALID_SYNTAX; + if (( sn.bv_len > 1+neg ) && ( sn.bv_val[neg] == '0' )) { + return LDAP_INVALID_SYNTAX; + } + + x.bv_val += sn.bv_len; x.bv_len -= sn.bv_len; + + if ( x.bv_len < STRLENOF( ",issuer \"\"" )) { + return LDAP_INVALID_SYNTAX; + } + + havesn++; + + } else return LDAP_INVALID_SYNTAX; + + if( x.bv_val[0] != ',' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + /* should be at remaining NamedValue */ + if( !haveissuer && (strncasecmp( x.bv_val, "issuer", + STRLENOF("issuer" )) == 0 )) + { + /* parse issuer */ + x.bv_val += STRLENOF("issuer"); + x.bv_len -= STRLENOF("issuer"); + + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } + + if( x.bv_val[0] != '"' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; + + i.bv_val = x.bv_val; + i.bv_len = 0; + + for( ; i.bv_len < x.bv_len; ) { + if ( i.bv_val[i.bv_len] != '"' ) { + i.bv_len++; + continue; + } + if ( i.bv_val[i.bv_len+1] == '"' ) { + /* double dquote */ + i.bv_len+=2; + continue; + } + break; + } + x.bv_val += i.bv_len+1; + x.bv_len -= i.bv_len+1; + + } else if( !havesn && (strncasecmp( x.bv_val, "serialNumber", + STRLENOF("serialNumber")) == 0 )) + { + /* parse serialNumber */ + int neg=0; + x.bv_val += STRLENOF("serialNumber"); + x.bv_len -= STRLENOF("serialNumber"); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, "<<< serialNumberAndIssuerPretty: <%s>\n", - out->bv_val, 0, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, "<<< serialNumberAndIssuerPretty: <%s>\n", - out->bv_val, 0, 0 ); -#endif + if( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX; + x.bv_val++; x.bv_len--; - return LDAP_SUCCESS; -} + /* eat leading spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len ; x.bv_val++, x.bv_len--) { + /* empty */; + } + + sn.bv_val = x.bv_val; + sn.bv_len = 0; -/* - * This routine is called by certificateExactNormalize when - * certificateExactNormalize receives a search string instead of - * a certificate. This routine checks if the search value is valid - * and then returns the normalized value - */ -static int -serialNumberAndIssuerNormalize( - slap_mask_t usage, - Syntax *syntax, - MatchingRule *mr, - struct berval *val, - struct berval *out, - void *ctx ) -{ - int rc; - int state; - ber_len_t n; - struct berval sn, i, newi; + if( sn.bv_val[0] == '-' ) { + neg++; + sn.bv_len++; + } - assert( val ); - assert( out ); + for( ; sn.bv_len < x.bv_len; sn.bv_len++ ) { + if ( !ASCII_DIGIT( sn.bv_val[sn.bv_len] )) break; + } -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, ">>> serialNumberAndIssuerNormalize: <%s>\n", - val->bv_val, 0, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, ">>> serialNumberAndIssuerNormalize: <%s>\n", - val->bv_val, 0, 0 ); -#endif + if (!( sn.bv_len > neg )) return LDAP_INVALID_SYNTAX; + if (( sn.bv_len > 1+neg ) && ( sn.bv_val[neg] == '0' )) { + return LDAP_INVALID_SYNTAX; + } - if( val->bv_len < 3 ) return LDAP_INVALID_SYNTAX; + x.bv_val += sn.bv_len; + x.bv_len -= sn.bv_len; - i.bv_val = strchr( val->bv_val, '$' ); - if( i.bv_val == NULL ) return LDAP_INVALID_SYNTAX; + } else return LDAP_INVALID_SYNTAX; + + /* eat trailing spaces */ + for( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len--) { + /* empty */; + } - sn.bv_val = val->bv_val; - sn.bv_len = i.bv_val - val->bv_val; + /* should have no characters left... */ + if( x.bv_len ) return LDAP_INVALID_SYNTAX; - i.bv_val++; - i.bv_len = val->bv_len - (sn.bv_len + 1); + ber_dupbv_x( &ni, &i, ctx ); + i = ni; - /* eat leading zeros */ - for( n=0; n < (sn.bv_len-1); n++ ) { - if( sn.bv_val[n] != '0' ) break; + /* need to handle double dquotes here */ } - sn.bv_val += n; - sn.bv_len -= n; - for( n=0; n < sn.bv_len; n++ ) { - if( !ASCII_DIGIT(sn.bv_val[n]) ) { - return LDAP_INVALID_SYNTAX; - } + rc = dnNormalize( usage, syntax, mr, &i, &ni, ctx ); + + if( in->bv_val[0] == '{' && in->bv_val[in->bv_len-1] == '}' ) { + slap_sl_free( i.bv_val, ctx ); } - /* pretty DN */ - rc = dnNormalize( usage, syntax, mr, &i, &newi, ctx ); if( rc ) return LDAP_INVALID_SYNTAX; /* make room from sn + "$" */ - out->bv_len = sn.bv_len + newi.bv_len + 1; - out->bv_val = sl_realloc( newi.bv_val, out->bv_len + 1, ctx ); + out->bv_len = STRLENOF( "{ serialNumber , issuer \"\" }" ) + + sn.bv_len + ni.bv_len; + out->bv_val = slap_sl_malloc( out->bv_len + 1, ctx ); if( out->bv_val == NULL ) { - sl_free( newi.bv_val, ctx ); + out->bv_len = 0; + slap_sl_free( ni.bv_val, ctx ); return LDAP_OTHER; } - /* push issuer over */ - AC_MEMCPY( &out->bv_val[sn.bv_len+1], newi.bv_val, newi.bv_len ); - /* insert sn and "$" */ - AC_MEMCPY( out->bv_val, sn.bv_val, sn.bv_len ); - out->bv_val[sn.bv_len] = '$'; - /* terminate */ - out->bv_val[out->bv_len] = '\0'; + n = 0; + AC_MEMCPY( &out->bv_val[n], "{ serialNumber ", + STRLENOF( "{ serialNumber " )); + n = STRLENOF( "{ serialNumber " ); + + AC_MEMCPY( &out->bv_val[n], sn.bv_val, sn.bv_len ); + n += sn.bv_len; + + AC_MEMCPY( &out->bv_val[n], ", issuer \"", STRLENOF( ", issuer \"" )); + n += STRLENOF( ", issuer \"" ); + + AC_MEMCPY( &out->bv_val[n], ni.bv_val, ni.bv_len ); + n += ni.bv_len; + + AC_MEMCPY( &out->bv_val[n], "\" }", STRLENOF( "\" }" )); + n += STRLENOF( "\" }" ); + + out->bv_val[n] = '\0'; + + assert( n == out->bv_len ); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, "<<< serialNumberAndIssuerNormalize: <%s>\n", - out->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "<<< serialNumberAndIssuerNormalize: <%s>\n", out->bv_val, 0, 0 ); -#endif - return rc; + slap_sl_free( ni.bv_val, ctx ); + + return LDAP_SUCCESS; } #ifdef HAVE_TLS @@ -2200,12 +3264,12 @@ certificateExactNormalize( unsigned char *p; char *serial = NULL; ber_len_t seriallen; - struct berval issuer_dn = { 0, NULL }; + struct berval issuer_dn = BER_BVNULL; X509_NAME *name = NULL; ASN1_INTEGER *sn = NULL; X509 *xcert = NULL; - if( val->bv_len == 0 ) goto done; + if( BER_BVISEMPTY( val ) ) goto done; if( SLAP_MR_IS_VALUE_OF_ASSERTION_SYNTAX(usage) ) { return serialNumberAndIssuerNormalize(0,NULL,NULL,val,normalized,ctx); @@ -2213,7 +3277,7 @@ certificateExactNormalize( assert( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX(usage) ); - p = val->bv_val; + p = (unsigned char *)val->bv_val; xcert = d2i_X509( NULL, &p, val->bv_len); if( xcert == NULL ) goto done; @@ -2228,22 +3292,33 @@ certificateExactNormalize( rc = dnX509normalize( name, &issuer_dn ); if( rc != LDAP_SUCCESS ) goto done; - normalized->bv_len = seriallen + issuer_dn.bv_len + 1; - p = normalized->bv_val = ch_malloc(normalized->bv_len+1); + normalized->bv_len = STRLENOF( "{ serialNumber , issuer \"\" }" ) + + seriallen + issuer_dn.bv_len; + normalized->bv_val = ch_malloc(normalized->bv_len+1); + + p = (unsigned char *)normalized->bv_val; + + AC_MEMCPY(p, "{ serialNumber ", STRLENOF( "{ serialNumber " )); + p += STRLENOF( "{ serialNumber " ); + AC_MEMCPY(p, serial, seriallen); p += seriallen; - *p++ = '$'; + + AC_MEMCPY(p, ", issuer \"", STRLENOF( ", issuer \"" )); + p += STRLENOF( ", issuer \"" ); + AC_MEMCPY(p, issuer_dn.bv_val, issuer_dn.bv_len); p += issuer_dn.bv_len; + + AC_MEMCPY(p, "\" }", STRLENOF( "\" }" )); + p += STRLENOF( "\" }" ); + *p = '\0'; -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, ARGS, "certificateExactNormalize: %s\n", - normalized->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "certificateExactNormalize: %s\n", normalized->bv_val, NULL, NULL ); -#endif + + rc = LDAP_SUCCESS; done: if (xcert) X509_free(xcert); @@ -2322,8 +3397,7 @@ check_time_syntax (struct berval *val, } /* leapyear check for the Gregorian calendar (year>1581) */ - if (parts[parts[1] == 0 ? 0 : 1] % 4 == 0) - { + if (parts[parts[1] == 0 ? 0 : 1] % 4 == 0) { leapyear = 1; } @@ -2336,16 +3410,17 @@ check_time_syntax (struct berval *val, fraction->bv_len = 0; if (p < e && (*p == '.' || *p == ',')) { char *end_num; - while (++p < e && ASCII_DIGIT(*p)) - ; + while (++p < e && ASCII_DIGIT(*p)) { + /* EMTPY */; + } if (p - fraction->bv_val == 1) { return LDAP_INVALID_SYNTAX; } - for (end_num = p; end_num[-1] == '0'; --end_num) - ; + for (end_num = p; end_num[-1] == '0'; --end_num) { + /* EMPTY */; + } c = end_num - fraction->bv_val; - if (c != 1) - fraction->bv_len = c; + if (c != 1) fraction->bv_len = c; } } @@ -2504,19 +3579,19 @@ generalizedTimeNormalize( return rc; } - len = sizeof("YYYYmmddHHMMSSZ")-1 + fraction.bv_len; - normalized->bv_val = sl_malloc( len + 1, ctx ); - if ( normalized->bv_val == NULL ) { + len = STRLENOF("YYYYmmddHHMMSSZ") + fraction.bv_len; + normalized->bv_val = slap_sl_malloc( len + 1, ctx ); + if ( BER_BVISNULL( normalized ) ) { return LBER_ERROR_MEMORY; } sprintf( normalized->bv_val, "%02d%02d%02d%02d%02d%02d%02d", parts[0], parts[1], parts[2] + 1, parts[3] + 1, parts[4], parts[5], parts[6] ); - if ( fraction.bv_len ) { - memcpy( normalized->bv_val + sizeof("YYYYmmddHHMMSSZ")-2, + if ( !BER_BVISEMPTY( &fraction ) ) { + memcpy( normalized->bv_val + STRLENOF("YYYYmmddHHMMSSZ")-1, fraction.bv_val, fraction.bv_len ); - normalized->bv_val[sizeof("YYYYmmddHHMMSSZ")-2] = '.'; + normalized->bv_val[STRLENOF("YYYYmmddHHMMSSZ")-1] = '.'; } strcpy( normalized->bv_val + len-1, "Z" ); normalized->bv_len = len; @@ -2546,6 +3621,243 @@ generalizedTimeOrderingMatch( return LDAP_SUCCESS; } +/* Index generation function */ +int generalizedTimeIndexer( + slap_mask_t use, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *prefix, + BerVarray values, + BerVarray *keysp, + void *ctx ) +{ + int i, j; + BerVarray keys; + char tmp[5]; + BerValue bvtmp; /* 40 bit index */ + struct lutil_tm tm; + struct lutil_timet tt; + + bvtmp.bv_len = sizeof(tmp); + bvtmp.bv_val = tmp; + for( i=0; values[i].bv_val != NULL; i++ ) { + /* just count them */ + } + + /* we should have at least one value at this point */ + assert( i > 0 ); + + keys = slap_sl_malloc( sizeof( struct berval ) * (i+1), ctx ); + + /* GeneralizedTime YYYYmmddHH[MM[SS]][(./,)d...](Z|(+/-)HH[MM]) */ + for( i=0, j=0; values[i].bv_val != NULL; i++ ) { + assert(values[i].bv_val != NULL && values[i].bv_len >= 10); + /* Use 40 bits of time for key */ + if ( lutil_parsetime( values[i].bv_val, &tm ) == 0 ) { + lutil_tm2time( &tm, &tt ); + tmp[0] = tt.tt_gsec & 0xff; + tmp[4] = tt.tt_sec & 0xff; + tt.tt_sec >>= 8; + tmp[3] = tt.tt_sec & 0xff; + tt.tt_sec >>= 8; + tmp[2] = tt.tt_sec & 0xff; + tt.tt_sec >>= 8; + tmp[1] = tt.tt_sec & 0xff; + + ber_dupbv_x(&keys[j++], &bvtmp, ctx ); + } + } + + keys[j].bv_val = NULL; + keys[j].bv_len = 0; + + *keysp = keys; + + return LDAP_SUCCESS; +} + +/* Index generation function */ +int generalizedTimeFilter( + slap_mask_t use, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *prefix, + void * assertedValue, + BerVarray *keysp, + void *ctx ) +{ + BerVarray keys; + char tmp[5]; + BerValue bvtmp; /* 40 bit index */ + BerValue *value = (BerValue *) assertedValue; + struct lutil_tm tm; + struct lutil_timet tt; + + bvtmp.bv_len = sizeof(tmp); + bvtmp.bv_val = tmp; + /* GeneralizedTime YYYYmmddHH[MM[SS]][(./,)d...](Z|(+/-)HH[MM]) */ + /* Use 40 bits of time for key */ + if ( value->bv_val && value->bv_len >= 10 && + lutil_parsetime( value->bv_val, &tm ) == 0 ) { + + lutil_tm2time( &tm, &tt ); + tmp[0] = tt.tt_gsec & 0xff; + tmp[4] = tt.tt_sec & 0xff; + tt.tt_sec >>= 8; + tmp[3] = tt.tt_sec & 0xff; + tt.tt_sec >>= 8; + tmp[2] = tt.tt_sec & 0xff; + tt.tt_sec >>= 8; + tmp[1] = tt.tt_sec & 0xff; + + keys = slap_sl_malloc( sizeof( struct berval ) * 2, ctx ); + ber_dupbv_x(keys, &bvtmp, ctx ); + keys[1].bv_val = NULL; + keys[1].bv_len = 0; + } else { + keys = NULL; + } + + *keysp = keys; + + return LDAP_SUCCESS; +} + +static int +deliveryMethodValidate( + Syntax *syntax, + struct berval *val ) +{ +#undef LENOF +#define LENOF(s) (sizeof(s)-1) + struct berval tmp = *val; + /* + * DeliveryMethod = pdm *( WSP DOLLAR WSP DeliveryMethod ) + * pdm = "any" / "mhs" / "physical" / "telex" / "teletex" / + * "g3fax" / "g4fax" / "ia5" / "videotex" / "telephone" + */ +again: + if( tmp.bv_len < 3 ) return LDAP_INVALID_SYNTAX; + + switch( tmp.bv_val[0] ) { + case 'a': + case 'A': + if(( tmp.bv_len >= LENOF("any") ) && + ( strncasecmp(tmp.bv_val, "any", LENOF("any")) == 0 )) + { + tmp.bv_len -= LENOF("any"); + tmp.bv_val += LENOF("any"); + break; + } + return LDAP_INVALID_SYNTAX; + + case 'm': + case 'M': + if(( tmp.bv_len >= LENOF("mhs") ) && + ( strncasecmp(tmp.bv_val, "mhs", LENOF("mhs")) == 0 )) + { + tmp.bv_len -= LENOF("mhs"); + tmp.bv_val += LENOF("mhs"); + break; + } + return LDAP_INVALID_SYNTAX; + + case 'p': + case 'P': + if(( tmp.bv_len >= LENOF("physical") ) && + ( strncasecmp(tmp.bv_val, "physical", LENOF("physical")) == 0 )) + { + tmp.bv_len -= LENOF("physical"); + tmp.bv_val += LENOF("physical"); + break; + } + return LDAP_INVALID_SYNTAX; + + case 't': + case 'T': /* telex or teletex or telephone */ + if(( tmp.bv_len >= LENOF("telex") ) && + ( strncasecmp(tmp.bv_val, "telex", LENOF("telex")) == 0 )) + { + tmp.bv_len -= LENOF("telex"); + tmp.bv_val += LENOF("telex"); + break; + } + if(( tmp.bv_len >= LENOF("teletex") ) && + ( strncasecmp(tmp.bv_val, "teletex", LENOF("teletex")) == 0 )) + { + tmp.bv_len -= LENOF("teletex"); + tmp.bv_val += LENOF("teletex"); + break; + } + if(( tmp.bv_len >= LENOF("telephone") ) && + ( strncasecmp(tmp.bv_val, "telephone", LENOF("telephone")) == 0 )) + { + tmp.bv_len -= LENOF("telephone"); + tmp.bv_val += LENOF("telephone"); + break; + } + return LDAP_INVALID_SYNTAX; + + case 'g': + case 'G': /* g3fax or g4fax */ + if(( tmp.bv_len >= LENOF("g3fax") ) && ( + ( strncasecmp(tmp.bv_val, "g3fax", LENOF("g3fax")) == 0 ) || + ( strncasecmp(tmp.bv_val, "g4fax", LENOF("g4fax")) == 0 ))) + { + tmp.bv_len -= LENOF("g3fax"); + tmp.bv_val += LENOF("g3fax"); + break; + } + return LDAP_INVALID_SYNTAX; + + case 'i': + case 'I': + if(( tmp.bv_len >= LENOF("ia5") ) && + ( strncasecmp(tmp.bv_val, "ia5", LENOF("ia5")) == 0 )) + { + tmp.bv_len -= LENOF("ia5"); + tmp.bv_val += LENOF("ia5"); + break; + } + return LDAP_INVALID_SYNTAX; + + case 'v': + case 'V': + if(( tmp.bv_len >= LENOF("videotex") ) && + ( strncasecmp(tmp.bv_val, "videotex", LENOF("videotex")) == 0 )) + { + tmp.bv_len -= LENOF("videotex"); + tmp.bv_val += LENOF("videotex"); + break; + } + return LDAP_INVALID_SYNTAX; + + default: + return LDAP_INVALID_SYNTAX; + } + + if( BER_BVISEMPTY( &tmp ) ) return LDAP_SUCCESS; + + while( !BER_BVISEMPTY( &tmp ) && ( tmp.bv_val[0] == ' ' ) ) { + tmp.bv_len++; + tmp.bv_val--; + } + if( !BER_BVISEMPTY( &tmp ) && ( tmp.bv_val[0] == '$' ) ) { + tmp.bv_len++; + tmp.bv_val--; + } else { + return LDAP_INVALID_SYNTAX; + } + while( !BER_BVISEMPTY( &tmp ) && ( tmp.bv_val[0] == ' ' ) ) { + tmp.bv_len++; + tmp.bv_val--; + } + + goto again; +} + static int nisNetgroupTripleValidate( Syntax *syntax, @@ -2554,7 +3866,7 @@ nisNetgroupTripleValidate( char *p, *e; int commas = 0; - if ( val->bv_len == 0 ) { + if ( BER_BVISEMPTY( val ) ) { return LDAP_INVALID_SYNTAX; } @@ -2597,7 +3909,7 @@ bootParameterValidate( { char *p, *e; - if ( val->bv_len == 0 ) { + if ( BER_BVISEMPTY( val ) ) { return LDAP_INVALID_SYNTAX; } @@ -2646,9 +3958,14 @@ firstComponentNormalize( void *ctx ) { int rc; - struct berval oid; + struct berval comp; ber_len_t len; + if( SLAP_MR_IS_VALUE_OF_ASSERTION_SYNTAX( usage )) { + ber_dupbv_x( normalized, val, ctx ); + return LDAP_SUCCESS; + } + if( val->bv_len < 3 ) return LDAP_INVALID_SYNTAX; if( val->bv_val[0] != '(' /*')'*/ && @@ -2666,26 +3983,26 @@ firstComponentNormalize( } /* grab next word */ - oid.bv_val = &val->bv_val[len]; + comp.bv_val = &val->bv_val[len]; len = val->bv_len - len; - for( oid.bv_len=0; - !ASCII_SPACE(oid.bv_val[oid.bv_len]) && oid.bv_len < len; - oid.bv_len++ ) + for( comp.bv_len = 0; + !ASCII_SPACE(comp.bv_val[comp.bv_len]) && comp.bv_len < len; + comp.bv_len++ ) { /* empty */ } if( mr == slap_schema.si_mr_objectIdentifierFirstComponentMatch ) { - rc = numericoidValidate( NULL, &oid ); + rc = numericoidValidate( NULL, &comp ); } else if( mr == slap_schema.si_mr_integerFirstComponentMatch ) { - rc = integerValidate( NULL, &oid ); + rc = integerValidate( NULL, &comp ); } else { rc = LDAP_INVALID_SYNTAX; } if( rc == LDAP_SUCCESS ) { - ber_dupbv_x( normalized, &oid, ctx ); + ber_dupbv_x( normalized, &comp, ctx ); } return rc; @@ -2726,10 +4043,18 @@ static slap_syntax_defs_rec syntax_defs[] = { 0, countryStringValidate, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'Distinguished Name' )", 0, dnValidate, dnPretty}, + {"( 1.2.36.79672281.1.5.0 DESC 'RDN' )", + 0, rdnValidate, rdnPretty}, +#ifdef LDAP_COMP_MATCH + {"( 1.2.36.79672281.1.5.3 DESC 'allComponents' )", + 0, allComponentsValidate, NULL}, + {"( 1.2.36.79672281.1.5.2 DESC 'componentFilterMatch assertion') ", + 0, componentFilterValidate, NULL}, +#endif {"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'Data Quality' )", 0, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.14 DESC 'Delivery Method' )", - 0, NULL, NULL}, + 0, deliveryMethodValidate, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.15 DESC 'Directory String' )", 0, UTF8StringValidate, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.16 DESC 'DIT Content Rule Description' )", @@ -2821,19 +4146,23 @@ static slap_syntax_defs_rec syntax_defs[] = { {"( 1.3.6.1.1.1.0.1 DESC 'RFC2307 Boot Parameter' )", 0, bootParameterValidate, NULL}, - /* From PKIX *//* This OID is not published yet. */ - {"( 1.2.826.0.1.3344810.7.1 DESC 'Certificate Serial Number and Issuer' )", + /* draft-zeilenga-ldap-x509 */ + {"( 1.3.6.1.1.15.1 DESC 'Certificate Exact Assertion' )", SLAP_SYNTAX_HIDE, serialNumberAndIssuerValidate, serialNumberAndIssuerPretty}, - -#ifdef SLAPD_ACI_ENABLED - /* OpenLDAP Experimental Syntaxes */ - {"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )", - SLAP_SYNTAX_HIDE, - UTF8StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */, - NULL}, -#endif + {"( 1.3.6.1.1.15.2 DESC 'Certificate Assertion' )", + SLAP_SYNTAX_HIDE, NULL, NULL}, + {"( 1.3.6.1.1.15.3 DESC 'Certificate Pair Exact Assertion' )", + SLAP_SYNTAX_HIDE, NULL, NULL}, + {"( 1.3.6.1.1.15.4 DESC 'Certificate Pair Assertion' )", + SLAP_SYNTAX_HIDE, NULL, NULL}, + {"( 1.3.6.1.1.15.5 DESC 'Certificate List Exact Assertion' )", + SLAP_SYNTAX_HIDE, NULL, NULL}, + {"( 1.3.6.1.1.15.6 DESC 'Certificate List Assertion' )", + SLAP_SYNTAX_HIDE, NULL, NULL}, + {"( 1.3.6.1.1.15.7 DESC 'Algorithm Identifier' )", + SLAP_SYNTAX_HIDE, NULL, NULL}, #ifdef SLAPD_AUTHPASSWD /* needs updating */ @@ -2841,12 +4170,22 @@ static slap_syntax_defs_rec syntax_defs[] = { SLAP_SYNTAX_HIDE, NULL, NULL}, #endif - {"( 1.3.6.1.4.1.4203.666.2.6 DESC 'UUID' )", - SLAP_SYNTAX_HIDE, UUIDValidate, NULL}, + {"( 1.3.6.1.1.16.1 DESC 'UUID' )", + 0, UUIDValidate, UUIDPretty}, + + {"( 1.3.6.1.4.1.4203.666.11.2.1 DESC 'CSN' )", + SLAP_SYNTAX_HIDE, csnValidate, NULL}, /* OpenLDAP Void Syntax */ {"( 1.3.6.1.4.1.4203.1.1.1 DESC 'OpenLDAP void' )" , SLAP_SYNTAX_HIDE, inValidate, NULL}, + +#ifdef SLAP_AUTHZ_SYNTAX + /* FIXME: OID is unused, but not registered yet */ + {"( 1.3.6.1.4.1.4203.666.2.7 DESC 'OpenLDAP authz' )", + SLAP_SYNTAX_HIDE, authzValidate, authzPretty}, +#endif /* SLAP_AUTHZ_SYNTAX */ + {NULL, 0, NULL, NULL} }; @@ -2854,6 +4193,12 @@ char *certificateExactMatchSyntaxes[] = { "1.3.6.1.4.1.1466.115.121.1.8" /* certificate */, NULL }; +#ifdef LDAP_COMP_MATCH +char *componentFilterMatchSyntaxes[] = { + "1.3.6.1.4.1.1466.115.121.1.8" /* certificate */, + NULL +}; +#endif char *directoryStringSyntaxes[] = { "1.3.6.1.4.1.1466.115.121.1.44" /* printableString */, NULL @@ -2878,21 +4223,23 @@ char *objectIdentifierFirstComponentMatchSyntaxes[] = { /* * Other matching rules in X.520 that we do not use (yet): * - * 2.5.13.9 numericStringOrderingMatch * 2.5.13.25 uTCTimeMatch * 2.5.13.26 uTCTimeOrderingMatch - * 2.5.13.31 directoryStringFirstComponentMatch - * 2.5.13.32 wordMatch - * 2.5.13.33 keywordMatch - * 2.5.13.36 certificatePairExactMatch - * 2.5.13.37 certificatePairMatch - * 2.5.13.38 certificateListExactMatch - * 2.5.13.39 certificateListMatch - * 2.5.13.40 algorithmIdentifierMatch - * 2.5.13.41 storedPrefixMatch + * 2.5.13.31* directoryStringFirstComponentMatch + * 2.5.13.32* wordMatch + * 2.5.13.33* keywordMatch + * 2.5.13.36+ certificatePairExactMatch + * 2.5.13.37+ certificatePairMatch + * 2.5.13.38+ certificateListExactMatch + * 2.5.13.39+ certificateListMatch + * 2.5.13.40+ algorithmIdentifierMatch + * 2.5.13.41* storedPrefixMatch * 2.5.13.42 attributeCertificateMatch * 2.5.13.43 readerAndKeyIDMatch * 2.5.13.44 attributeIntegrityMatch + * + * (*) described in RFC 3698 (LDAP: Additional Matching Rules) + * (+) described in draft-zeilenga-ldap-x509 */ static slap_mrule_defs_rec mrule_defs[] = { /* @@ -2931,6 +4278,64 @@ static slap_mrule_defs_rec mrule_defs[] = { octetStringIndexer, octetStringFilter, NULL }, + {"( 1.3.6.1.4.1.4203.666.4.9 NAME 'dnSubtreeMatch' " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )", + SLAP_MR_HIDE | SLAP_MR_EXT, NULL, + NULL, dnNormalize, dnRelativeMatch, + NULL, NULL, + NULL }, + + {"( 1.3.6.1.4.1.4203.666.4.8 NAME 'dnOneLevelMatch' " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )", + SLAP_MR_HIDE | SLAP_MR_EXT, NULL, + NULL, dnNormalize, dnRelativeMatch, + NULL, NULL, + NULL }, + + {"( 1.3.6.1.4.1.4203.666.4.10 NAME 'dnSubordinateMatch' " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )", + SLAP_MR_HIDE | SLAP_MR_EXT, NULL, + NULL, dnNormalize, dnRelativeMatch, + NULL, NULL, + NULL }, + + {"( 1.3.6.1.4.1.4203.666.4.11 NAME 'dnSuperiorMatch' " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )", + SLAP_MR_HIDE | SLAP_MR_EXT, NULL, + NULL, dnNormalize, dnRelativeMatch, + NULL, NULL, + NULL }, + + {"( 1.2.36.79672281.1.13.3 NAME 'rdnMatch' " + "SYNTAX 1.2.36.79672281.1.5.0 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, + NULL, rdnNormalize, rdnMatch, + octetStringIndexer, octetStringFilter, + NULL }, + +#ifdef LDAP_COMP_MATCH + {"( 1.2.36.79672281.1.13.2 NAME 'componentFilterMatch' " + "SYNTAX 1.2.36.79672281.1.5.2 )", + SLAP_MR_EXT|SLAP_MR_COMPONENT, componentFilterMatchSyntaxes, + NULL, NULL , componentFilterMatch, + octetStringIndexer, octetStringFilter, + NULL }, + + {"( 1.2.36.79672281.1.13.6 NAME 'allComponentsMatch' " + "SYNTAX 1.2.36.79672281.1.5.3 )", + SLAP_MR_EQUALITY|SLAP_MR_EXT|SLAP_MR_COMPONENT, NULL, + NULL, NULL , allComponentsMatch, + octetStringIndexer, octetStringFilter, + NULL }, + + {"( 1.2.36.79672281.1.13.7 NAME 'directoryComponentsMatch' " + "SYNTAX 1.2.36.79672281.1.5.3 )", + SLAP_MR_EQUALITY|SLAP_MR_EXT|SLAP_MR_COMPONENT, NULL, + NULL, NULL , directoryComponentsMatch, + octetStringIndexer, octetStringFilter, + NULL }, +#endif + {"( 2.5.13.2 NAME 'caseIgnoreMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )", SLAP_MR_EQUALITY | SLAP_MR_EXT, directoryStringSyntaxes, @@ -2947,8 +4352,8 @@ static slap_mrule_defs_rec mrule_defs[] = { {"( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )", - SLAP_MR_SUBSTR, NULL, - NULL, UTF8StringNormalize, octetStringSubstringsMatch, + SLAP_MR_SUBSTR, directoryStringSyntaxes, + NULL, UTF8StringNormalize, directoryStringSubstringsMatch, octetStringSubstringsIndexer, octetStringSubstringsFilter, "caseIgnoreMatch" }, @@ -2969,17 +4374,24 @@ static slap_mrule_defs_rec mrule_defs[] = { {"( 2.5.13.7 NAME 'caseExactSubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )", SLAP_MR_SUBSTR, directoryStringSyntaxes, - NULL, UTF8StringNormalize, octetStringSubstringsMatch, + NULL, UTF8StringNormalize, directoryStringSubstringsMatch, octetStringSubstringsIndexer, octetStringSubstringsFilter, "caseExactMatch" }, {"( 2.5.13.8 NAME 'numericStringMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )", SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, - NULL, numericStringNormalize, octetStringSubstringsMatch, - octetStringSubstringsIndexer, octetStringSubstringsFilter, + NULL, numericStringNormalize, octetStringMatch, + octetStringIndexer, octetStringFilter, NULL }, + {"( 2.5.13.9 NAME 'numericStringOrderingMatch' " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )", + SLAP_MR_ORDERING, NULL, + NULL, numericStringNormalize, octetStringOrderingMatch, + NULL, NULL, + "numericStringMatch" }, + {"( 2.5.13.10 NAME 'numericStringSubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )", SLAP_MR_SUBSTR, NULL, @@ -3071,7 +4483,7 @@ static slap_mrule_defs_rec mrule_defs[] = { "SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )", SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, uniqueMemberNormalize, uniqueMemberMatch, - NULL, NULL, + uniqueMemberIndexer, uniqueMemberFilter, NULL }, {"( 2.5.13.24 NAME 'protocolInformationMatch' " @@ -3081,14 +4493,14 @@ static slap_mrule_defs_rec mrule_defs[] = { {"( 2.5.13.27 NAME 'generalizedTimeMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )", - SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, + SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_ORDERED_INDEX, NULL, NULL, generalizedTimeNormalize, octetStringMatch, - NULL, NULL, + generalizedTimeIndexer, generalizedTimeFilter, NULL }, {"( 2.5.13.28 NAME 'generalizedTimeOrderingMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )", - SLAP_MR_ORDERING, NULL, + SLAP_MR_ORDERING | SLAP_MR_ORDERED_INDEX, NULL, NULL, generalizedTimeNormalize, generalizedTimeOrderingMatch, NULL, NULL, "generalizedTimeMatch" }, @@ -3110,7 +4522,7 @@ static slap_mrule_defs_rec mrule_defs[] = { NULL }, {"( 2.5.13.34 NAME 'certificateExactMatch' " - "SYNTAX 1.2.826.0.1.3344810.7.1 )", + "SYNTAX 1.3.6.1.1.15.1 )", SLAP_MR_EQUALITY | SLAP_MR_EXT, certificateExactMatchSyntaxes, #ifdef HAVE_TLS NULL, certificateExactNormalize, octetStringMatch, @@ -3121,14 +4533,9 @@ static slap_mrule_defs_rec mrule_defs[] = { NULL }, {"( 2.5.13.35 NAME 'certificateMatch' " - "SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )", + "SYNTAX 1.3.6.1.1.15.2 )", SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, -#ifdef HAVE_TLS - NULL, NULL, octetStringMatch, - octetStringIndexer, octetStringFilter, -#else NULL, NULL, NULL, NULL, NULL, -#endif NULL }, {"( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match' " @@ -3148,14 +4555,14 @@ static slap_mrule_defs_rec mrule_defs[] = { {"( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )", SLAP_MR_SUBSTR, NULL, - NULL, IA5StringNormalize, octetStringSubstringsMatch, + NULL, IA5StringNormalize, directoryStringSubstringsMatch, octetStringSubstringsIndexer, octetStringSubstringsFilter, "caseIgnoreIA5Match" }, {"( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )", SLAP_MR_SUBSTR, NULL, - NULL, IA5StringNormalize, octetStringSubstringsMatch, + NULL, IA5StringNormalize, directoryStringSubstringsMatch, octetStringSubstringsIndexer, octetStringSubstringsFilter, "caseExactIA5Match" }, @@ -3169,15 +4576,6 @@ static slap_mrule_defs_rec mrule_defs[] = { NULL}, #endif -#ifdef SLAPD_ACI_ENABLED - {"( 1.3.6.1.4.1.4203.666.4.2 NAME 'OpenLDAPaciMatch' " - "SYNTAX 1.3.6.1.4.1.4203.666.2.1 )", - SLAP_MR_HIDE | SLAP_MR_EQUALITY, NULL, - NULL, NULL, OpenLDAPaciMatch, - NULL, NULL, - NULL}, -#endif - {"( 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, @@ -3192,20 +4590,44 @@ static slap_mrule_defs_rec mrule_defs[] = { NULL, NULL, "integerMatch" }, - {"( 1.3.6.1.4.1.4203.666.4.6 NAME 'UUIDMatch' " - "SYNTAX 1.3.6.1.4.1.4203.666.2.6 )", - SLAP_MR_HIDE | SLAP_MR_EQUALITY, NULL, + {"( 1.3.6.1.1.16.2 NAME 'UUIDMatch' " + "SYNTAX 1.3.6.1.1.16.1 )", + SLAP_MR_EQUALITY | SLAP_MR_MUTATION_NORMALIZER, NULL, NULL, UUIDNormalize, octetStringMatch, octetStringIndexer, octetStringFilter, NULL}, - {"( 1.3.6.1.4.1.4203.666.4.7 NAME 'UUIDOrderingMatch' " - "SYNTAX 1.3.6.1.4.1.4203.666.2.6 )", - SLAP_MR_HIDE | SLAP_MR_ORDERING, NULL, + {"( 1.3.6.1.1.16.3 NAME 'UUIDOrderingMatch' " + "SYNTAX 1.3.6.1.1.16.1 )", + SLAP_MR_ORDERING | SLAP_MR_MUTATION_NORMALIZER, NULL, NULL, UUIDNormalize, octetStringOrderingMatch, octetStringIndexer, octetStringFilter, "UUIDMatch"}, + {"( 1.3.6.1.4.1.4203.666.11.2.2 NAME 'CSNMatch' " + "SYNTAX 1.3.6.1.4.1.4203.666.11.2.1 )", + SLAP_MR_HIDE | SLAP_MR_EQUALITY | SLAP_MR_ORDERED_INDEX, NULL, + NULL, NULL, csnMatch, + csnIndexer, csnFilter, + NULL}, + + {"( 1.3.6.1.4.1.4203.666.11.2.3 NAME 'CSNOrderingMatch' " + "SYNTAX 1.3.6.1.4.1.4203.666.11.2.1 )", + SLAP_MR_HIDE | SLAP_MR_ORDERING | SLAP_MR_ORDERED_INDEX, NULL, + NULL, NULL, csnOrderingMatch, + NULL, NULL, + "CSNMatch" }, + +#ifdef SLAP_AUTHZ_SYNTAX + /* FIXME: OID is unused, but not registered yet */ + {"( 1.3.6.1.4.1.4203.666.4.12 NAME 'authzMatch' " + "SYNTAX 1.3.6.1.4.1.4203.666.2.7 )", + SLAP_MR_HIDE | SLAP_MR_EQUALITY, NULL, + NULL, authzNormalize, authzMatch, + NULL, NULL, + NULL}, +#endif /* SLAP_AUTHZ_SYNTAX */ + {NULL, SLAP_MR_NONE, NULL, NULL, NULL, NULL, NULL, NULL, NULL } @@ -3264,4 +4686,7 @@ schema_destroy( void ) mr_destroy(); mru_destroy(); syn_destroy(); + + ldap_pvt_thread_mutex_destroy( &ad_undef_mutex ); + ldap_pvt_thread_mutex_destroy( &oc_undef_mutex ); }