don't return entry if requested attr is not present (ITS#5650)

[openldap] / servers / slapd / schema_init.c

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index c345065d3b34c6d2658d70fe823f205c6894cc6d..fd386a74f2e2d2b59df75b07bc113a5566bd6171 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2239,10 +2239,10 @@ integerIndexer(
                }
                rc = integerVal2Key( &values[i], &keys[i], &itmp, ctx );
                if ( rc )
-                       goto leave;
+                       goto func_leave;
        }
        *keysp = keys;
-leave:
+func_leave:
        if ( itmp.bv_val != ibuf ) {
                slap_sl_free( itmp.bv_val, ctx );
        }
@@ -2273,6 +2273,8 @@ integerFilter(
 
        keys[0].bv_len = index_intlen;
        keys[0].bv_val = slap_sl_malloc( index_intlen, ctx );
+       keys[1].bv_len = 0;
+       keys[1].bv_val = NULL;
 
        iv.bv_len = value->bv_len < index_intlen_strlen + INDEX_INTLEN_CHOP-1
                ? value->bv_len : index_intlen_strlen + INDEX_INTLEN_CHOP-1;
@@ -2753,7 +2755,7 @@ serialNumberAndIssuerCheck(
 
        } else {
                /* Parse GSER format */ 
-               int havesn=0,haveissuer=0;
+               int havesn = 0, haveissuer = 0, numdquotes = 0;
                struct berval x = *in;
                struct berval ni;
                x.bv_val++;
@@ -2819,7 +2821,10 @@ serialNumberAndIssuerCheck(
                        STRLENOF("serialNumber")) == 0 )
                {
                        /* parse serialNumber */
-                       int neg=0;
+                       int neg = 0;
+                       char first = '\0';
+                       int extra = 0;
+
                        x.bv_val += STRLENOF("serialNumber");
                        x.bv_len -= STRLENOF("serialNumber");
 
@@ -2840,29 +2845,45 @@ serialNumberAndIssuerCheck(
                        }
 
                        if ( sn->bv_val[0] == '0' && ( sn->bv_val[1] == 'x' ||
-                               sn->bv_val[1] == 'X' )) {
+                               sn->bv_val[1] == 'X' ))
+                       {
                                is_hex = 1;
+                               first = sn->bv_val[2];
+                               extra = 2;
+
+                               sn->bv_len += STRLENOF("0x");
                                for( ; sn->bv_len < x.bv_len; sn->bv_len++ ) {
                                        if ( !ASCII_HEX( sn->bv_val[sn->bv_len] )) break;
                                }
+
                        } else if ( sn->bv_val[0] == '\'' ) {
+                               first = sn->bv_val[1];
+                               extra = 3;
+
+                               sn->bv_len += STRLENOF("'");
+
                                for( ; sn->bv_len < x.bv_len; sn->bv_len++ ) {
                                        if ( !ASCII_HEX( sn->bv_val[sn->bv_len] )) break;
                                }
                                if ( sn->bv_val[sn->bv_len] == '\'' &&
-                                       sn->bv_val[sn->bv_len+1] == 'H' )
+                                       sn->bv_val[sn->bv_len + 1] == 'H' )
+                               {
+                                       sn->bv_len += STRLENOF("'H");
                                        is_hex = 1;
-                               else
+
+                               } else {
                                        return LDAP_INVALID_SYNTAX;
-                               sn->bv_len += 2;
+                               }
+
                        } else {
+                               first = sn->bv_val[0];
                                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' )) {
+                       if (( sn->bv_len > extra+1+neg ) && ( first == '0' )) {
                                return LDAP_INVALID_SYNTAX;
                        }
 
@@ -2919,6 +2940,7 @@ serialNumberAndIssuerCheck(
                                }
                                if ( is->bv_val[is->bv_len+1] == '"' ) {
                                        /* double dquote */
+                                       numdquotes++;
                                        is->bv_len+=2;
                                        continue;
                                }
@@ -2991,11 +3013,25 @@ serialNumberAndIssuerCheck(
                /* should have no characters left... */
                if( x.bv_len ) return LDAP_INVALID_SYNTAX;
 
-               ber_dupbv_x( &ni, is, ctx );
-               *is = ni;
+               if ( numdquotes == 0 ) {
+                       ber_dupbv_x( &ni, is, ctx );
+               } else {
+                       ber_int_t src, dst;
 
-               /* need to handle double dquotes here */
+                       ni.bv_len = is->bv_len - numdquotes;
+                       ni.bv_val = ber_memalloc_x( ni.bv_len + 1, ctx );
+                       for ( src = 0, dst = 0; src < is->bv_len; src++, dst++ ) {
+                               if ( is->bv_val[src] == '"' ) {
+                                       src++;
+                               }
+                               ni.bv_val[dst] = is->bv_val[src];
+                       }
+                       ni.bv_val[dst] = '\0';
+               }
+                       
+               *is = ni;
        }
+
        return 0;
 }
        
@@ -3142,7 +3178,7 @@ serialNumberAndIssuerNormalize(
        sn2.bv_len = sn.bv_len;
        if ( lutil_str2bin( &sn, &sn2, ctx )) {
                rc = LDAP_INVALID_SYNTAX;
-               goto leave;
+               goto func_leave;
        }
 
        /* make room for sn + "$" */
@@ -3154,7 +3190,7 @@ serialNumberAndIssuerNormalize(
                out->bv_len = 0;
                slap_sl_free( ni.bv_val, ctx );
                rc = LDAP_OTHER;
-               goto leave;
+               goto func_leave;
        }
 
        n = 0;
@@ -3192,7 +3228,7 @@ serialNumberAndIssuerNormalize(
        Debug( LDAP_DEBUG_TRACE, "<<< serialNumberAndIssuerNormalize: <%s>\n",
                out->bv_val, 0, 0 );
 
-leave:
+func_leave:
        if ( stmp != sbuf )
                slap_sl_free( stmp, ctx );
        slap_sl_free( ni.bv_val, ctx );
@@ -4500,8 +4536,10 @@ firstComponentNormalize(
 
        if( val->bv_len < 3 ) return LDAP_INVALID_SYNTAX;
 
-       if( val->bv_val[0] != '(' /*')'*/ &&
-               val->bv_val[0] != '{' /*'}'*/ )
+       if( ! ( val->bv_val[0] == '(' /*')'*/
+                       && val->bv_val[val->bv_len - 1] == /*'('*/ ')' )
+               && ! ( val->bv_val[0] == '{' /*'}'*/
+                       && val->bv_val[val->bv_len - 1] == /*'('*/ '}' ) )
        {
                return LDAP_INVALID_SYNTAX;
        }
@@ -4516,7 +4554,7 @@ firstComponentNormalize(
 
        /* grab next word */
        comp.bv_val = &val->bv_val[len];
-       len = val->bv_len - len;
+       len = val->bv_len - len - STRLENOF(/*"{"*/ "}");
        for( comp.bv_len = 0;
                !ASCII_SPACE(comp.bv_val[comp.bv_len]) && comp.bv_len < len;
                comp.bv_len++ )