]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldap/map.c
backport fix to ITS#3785: do our best to deal with invalid filters...
[openldap] / servers / slapd / back-ldap / map.c
index b08ca5539e77956c4f96574471529752fe151b65..0471ad9d363cc37d652fcdc1b332d79b7c695787 100644 (file)
@@ -1,37 +1,24 @@
 /* map.c - ldap backend mapping routines */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* This is an altered version */
-/*
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * Portions Copyright 2000-2003 Pierangelo Masarati.
+ * 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.
  *
- * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- * 
- * This software is being modified by Pierangelo Masarati.
- * The previously reported conditions apply to the modified code as well.
- * Changes in the original code are highlighted where required.
- * Credits for the original code go to the author, Howard Chu.
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.h"
@@ -44,6 +31,9 @@
 #include "slap.h"
 #include "back-ldap.h"
 
+#undef ldap_debug      /* silence a warning in ldap-int.h */
+#include "../../../libraries/libldap/ldap-int.h"
+
 int
 mapping_cmp ( const void *c1, const void *c2 )
 {
@@ -90,32 +80,48 @@ ldap_back_map_init ( struct ldapmap *lm, struct ldapmapping **m )
        *m = mapping;
 }
 
-void
-ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *bv,
+int
+ldap_back_mapping ( struct ldapmap *map, struct berval *s, struct ldapmapping **m,
        int remap )
 {
        Avlnode *tree;
-       struct ldapmapping *mapping, fmapping;
+       struct ldapmapping fmapping;
+
+       assert( m );
 
-       if (remap == BACKLDAP_REMAP)
+       if ( remap == BACKLDAP_REMAP ) {
                tree = map->remap;
-       else
+       } else {
                tree = map->map;
+       }
 
-       bv->bv_len = 0;
-       bv->bv_val = NULL;
        fmapping.src = *s;
-       mapping = (struct ldapmapping *)avl_find( tree, (caddr_t)&fmapping, mapping_cmp );
-       if (mapping != NULL) {
-               if ( mapping->dst.bv_val )
+       *m = (struct ldapmapping *)avl_find( tree, (caddr_t)&fmapping, mapping_cmp );
+       if ( *m == NULL ) {
+               return map->drop_missing;
+       }
+
+       return 0;
+}
+
+void
+ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *bv,
+       int remap )
+{
+       struct ldapmapping *mapping;
+
+       BER_BVZERO( bv );
+       ( void )ldap_back_mapping( map, s, &mapping, remap );
+       if ( mapping != NULL ) {
+               if ( !BER_BVISNULL( &mapping->dst ) ) {
                        *bv = mapping->dst;
+               }
                return;
        }
 
-       if (!map->drop_missing)
+       if ( !map->drop_missing ) {
                *bv = *s;
-
-       return;
+       }
 }
 
 int
@@ -182,27 +188,27 @@ map_attr_value(
        }
 
        if ( value == NULL ) {
-               return 0;
+               return LDAP_SUCCESS;
        }
 
-       if ( strcmp( ad->ad_type->sat_syntax->ssyn_oid, SLAPD_DN_SYNTAX ) == 0 )
+       if ( ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName )
        {
                dncookie fdc = *dc;
 
-               fdc.ctx = "searchFilter";
+#ifdef ENABLE_REWRITE
+               fdc.ctx = "searchFilterAttrDN";
+#endif
 
                switch ( ldap_back_dn_massage( &fdc, value, &vtmp ) ) {
-               case REWRITE_REGEXEC_OK:
+               case LDAP_SUCCESS:
                        if ( vtmp.bv_val != value->bv_val ) {
                                freeval = 1;
                        }
                        break;
                
-               case REWRITE_REGEXEC_UNWILLING:
-                       return -1;
-
-               case REWRITE_REGEXEC_ERR:
-                       return -1;
+               case LDAP_UNWILLING_TO_PERFORM:
+               case LDAP_OTHER:
+                       return LDAP_OTHER;
                }
 
        } else if ( ad == slap_schema.si_ad_objectClass || ad == slap_schema.si_ad_structuralObjectClass ) {
@@ -221,33 +227,33 @@ map_attr_value(
                ber_memfree( vtmp.bv_val );
        }
        
-       return 0;
+       return LDAP_SUCCESS;
 }
 
-int
-ldap_back_filter_map_rewrite(
+static int
+ldap_int_back_filter_map_rewrite(
                dncookie                *dc,
                Filter                  *f,
                struct berval           *fstr,
                int                     remap )
 {
-       int             i;
+       int             i, rc;
        Filter          *p;
        struct berval   atmp;
        struct berval   vtmp;
        ber_len_t       len;
 
        if ( f == NULL ) {
-               ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr );
-               return -1;
+               ber_str2bv( "(?=error)", sizeof("(?=error)")-1, 1, fstr );
+               return LDAP_OTHER;
        }
 
        switch ( f->f_choice ) {
        case LDAP_FILTER_EQUALITY:
-               if ( map_attr_value( dc, f->f_av_desc, &atmp,
-                                       &f->f_av_value, &vtmp, remap ) )
-               {
-                       return -1;
+               rc = map_attr_value( dc, f->f_av_desc, &atmp,
+                                       &f->f_av_value, &vtmp, remap );
+               if ( rc ) {
+                       return rc;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len
@@ -261,10 +267,10 @@ ldap_back_filter_map_rewrite(
                break;
 
        case LDAP_FILTER_GE:
-               if ( map_attr_value( dc, f->f_av_desc, &atmp,
-                                       &f->f_av_value, &vtmp, remap ) )
-               {
-                       return -1;
+               rc = map_attr_value( dc, f->f_av_desc, &atmp,
+                                       &f->f_av_value, &vtmp, remap );
+               if ( rc ) {
+                       return rc;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len
@@ -278,10 +284,10 @@ ldap_back_filter_map_rewrite(
                break;
 
        case LDAP_FILTER_LE:
-               if ( map_attr_value( dc, f->f_av_desc, &atmp,
-                                       &f->f_av_value, &vtmp, remap ) )
-               {
-                       return -1;
+               rc = map_attr_value( dc, f->f_av_desc, &atmp,
+                                       &f->f_av_value, &vtmp, remap );
+               if ( rc ) {
+                       return rc;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len
@@ -295,10 +301,10 @@ ldap_back_filter_map_rewrite(
                break;
 
        case LDAP_FILTER_APPROX:
-               if ( map_attr_value( dc, f->f_av_desc, &atmp,
-                                       &f->f_av_value, &vtmp, remap ) )
-               {
-                       return -1;
+               rc = map_attr_value( dc, f->f_av_desc, &atmp,
+                                       &f->f_av_value, &vtmp, remap );
+               if ( rc ) {
+                       return rc;
                }
 
                fstr->bv_len = atmp.bv_len + vtmp.bv_len
@@ -312,10 +318,10 @@ ldap_back_filter_map_rewrite(
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
-               if ( map_attr_value( dc, f->f_sub_desc, &atmp,
-                                       NULL, NULL, remap ) )
-               {
-                       return -1;
+               rc = map_attr_value( dc, f->f_sub_desc, &atmp,
+                                       NULL, NULL, remap );
+               if ( rc ) {
+                       return rc;
                }
 
                /* cannot be a DN ... */
@@ -374,10 +380,10 @@ ldap_back_filter_map_rewrite(
                break;
 
        case LDAP_FILTER_PRESENT:
-               if ( map_attr_value( dc, f->f_desc, &atmp,
-                                       NULL, NULL, remap ) )
-               {
-                       return -1;
+               rc = map_attr_value( dc, f->f_desc, &atmp,
+                                       NULL, NULL, remap );
+               if ( rc ) {
+                       return rc;
                }
 
                fstr->bv_len = atmp.bv_len + ( sizeof("(=*)") - 1 );
@@ -400,9 +406,9 @@ ldap_back_filter_map_rewrite(
                for ( p = f->f_list; p != NULL; p = p->f_next ) {
                        len = fstr->bv_len;
 
-                       if ( ldap_back_filter_map_rewrite( dc, p, &vtmp, remap ) )
-                       {
-                               return -1;
+                       rc = ldap_int_back_filter_map_rewrite( dc, p, &vtmp, remap );
+                       if ( rc != LDAP_SUCCESS ) {
+                               return rc;
                        }
                        
                        fstr->bv_len += vtmp.bv_len;
@@ -418,10 +424,10 @@ ldap_back_filter_map_rewrite(
 
        case LDAP_FILTER_EXT: {
                if ( f->f_mr_desc ) {
-                       if ( map_attr_value( dc, f->f_mr_desc, &atmp,
-                                               &f->f_mr_value, &vtmp, remap ) )
-                       {
-                               return -1;
+                       rc = map_attr_value( dc, f->f_mr_desc, &atmp,
+                                               &f->f_mr_value, &vtmp, remap );
+                       if ( rc ) {
+                               return rc;
                        }
 
                } else {
@@ -447,24 +453,199 @@ ldap_back_filter_map_rewrite(
                ber_memfree( vtmp.bv_val );
                } break;
 
-       case SLAPD_FILTER_COMPUTED:
-               ber_str2bv(
-                       f->f_result == LDAP_COMPARE_FALSE ? "(?=false)" :
-                       f->f_result == LDAP_COMPARE_TRUE ? "(?=true)" :
-                       f->f_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" :
-                       "(?=error)",
-                       f->f_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 :
-                       f->f_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
-                       f->f_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :
-                       sizeof("(?=error)")-1,
-                       1, fstr );
-               break;
+       case SLAPD_FILTER_COMPUTED: {
+               struct berval   bv;
+
+               switch ( f->f_result ) {
+               default:
+                       ber_str2bv( "(?=error)", sizeof("(?=error)") - 1,
+                                       1, fstr );
+                       return LDAP_COMPARE_FALSE;
+                       
+               case LDAP_COMPARE_FALSE:
+               case SLAPD_COMPARE_UNDEFINED:
+                       BER_BVSTR( &bv, "(!(objectClass=*))" );
+                       break;
+
+               case LDAP_COMPARE_TRUE:
+                       BER_BVSTR( &bv, "(objectClass=*)" );
+                       break;
+               }
+                       
+               ber_dupbv( fstr, &bv );
+               } return LDAP_SUCCESS;
 
        default:
                ber_str2bv( "(?=unknown)", sizeof("(?=unknown)")-1, 1, fstr );
+               return LDAP_COMPARE_FALSE;
+       }
+
+       return LDAP_SUCCESS;
+}
+
+int
+ldap_back_filter_map_rewrite(
+               dncookie                *dc,
+               Filter                  *f,
+               struct berval           *fstr,
+               int                     remap )
+{
+       int             rc;
+       dncookie        fdc;
+       struct berval   ftmp;
+
+       rc = ldap_int_back_filter_map_rewrite( dc, f, fstr, remap );
+
+#ifdef ENABLE_REWRITE
+       if ( rc != LDAP_SUCCESS ) {
+               return rc;
+       }
+
+       fdc = *dc;
+       ftmp = *fstr;
+
+       fdc.ctx = "searchFilter";
+
+       switch ( rewrite_session( fdc.rwmap->rwm_rw, fdc.ctx, 
+                               ( ftmp.bv_len ? ftmp.bv_val : "" ), 
+                               fdc.conn, &fstr->bv_val )) {
+       case REWRITE_REGEXEC_OK:
+               if ( fstr->bv_val != NULL ) {
+                       fstr->bv_len = strlen( fstr->bv_val );
+                       free( ftmp.bv_val );
+               } else {
+                       *fstr = ftmp;
+               }
+
+#ifdef NEW_LOGGING
+               LDAP_LOG( BACK_LDAP, DETAIL1, 
+                       "[rw] %s: \"%s\" -> \"%s\"\n",
+                       dc->ctx,
+                       BER_BVISNULL( &ftmp ) ? "" : ftmp.bv_val,
+                       BER_BVISNULL( fstr ) ? "" : fstr->bv_val );             
+#else /* !NEW_LOGGING */
+               Debug( LDAP_DEBUG_ARGS,
+                       "[rw] %s: \"%s\" -> \"%s\"\n",
+                       dc->ctx,
+                       BER_BVISNULL( &ftmp ) ? "" : ftmp.bv_val,
+                       BER_BVISNULL( fstr ) ? "" : fstr->bv_val );             
+#endif /* !NEW_LOGGING */
+               rc = LDAP_SUCCESS;
+               break;
+               
+       case REWRITE_REGEXEC_UNWILLING:
+               if ( fdc.rs ) {
+                       fdc.rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+                       fdc.rs->sr_text = "Operation not allowed";
+               }
+               rc = LDAP_UNWILLING_TO_PERFORM;
+               break;
+               
+       case REWRITE_REGEXEC_ERR:
+               if ( fdc.rs ) {
+                       fdc.rs->sr_err = LDAP_OTHER;
+                       fdc.rs->sr_text = "Rewrite error";
+               }
+               rc = LDAP_OTHER;
                break;
        }
 
+#endif /* ENABLE_REWRITE */
+       return rc;
+}
+
+/*
+ * I don't like this much, but we need two different
+ * functions because different heap managers may be
+ * in use in back-ldap/meta to reduce the amount of
+ * calls to malloc routines, and some of the free()
+ * routines may be macros with args
+ */
+int
+ldap_dnattr_rewrite(
+       dncookie                *dc,
+       BerVarray               a_vals
+)
+{
+       struct berval   bv;
+       int             i, last;
+
+       assert( a_vals != NULL );
+
+       for ( last = 0; a_vals[last].bv_val != NULL; last++ );
+       last--;
+
+       for ( i = 0; a_vals[i].bv_val != NULL; i++ ) {
+               switch ( ldap_back_dn_massage( dc, &a_vals[i], &bv ) ) {
+               case LDAP_UNWILLING_TO_PERFORM:
+                       /*
+                        * FIXME: need to check if it may be considered 
+                        * legal to trim values when adding/modifying;
+                        * it should be when searching (e.g. ACLs).
+                        */
+                       ch_free( a_vals[i].bv_val );
+                       if (last > i ) {
+                               a_vals[i] = a_vals[last];
+                       }
+                       a_vals[last].bv_len = 0;
+                       a_vals[last].bv_val = NULL;
+                       last--;
+                       break;
+
+               default:
+                       /* leave attr untouched if massage failed */
+                       if ( bv.bv_val && bv.bv_val != a_vals[i].bv_val ) {
+                               ch_free( a_vals[i].bv_val );
+                               a_vals[i] = bv;
+                       }
+                       break;
+               }
+       }
+       
+       return 0;
+}
+
+int
+ldap_dnattr_result_rewrite(
+       dncookie                *dc,
+       BerVarray               a_vals
+)
+{
+       struct berval   bv;
+       int             i, last;
+
+       assert( a_vals != NULL );
+
+       for ( last = 0; a_vals[last].bv_val; last++ );
+       last--;
+
+       for ( i = 0; a_vals[i].bv_val; i++ ) {
+               switch ( ldap_back_dn_massage( dc, &a_vals[i], &bv ) ) {
+               case LDAP_UNWILLING_TO_PERFORM:
+                       /*
+                        * FIXME: need to check if it may be considered 
+                        * legal to trim values when adding/modifying;
+                        * it should be when searching (e.g. ACLs).
+                        */
+                       LBER_FREE( a_vals[i].bv_val );
+                       if ( last > i ) {
+                               a_vals[i] = a_vals[last];
+                       }
+                       a_vals[last].bv_val = NULL;
+                       a_vals[last].bv_len = 0;
+                       last--;
+                       break;
+
+               default:
+                       /* leave attr untouched if massage failed */
+                       if ( bv.bv_val && a_vals[i].bv_val != bv.bv_val ) {
+                               LBER_FREE( a_vals[i].bv_val );
+                               a_vals[i] = bv;
+                       }
+                       break;
+               }
+       }
+
        return 0;
 }