check sat_equality before using it (ITS#6943)

[openldap] / servers / slapd / overlays / rwmmap.c

diff --git a/servers/slapd/overlays/rwmmap.c b/servers/slapd/overlays/rwmmap.c
index 95eec2f92229c7e92ca114740b7b5fca98773546..73ef50377f69130a88c26f56cbbe4fca45767ba0 100644 (file)
--- a/servers/slapd/overlays/rwmmap.c
+++ b/servers/slapd/overlays/rwmmap.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2009 The OpenLDAP Foundation.
+ * Copyright 1999-2011 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -179,25 +179,38 @@ rwm_map( struct ldapmap *map, struct berval *s, struct berval *bv, int remap )
  */
 int
 rwm_map_attrnames(
+       Operation       *op,
        struct ldapmap  *at_map,
        struct ldapmap  *oc_map,
        AttributeName   *an,
        AttributeName   **anp,
        int             remap )
 {
-       int             i, j;
+       int             i, j, x;
 
        assert( anp != NULL );
 
        *anp = NULL;
 
-       if ( an == NULL ) {
+       if ( an == NULL && op->o_bd->be_extra_anlist == NULL ) {
                return LDAP_SUCCESS;
        }
 
-       for ( i = 0; !BER_BVISNULL( &an[i].an_name ); i++ )
-               /* just count */ ;
-       *anp = ch_malloc( ( i + 1 )* sizeof( AttributeName ) );
+       i = 0;
+       if ( an != NULL ) {
+               for ( i = 0; !BER_BVISNULL( &an[i].an_name ); i++ )
+                       /* just count */ ;
+       }
+
+       x = 0;
+       if ( op->o_bd->be_extra_anlist ) {
+               for ( ; !BER_BVISNULL( &op->o_bd->be_extra_anlist[x].an_name ); x++ )
+                       /* just count */ ;
+       }
+
+       assert( i > 0 || x > 0 );
+       *anp = op->o_tmpcalloc( ( i + x + 1 ), sizeof( AttributeName ),
+               op->o_tmpmemctx );
        if ( *anp == NULL ) {
                return LDAP_NO_MEMORY;
        }
@@ -319,7 +332,22 @@ rwm_map_attrnames(
                }
        }
 
-       if ( j == 0 && i != 0 ) {
+       if ( op->o_bd->be_extra_anlist != NULL ) {
+               /* we assume be_extra_anlist are already mapped */
+               for ( x = 0; !BER_BVISNULL( &op->o_bd->be_extra_anlist[x].an_name ); x++ ) {
+                       BER_BVZERO( &(*anp)[j].an_name );
+                       if ( op->o_bd->be_extra_anlist[x].an_desc &&
+                               ad_inlist( op->o_bd->be_extra_anlist[x].an_desc, *anp ) )
+                       {
+                               continue;
+                       }
+
+                       (*anp)[j] = op->o_bd->be_extra_anlist[x];
+                       j++;
+               }
+       }
+
+       if ( j == 0 && ( i != 0 || x != 0 ) ) {
                memset( &(*anp)[0], 0, sizeof( AttributeName ) );
                (*anp)[0].an_name = *slap_bv_no_attrs;
                j = 1;
@@ -329,6 +357,7 @@ rwm_map_attrnames(
        return LDAP_SUCCESS;
 }
 
+#if 0 /* unused! */
 int
 rwm_map_attrs(
        struct ldapmap  *at_map,
@@ -378,6 +407,7 @@ rwm_map_attrs(
 
        return LDAP_SUCCESS;
 }
+#endif
 
 static int
 map_attr_value(
@@ -386,7 +416,8 @@ map_attr_value(
        struct berval           *mapped_attr,
        struct berval           *value,
        struct berval           *mapped_value,
-       int                     remap )
+       int                     remap,
+       void                    *memctx )
 {
        struct berval           vtmp = BER_BVNULL;
        int                     freeval = 0;
@@ -431,14 +462,16 @@ map_attr_value(
                                return -1;
                        }
 
-               } else if ( ad->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ) {
+               } else if ( ad->ad_type->sat_equality &&
+                       ( ad->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ) )
+               {
                        if ( ad->ad_type->sat_equality->smr_normalize(
                                (SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
-                               NULL, NULL, value, &vtmp, NULL ) )
+                               NULL, NULL, value, &vtmp, memctx ) )
                        {
                                return -1;
                        }
-                       freeval = 1;
+                       freeval = 2;
 
                } else if ( ad == slap_schema.si_ad_objectClass
                                || ad == slap_schema.si_ad_structuralObjectClass )
@@ -452,10 +485,16 @@ map_attr_value(
                        vtmp = *value;
                }
 
-               filter_escape_value( &vtmp, mapped_value );
+               filter_escape_value_x( &vtmp, mapped_value, memctx );
 
-               if ( freeval ) {
+               switch ( freeval ) {
+               case 1:
                        ch_free( vtmp.bv_val );
+                       break;
+
+               case 2:
+                       ber_memfree_x( vtmp.bv_val, memctx );
+                       break;
                }
        }
        
@@ -500,87 +539,90 @@ rwm_int_filter_map_rewrite(
        BER_BVZERO( fstr );
 
        if ( f == NULL ) {
-               ber_dupbv( fstr, &ber_bvnone );
+               ber_dupbv_x( fstr, &ber_bvnone, op->o_tmpmemctx );
                return LDAP_OTHER;
        }
 
+#if 0
+       /* ITS#6814: give the caller a chance to use undefined filters */
        if ( f->f_choice & SLAPD_FILTER_UNDEFINED ) {
                goto computed;
        }
+#endif
 
        switch ( f->f_choice & SLAPD_FILTER_MASK ) {
        case LDAP_FILTER_EQUALITY:
                ad = f->f_av_desc;
                if ( map_attr_value( dc, &ad, &atmp,
-                                       &f->f_av_value, &vtmp, RWM_MAP ) )
+                       &f->f_av_value, &vtmp, RWM_MAP, op->o_tmpmemctx ) )
                {
                        goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len + STRLENOF( "(=)" );
-               fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+               fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
                        atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
 
-               ch_free( vtmp.bv_val );
+               op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                break;
 
        case LDAP_FILTER_GE:
                ad = f->f_av_desc;
                if ( map_attr_value( dc, &ad, &atmp,
-                                       &f->f_av_value, &vtmp, RWM_MAP ) )
+                       &f->f_av_value, &vtmp, RWM_MAP, op->o_tmpmemctx ) )
                {
                        goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len + STRLENOF( "(>=)" );
-               fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+               fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
                        atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
 
-               ch_free( vtmp.bv_val );
+               op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                break;
 
        case LDAP_FILTER_LE:
                ad = f->f_av_desc;
                if ( map_attr_value( dc, &ad, &atmp,
-                                       &f->f_av_value, &vtmp, RWM_MAP ) )
+                       &f->f_av_value, &vtmp, RWM_MAP, op->o_tmpmemctx ) )
                {
                        goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len + STRLENOF( "(<=)" );
-               fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+               fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
                        atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
 
-               ch_free( vtmp.bv_val );
+               op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                break;
 
        case LDAP_FILTER_APPROX:
                ad = f->f_av_desc;
                if ( map_attr_value( dc, &ad, &atmp,
-                                       &f->f_av_value, &vtmp, RWM_MAP ) )
+                       &f->f_av_value, &vtmp, RWM_MAP, op->o_tmpmemctx ) )
                {
                        goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len + STRLENOF( "(~=)" );
-               fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+               fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
                        atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
 
-               ch_free( vtmp.bv_val );
+               op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
                ad = f->f_sub_desc;
                if ( map_attr_value( dc, &ad, &atmp,
-                                       NULL, NULL, RWM_MAP ) )
+                       NULL, NULL, RWM_MAP, op->o_tmpmemctx ) )
                {
                        goto computed;
                }
@@ -588,7 +630,7 @@ rwm_int_filter_map_rewrite(
                /* cannot be a DN ... */
 
                fstr->bv_len = atmp.bv_len + STRLENOF( "(=*)" );
-               fstr->bv_val = ch_malloc( fstr->bv_len + 128 );
+               fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
                        atmp.bv_val );
@@ -596,46 +638,50 @@ rwm_int_filter_map_rewrite(
                if ( !BER_BVISNULL( &f->f_sub_initial ) ) {
                        len = fstr->bv_len;
 
-                       filter_escape_value( &f->f_sub_initial, &vtmp );
+                       filter_escape_value_x( &f->f_sub_initial, &vtmp, op->o_tmpmemctx );
 
                        fstr->bv_len += vtmp.bv_len;
-                       fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+                       fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
+                               op->o_tmpmemctx );
 
                        snprintf( &fstr->bv_val[len - 2], vtmp.bv_len + 3,
                                /* "(attr=" */ "%s*)",
                                vtmp.bv_len ? vtmp.bv_val : "" );
 
-                       ch_free( vtmp.bv_val );
+                       op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                }
 
                if ( f->f_sub_any != NULL ) {
                        for ( i = 0; !BER_BVISNULL( &f->f_sub_any[i] ); i++ ) {
                                len = fstr->bv_len;
-                               filter_escape_value( &f->f_sub_any[i], &vtmp );
+                               filter_escape_value_x( &f->f_sub_any[i], &vtmp,
+                                       op->o_tmpmemctx );
 
                                fstr->bv_len += vtmp.bv_len + 1;
-                               fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+                               fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
+                                       op->o_tmpmemctx );
 
                                snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3,
                                        /* "(attr=[init]*[any*]" */ "%s*)",
                                        vtmp.bv_len ? vtmp.bv_val : "" );
-                               ch_free( vtmp.bv_val );
+                               op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                        }
                }
 
                if ( !BER_BVISNULL( &f->f_sub_final ) ) {
                        len = fstr->bv_len;
 
-                       filter_escape_value( &f->f_sub_final, &vtmp );
+                       filter_escape_value_x( &f->f_sub_final, &vtmp, op->o_tmpmemctx );
 
                        fstr->bv_len += vtmp.bv_len;
-                       fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+                       fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
+                               op->o_tmpmemctx );
 
                        snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3,
                                /* "(attr=[init*][any*]" */ "%s)",
                                vtmp.bv_len ? vtmp.bv_val : "" );
 
-                       ch_free( vtmp.bv_val );
+                       op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                }
 
                break;
@@ -643,13 +689,13 @@ rwm_int_filter_map_rewrite(
        case LDAP_FILTER_PRESENT:
                ad = f->f_desc;
                if ( map_attr_value( dc, &ad, &atmp,
-                                       NULL, NULL, RWM_MAP ) )
+                       NULL, NULL, RWM_MAP, op->o_tmpmemctx ) )
                {
                        goto computed;
                }
 
                fstr->bv_len = atmp.bv_len + STRLENOF( "(=*)" );
-               fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+               fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
                        atmp.bv_val );
@@ -659,7 +705,7 @@ rwm_int_filter_map_rewrite(
        case LDAP_FILTER_OR:
        case LDAP_FILTER_NOT:
                fstr->bv_len = STRLENOF( "(%)" );
-               fstr->bv_val = ch_malloc( fstr->bv_len + 128 );
+               fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%c)",
                        f->f_choice == LDAP_FILTER_AND ? '&' :
@@ -676,12 +722,13 @@ rwm_int_filter_map_rewrite(
                        }
                        
                        fstr->bv_len += vtmp.bv_len;
-                       fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+                       fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
+                               op->o_tmpmemctx );
 
                        snprintf( &fstr->bv_val[len-1], vtmp.bv_len + 2, 
                                /*"("*/ "%s)", vtmp.bv_len ? vtmp.bv_val : "" );
 
-                       ch_free( vtmp.bv_val );
+                       op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                }
 
                break;
@@ -690,14 +737,14 @@ rwm_int_filter_map_rewrite(
                if ( f->f_mr_desc ) {
                        ad = f->f_mr_desc;
                        if ( map_attr_value( dc, &ad, &atmp,
-                                               &f->f_mr_value, &vtmp, RWM_MAP ) )
+                               &f->f_mr_value, &vtmp, RWM_MAP, op->o_tmpmemctx ) )
                        {
                                goto computed;
                        }
 
                } else {
                        BER_BVSTR( &atmp, "" );
-                       filter_escape_value( &f->f_mr_value, &vtmp );
+                       filter_escape_value_x( &f->f_mr_value, &vtmp, op->o_tmpmemctx );
                }
                        
 
@@ -705,7 +752,7 @@ rwm_int_filter_map_rewrite(
                        ( f->f_mr_dnattrs ? STRLENOF( ":dn" ) : 0 ) +
                        ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len + 1 : 0 ) +
                        vtmp.bv_len + STRLENOF( "(:=)" );
-               fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+               fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
                        atmp.bv_val,
@@ -713,7 +760,7 @@ rwm_int_filter_map_rewrite(
                        !BER_BVISEMPTY( &f->f_mr_rule_text ) ? ":" : "",
                        !BER_BVISEMPTY( &f->f_mr_rule_text ) ? f->f_mr_rule_text.bv_val : "",
                        vtmp.bv_len ? vtmp.bv_val : "" );
-               ch_free( vtmp.bv_val );
+               op->o_tmpfree( vtmp.bv_val, op->o_tmpmemctx );
                break;
        }
 
@@ -749,11 +796,11 @@ computed:;
                        break;
                }
 
-               ber_dupbv( fstr, tmp );
+               ber_dupbv_x( fstr, tmp, op->o_tmpmemctx );
                break;
                
        default:
-               ber_dupbv( fstr, &ber_bvunknown );
+               ber_dupbv_x( fstr, &ber_bvunknown, op->o_tmpmemctx );
                break;
        }
 
@@ -789,9 +836,6 @@ rwm_filter_map_rewrite(
        case REWRITE_REGEXEC_OK:
                if ( !BER_BVISNULL( fstr ) ) {
                        fstr->bv_len = strlen( fstr->bv_val );
-                       if ( fstr->bv_val != ftmp.bv_val ) {
-                               ch_free( ftmp.bv_val );
-                       }
 
                } else {
                        *fstr = ftmp;
@@ -800,6 +844,11 @@ rwm_filter_map_rewrite(
                Debug( LDAP_DEBUG_ARGS,
                        "[rw] %s: \"%s\" -> \"%s\"\n",
                        fdc.ctx, ftmp.bv_val, fstr->bv_val );           
+               if ( fstr->bv_val != ftmp.bv_val ) {
+                       ber_bvreplace_x( &ftmp, fstr, op->o_tmpmemctx );
+                       ch_free( fstr->bv_val );
+                       *fstr = ftmp;
+               }
                rc = LDAP_SUCCESS;
                break;
                
@@ -808,6 +857,7 @@ rwm_filter_map_rewrite(
                        fdc.rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
                        fdc.rs->sr_text = "Operation not allowed";
                }
+               op->o_tmpfree( ftmp.bv_val, op->o_tmpmemctx );
                rc = LDAP_UNWILLING_TO_PERFORM;
                break;
                
@@ -816,6 +866,7 @@ rwm_filter_map_rewrite(
                        fdc.rs->sr_err = LDAP_OTHER;
                        fdc.rs->sr_text = "Rewrite error";
                }
+               op->o_tmpfree( ftmp.bv_val, op->o_tmpmemctx );
                rc = LDAP_OTHER;
                break;
        }
@@ -941,7 +992,7 @@ rwm_referral_rewrite(
                                }
 
                                ber_str2bv( newurl, 0, 1, &a_vals[i] );
-                               LDAP_FREE( newurl );
+                               ber_memfree( newurl );
 
                                if ( pa_nvals ) {
                                        ludp->lud_dn = ndn.bv_val;
@@ -961,7 +1012,7 @@ rwm_referral_rewrite(
                                                ch_free( (*pa_nvals)[i].bv_val );
                                        }
                                        ber_str2bv( newurl, 0, 1, &(*pa_nvals)[i] );
-                                       LDAP_FREE( newurl );
+                                       ber_memfree( newurl );
                                }
 
                                ch_free( oldval.bv_val );
@@ -1172,7 +1223,7 @@ rwm_referral_result_rewrite(
 
                                ch_free( a_vals[i].bv_val );
                                ber_str2bv( newurl, 0, 1, &a_vals[i] );
-                               LDAP_FREE( newurl );
+                               ber_memfree( newurl );
                                ludp->lud_dn = olddn.bv_val;
                        }
                        break;