]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/limits.c
ITS#3056 partial fix - from a slurpd perspective, the updatedn
[openldap] / servers / slapd / limits.c
index 5a32b6508b6f5e659cd7dac8473163e9400b1037..291824ac95f282c99a919ea0962f0142ae7a025b 100644 (file)
@@ -1,7 +1,17 @@
 /* limits.c - routines to handle regex-based size and time limits */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 #include "slap.h"
 
 int
-get_limits
-       Backend                 *be, 
+limits_get
+       Operation               *op,
        struct berval           *ndn, 
        struct slap_limits_set  **limit
 )
 {
        struct slap_limits **lm;
 
-       assert( be );
+       assert( op );
        assert( limit );
 
        /*
         * default values
         */
-       *limit = &be->be_def_limit;
+       *limit = &op->o_bd->be_def_limit;
 
-       if ( be->be_limits == NULL ) {
+       if ( op->o_bd->be_limits == NULL ) {
                return( 0 );
        }
 
-       for ( lm = be->be_limits; lm[0] != NULL; lm++ ) {
-               switch ( lm[0]->lm_type ) {
+       for ( lm = op->o_bd->be_limits; lm[0] != NULL; lm++ ) {
+               unsigned        style = lm[0]->lm_flags & SLAP_LIMITS_MASK;
+               unsigned        type = lm[0]->lm_flags & SLAP_LIMITS_TYPE_MASK;
+
+               switch ( style ) {
                case SLAP_LIMITS_EXACT:
                        if ( ndn->bv_len == 0 ) {
                                break;
                        }
-                       if ( dn_match( &lm[0]->lm_dn_pat, ndn ) ) {
+
+                       if ( type == SLAP_LIMITS_TYPE_GROUP ) {
+                               int     rc;
+
+                               rc = backend_group( op, NULL,
+                                               &lm[0]->lm_pat, ndn,
+                                               lm[0]->lm_group_oc,
+                                               lm[0]->lm_group_ad );
+                               if ( rc == 0 ) {
+                                       *limit = &lm[0]->lm_limits;
+                                       return( 0 );
+                               }
+                       }
+                       
+                       if ( dn_match( &lm[0]->lm_pat, ndn ) ) {
                                *limit = &lm[0]->lm_limits;
                                return( 0 );
                        }
@@ -56,14 +83,14 @@ get_limits(
                        }
 
                        /* ndn shorter than dn_pat */
-                       if ( ndn->bv_len < lm[0]->lm_dn_pat.bv_len ) {
+                       if ( ndn->bv_len < lm[0]->lm_pat.bv_len ) {
                                break;
                        }
-                       d = ndn->bv_len - lm[0]->lm_dn_pat.bv_len;
+                       d = ndn->bv_len - lm[0]->lm_pat.bv_len;
 
                        /* allow exact match for SUBTREE only */
                        if ( d == 0 ) {
-                               if ( lm[0]->lm_type != SLAP_LIMITS_SUBTREE ) {
+                               if ( style != SLAP_LIMITS_SUBTREE ) {
                                        break;
                                }
                        } else {
@@ -74,15 +101,19 @@ get_limits(
                        }
 
                        /* in case of (sub)match ... */
-                       if ( lm[0]->lm_dn_pat.bv_len == ( ndn->bv_len - d )
-                                       && strcmp( lm[0]->lm_dn_pat.bv_val, &ndn->bv_val[d] ) == 0 ) {
+                       if ( lm[0]->lm_pat.bv_len == ( ndn->bv_len - d )
+                                       && strcmp( lm[0]->lm_pat.bv_val,
+                                               &ndn->bv_val[d] ) == 0 )
+                       {
                                /* check for exactly one rdn in case of ONE */
-                               if ( lm[0]->lm_type == SLAP_LIMITS_ONE ) {
+                               if ( style == SLAP_LIMITS_ONE ) {
                                        /*
                                         * if ndn is more that one rdn
                                         * below dn_pat, continue
                                         */
-                                       if ( (size_t) dn_rdnlen( NULL, ndn ) != d - 1 ) {
+                                       if ( (size_t) dn_rdnlen( NULL, ndn )
+                                                       != d - 1 )
+                                       {
                                                break;
                                        }
                                }
@@ -98,8 +129,8 @@ get_limits(
                        if ( ndn->bv_len == 0 ) {
                                break;
                        }
-                       if ( regexec( &lm[0]->lm_dn_regex, ndn->bv_val, 0, NULL, 0 )
-                               == 0 )
+                       if ( regexec( &lm[0]->lm_regex, ndn->bv_val,
+                                               0, NULL, 0 ) == 0 )
                        {
                                *limit = &lm[0]->lm_limits;
                                return( 0 );
@@ -134,25 +165,31 @@ get_limits(
 }
 
 static int
-add_limits(
+limits_add(
        Backend                 *be,
-       int                     type,
+       unsigned                flags,
        const char              *pattern,
+       ObjectClass             *group_oc,
+       AttributeDescription    *group_ad,
        struct slap_limits_set  *limit
 )
 {
        int                     i;
        struct slap_limits      *lm;
+       unsigned                type, style;
        
        assert( be );
        assert( limit );
 
-       switch ( type ) {
+       type = flags & SLAP_LIMITS_TYPE_MASK;
+       style = flags & SLAP_LIMITS_MASK;
+
+       switch ( style ) {
        case SLAP_LIMITS_ANONYMOUS:
        case SLAP_LIMITS_USERS:
        case SLAP_LIMITS_ANY:
                for ( i = 0; be->be_limits && be->be_limits[ i ]; i++ ) {
-                       if ( be->be_limits[ i ]->lm_type == type ) {
+                       if ( be->be_limits[ i ]->lm_flags == style ) {
                                return( -1 );
                        }
                }
@@ -162,19 +199,22 @@ add_limits(
 
        lm = ( struct slap_limits * )ch_calloc( sizeof( struct slap_limits ), 1 );
 
-       switch ( type ) {
+       switch ( style ) {
+       case SLAP_LIMITS_UNDEFINED:
+               style = SLAP_LIMITS_EXACT;
+               /* continue to next cases */
        case SLAP_LIMITS_EXACT:
        case SLAP_LIMITS_ONE:
        case SLAP_LIMITS_SUBTREE:
        case SLAP_LIMITS_CHILDREN:
-               lm->lm_type = type;
+               lm->lm_flags = style | type;
                {
                        int rc;
                        struct berval bv;
                        bv.bv_val = (char *) pattern;
                        bv.bv_len = strlen( pattern );
 
-                       rc = dnNormalize2( NULL, &bv, &lm->lm_dn_pat, NULL );
+                       rc = dnNormalize( 0, NULL, NULL, &bv, &lm->lm_pat, NULL );
                        if ( rc != LDAP_SUCCESS ) {
                                ch_free( lm );
                                return( -1 );
@@ -183,12 +223,11 @@ add_limits(
                break;
                
        case SLAP_LIMITS_REGEX:
-       case SLAP_LIMITS_UNDEFINED:
-               lm->lm_type = SLAP_LIMITS_REGEX;
-               ber_str2bv( pattern, 0, 1, &lm->lm_dn_pat );
-               if ( regcomp( &lm->lm_dn_regex, lm->lm_dn_pat.bv_val, 
+               lm->lm_flags = style | type;
+               ber_str2bv( pattern, 0, 1, &lm->lm_pat );
+               if ( regcomp( &lm->lm_regex, lm->lm_pat.bv_val, 
                                        REG_EXTENDED | REG_ICASE ) ) {
-                       free( lm->lm_dn_pat.bv_val );
+                       free( lm->lm_pat.bv_val );
                        ch_free( lm );
                        return( -1 );
                }
@@ -197,9 +236,18 @@ add_limits(
        case SLAP_LIMITS_ANONYMOUS:
        case SLAP_LIMITS_USERS:
        case SLAP_LIMITS_ANY:
-               lm->lm_type = type;
-               lm->lm_dn_pat.bv_val = NULL;
-               lm->lm_dn_pat.bv_len = 0;
+               lm->lm_flags = style | type;
+               lm->lm_pat.bv_val = NULL;
+               lm->lm_pat.bv_len = 0;
+               break;
+       }
+
+       switch ( type ) {
+       case SLAP_LIMITS_TYPE_GROUP:
+               assert( group_oc );
+               assert( group_ad );
+               lm->lm_group_oc = group_oc;
+               lm->lm_group_ad = group_ad;
                break;
        }
 
@@ -219,7 +267,7 @@ add_limits(
 }
 
 int
-parse_limits(
+limits_parse(
        Backend     *be,
        const char  *fname,
        int         lineno,
@@ -227,10 +275,12 @@ parse_limits(
        char        **argv
 )
 {
-       int     type = SLAP_LIMITS_UNDEFINED;
-       char    *pattern;
-       struct slap_limits_set limit;
-       int     i, rc = 0;
+       int                     flags = SLAP_LIMITS_UNDEFINED;
+       char                    *pattern;
+       struct slap_limits_set  limit;
+       int                     i, rc = 0;
+       ObjectClass             *group_oc = NULL;
+       AttributeDescription    *group_ad = NULL;
 
        assert( be );
 
@@ -260,18 +310,19 @@ parse_limits(
         * 
         * "anonymous"
         * "users"
-        * [ "dn" [ "." { "exact" | "base" | "one" | "sub" | children" 
+        * [ "dn" [ "." { "exact" | "base" | "onelevel" | "subtree" | children"
         *      | "regex" | "anonymous" } ] "=" ] <dn pattern>
         *
         * Note:
         *      "exact" and "base" are the same (exact match);
-        *      "one" means exactly one rdn below, NOT including the pattern
-        *      "sub" means any rdn below, including the pattern
-        *      "children" means any rdn below, NOT including the pattern
+        *      "onelevel" means exactly one rdn below, NOT including pattern
+        *      "subtree" means any rdn below, including pattern
+        *      "children" means any rdn below, NOT including pattern
         *      
         *      "anonymous" may be deprecated in favour 
         *      of the pattern = "anonymous" form
         *
+        * "group[/objectClass[/attributeType]]" "=" "<dn pattern>"
         *
         * <limit>:
         *
@@ -282,54 +333,86 @@ parse_limits(
        
        pattern = argv[1];
        if ( strcmp( pattern, "*" ) == 0) {
-               type = SLAP_LIMITS_ANY;
+               flags = SLAP_LIMITS_ANY;
 
        } else if ( strcasecmp( pattern, "anonymous" ) == 0 ) {
-               type = SLAP_LIMITS_ANONYMOUS;
+               flags = SLAP_LIMITS_ANONYMOUS;
 
        } else if ( strcasecmp( pattern, "users" ) == 0 ) {
-               type = SLAP_LIMITS_USERS;
+               flags = SLAP_LIMITS_USERS;
                
-       } else if ( strncasecmp( pattern, "dn", sizeof( "dn") - 1 ) == 0 ) {
-               pattern += 2;
+       } else if ( strncasecmp( pattern, "dn", sizeof( "dn" ) - 1 ) == 0 ) {
+               pattern += sizeof( "dn" ) - 1;
                if ( pattern[0] == '.' ) {
                        pattern++;
                        if ( strncasecmp( pattern, "exact", sizeof( "exact" ) - 1 ) == 0 ) {
-                               type = SLAP_LIMITS_EXACT;
-                               pattern += 5;
+                               flags = SLAP_LIMITS_EXACT;
+                               pattern += sizeof( "exact" ) - 1;
 
-                       } else if ( strncasecmp( pattern, "base", sizeof( "base " ) - 1 ) == 0 ) {
-                               type = SLAP_LIMITS_BASE;
-                               pattern += 4;
+                       } else if ( strncasecmp( pattern, "base", sizeof( "base" ) - 1 ) == 0 ) {
+                               flags = SLAP_LIMITS_BASE;
+                               pattern += sizeof( "base" ) - 1;
 
                        } else if ( strncasecmp( pattern, "one", sizeof( "one" ) - 1 ) == 0 ) {
-                               type = SLAP_LIMITS_ONE;
-                               pattern += 3;
+                               flags = SLAP_LIMITS_ONE;
+                               pattern += sizeof( "one" ) - 1;
+                               if ( strncasecmp( pattern, "level", sizeof( "level" ) - 1 ) == 0 ) {
+                                       pattern += sizeof( "level" ) - 1;
+
+                               } else {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG( CONFIG, WARNING , 
+                                               "%s : line %d: deprecated \"one\" style "
+                                               "\"limits <pattern> <limits>\" line; "
+                                               "use \"onelevel\" instead.\n", fname, lineno, 0 );
+#else
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "%s : line %d: deprecated \"one\" style "
+                                               "\"limits <pattern> <limits>\" line; "
+                                               "use \"onelevel\" instead.\n", fname, lineno, 0 );
+#endif
+                               }
 
-                       } else if ( strncasecmp( pattern, "subtree", sizeof( "subtree" ) - 1 ) == 0 ) {
-                               type = SLAP_LIMITS_SUBTREE;
-                               pattern += 7;
+                       } else if ( strncasecmp( pattern, "sub", sizeof( "sub" ) - 1 ) == 0 ) {
+                               flags = SLAP_LIMITS_SUBTREE;
+                               pattern += sizeof( "sub" ) - 1;
+                               if ( strncasecmp( pattern, "tree", sizeof( "tree" ) - 1 ) == 0 ) {
+                                       pattern += sizeof( "tree" ) - 1;
+
+                               } else {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG( CONFIG, WARNING , 
+                                               "%s : line %d: deprecated \"sub\" style "
+                                               "\"limits <pattern> <limits>\" line; "
+                                               "use \"subtree\" instead.\n", fname, lineno, 0 );
+#else
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "%s : line %d: deprecated \"sub\" style "
+                                               "\"limits <pattern> <limits>\" line; "
+                                               "use \"subtree\" instead.\n", fname, lineno, 0 );
+#endif
+                               }
 
                        } else if ( strncasecmp( pattern, "children", sizeof( "children" ) - 1 ) == 0 ) {
-                               type = SLAP_LIMITS_CHILDREN;
-                               pattern += 8;
+                               flags = SLAP_LIMITS_CHILDREN;
+                               pattern += sizeof( "children" ) - 1;
 
                        } else if ( strncasecmp( pattern, "regex", sizeof( "regex" ) - 1 ) == 0 ) {
-                               type = SLAP_LIMITS_REGEX;
-                               pattern += 5;
+                               flags = SLAP_LIMITS_REGEX;
+                               pattern += sizeof( "regex" ) - 1;
 
                        /* 
                         * this could be deprecated in favour
                         * of the pattern = "anonymous" form
                         */
                        } else if ( strncasecmp( pattern, "anonymous", sizeof( "anonymous" ) - 1 ) == 0 ) {
-                               type = SLAP_LIMITS_ANONYMOUS;
+                               flags = SLAP_LIMITS_ANONYMOUS;
                                pattern = NULL;
                        }
                }
 
                /* pre-check the data */
-               switch ( type ) {
+               switch ( flags ) {
                case SLAP_LIMITS_ANONYMOUS:
                case SLAP_LIMITS_USERS:
 
@@ -342,13 +425,13 @@ parse_limits(
 #ifdef NEW_LOGGING
                                LDAP_LOG( CONFIG, CRIT, 
                                        "%s : line %d: missing '=' in "
-                                       "\"dn[.{exact|base|one|subtree"
+                                       "\"dn[.{exact|base|onelevel|subtree"
                                        "|children|regex|anonymous}]" "=<pattern>\" in "
                                        "\"limits <pattern> <limits>\" line.\n", fname, lineno, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "%s : line %d: missing '=' in "
-                                       "\"dn[.{exact|base|one|subtree"
+                                       "\"dn[.{exact|base|onelevel|subtree"
                                        "|children|regex|anonymous}]"
                                        "=<pattern>\" in "
                                        "\"limits <pattern> <limits>\" "
@@ -363,29 +446,109 @@ parse_limits(
 
                        /* trim obvious cases */
                        if ( strcmp( pattern, "*" ) == 0 ) {
-                               type = SLAP_LIMITS_ANY;
+                               flags = SLAP_LIMITS_ANY;
                                pattern = NULL;
 
-                       } else if ( ( type == SLAP_LIMITS_REGEX || type == SLAP_LIMITS_UNDEFINED ) 
+                       } else if ( flags == SLAP_LIMITS_REGEX
                                        && strcmp( pattern, ".*" ) == 0 ) {
-                               type = SLAP_LIMITS_ANY;
+                               flags = SLAP_LIMITS_ANY;
                                pattern = NULL;
                        }
                }
+
+       } else if (strncasecmp( pattern, "group", sizeof( "group" ) - 1 ) == 0 ) {
+               pattern += sizeof( "group" ) - 1;
+
+               if ( pattern[0] == '/' ) {
+                       struct berval   oc, ad;
+
+                       oc.bv_val = pattern + 1;
+
+                       ad.bv_val = strchr(pattern, '/');
+                       if ( ad.bv_val != NULL ) {
+                               const char      *text = NULL;
+                               int             rc;
+
+                               oc.bv_len = ad.bv_val - oc.bv_val;
+
+                               ad.bv_val++;
+                               ad.bv_len = strlen( ad.bv_val );
+                               rc = slap_bv2ad( &ad, &group_ad, &text );
+                               if ( rc != LDAP_SUCCESS ) {
+                                       goto no_ad;
+                               }
+
+                               pattern = ad.bv_val + ad.bv_len;
+
+                       } else {
+                               oc.bv_len = strlen( oc.bv_val );
+
+                               pattern = oc.bv_val + oc.bv_len;
+                       }
+
+                       group_oc = oc_bvfind( &oc );
+                       if ( group_oc == NULL ) {
+                               goto no_oc;
+                       }
+               }
+
+               if ( group_oc == NULL ) {
+                       group_oc = oc_find( SLAPD_GROUP_CLASS );
+                       if ( group_oc == NULL ) {
+no_oc:;
+                               return( -1 );
+                       }
+               }
+
+               if ( group_ad == NULL ) {
+                       const char      *text = NULL;
+                       int             rc;
+                       
+                       rc = slap_str2ad( SLAPD_GROUP_ATTR, &group_ad, &text );
+
+                       if ( rc != LDAP_SUCCESS ) {
+no_ad:;
+                               return( -1 );
+                       }
+               }
+
+               flags = SLAP_LIMITS_TYPE_GROUP | SLAP_LIMITS_EXACT;
+
+               if ( pattern[0] != '=' ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG( CONFIG, CRIT, 
+                               "%s : line %d: missing '=' in "
+                               "\"group[/objectClass[/attributeType]]"
+                               "=<pattern>\" in "
+                               "\"limits <pattern> <limits>\" line.\n",
+                               fname, lineno, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                               "%s : line %d: missing '=' in "
+                               "\"group[/objectClass[/attributeType]]"
+                               "=<pattern>\" in "
+                               "\"limits <pattern> <limits>\" line.\n",
+                               fname, lineno, 0 );
+#endif
+                       return( -1 );
+               }
+
+               /* skip '=' (required) */
+               pattern++;
        }
 
        /* get the limits */
        for ( i = 2; i < argc; i++ ) {
-               if ( parse_limit( argv[i], &limit ) ) {
+               if ( limits_parse_one( argv[i], &limit ) ) {
 
 #ifdef NEW_LOGGING
                        LDAP_LOG( CONFIG, CRIT, 
-                               "%s : line %d: unknown limit type \"%s\" in "
+                               "%s : line %d: unknown limit values \"%s\" in "
                                "\"limits <pattern> <limits>\" line.\n",
                                fname, lineno, argv[i] );
 #else
                        Debug( LDAP_DEBUG_ANY,
-                               "%s : line %d: unknown limit type \"%s\" in "
+                               "%s : line %d: unknown limit values \"%s\" in "
                                "\"limits <pattern> <limits>\" line.\n",
                        fname, lineno, argv[i] );
 #endif
@@ -409,7 +572,7 @@ parse_limits(
                limit.lms_s_hard = limit.lms_s_soft;
        }
        
-       rc = add_limits( be, type, pattern, &limit );
+       rc = limits_add( be, flags, pattern, group_oc, group_ad, &limit );
        if ( rc ) {
 
 #ifdef NEW_LOGGING
@@ -429,7 +592,7 @@ parse_limits(
 }
 
 int
-parse_limit(
+limits_parse_one(
        const char              *arg,
        struct slap_limits_set  *limit
 )
@@ -607,3 +770,84 @@ parse_limit(
        return 0;
 }
 
+
+int
+limits_check( Operation *op, SlapReply *rs )
+{
+       assert( op );
+       assert( rs );
+       /* FIXME: should this be always true? */
+       assert( op->o_tag == LDAP_REQ_SEARCH);
+       
+       /* allow root to set no limit */
+       if ( be_isroot( op ) ) {
+               op->ors_limit = NULL;
+
+               if ( op->ors_tlimit == 0 ) {
+                       op->ors_tlimit = -1;
+               }
+
+               if ( op->ors_slimit == 0 ) {
+                       op->ors_slimit = -1;
+               }
+
+       /* if not root, get appropriate limits */
+       } else {
+               ( void ) limits_get( op, &op->o_ndn, &op->ors_limit );
+
+               assert( op->ors_limit != NULL );
+
+               /* if no limit is required, use soft limit */
+               if ( op->ors_tlimit <= 0 ) {
+                       op->ors_tlimit = op->ors_limit->lms_t_soft;
+
+               /* if requested limit higher than hard limit, abort */
+               } else if ( op->ors_tlimit > op->ors_limit->lms_t_hard ) {
+                       /* no hard limit means use soft instead */
+                       if ( op->ors_limit->lms_t_hard == 0
+                                       && op->ors_limit->lms_t_soft > -1
+                                       && op->ors_tlimit > op->ors_limit->lms_t_soft ) {
+                               op->ors_tlimit = op->ors_limit->lms_t_soft;
+
+                       /* positive hard limit means abort */
+                       } else if ( op->ors_limit->lms_t_hard > 0 ) {
+                               rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                               send_ldap_result( op, rs );
+                               rs->sr_err = LDAP_SUCCESS;
+                               return -1;
+                       }
+       
+                       /* negative hard limit means no limit */
+               }
+       
+               /* if no limit is required, use soft limit */
+               if ( op->ors_slimit <= 0 ) {
+                       if ( get_pagedresults( op ) && op->ors_limit->lms_s_pr != 0 ) {
+                               op->ors_slimit = op->ors_limit->lms_s_pr;
+                       } else {
+                               op->ors_slimit = op->ors_limit->lms_s_soft;
+                       }
+
+               /* if requested limit higher than hard limit, abort */
+               } else if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
+                       /* no hard limit means use soft instead */
+                       if ( op->ors_limit->lms_s_hard == 0
+                                       && op->ors_limit->lms_s_soft > -1
+                                       && op->ors_slimit > op->ors_limit->lms_s_soft ) {
+                               op->ors_slimit = op->ors_limit->lms_s_soft;
+
+                       /* positive hard limit means abort */
+                       } else if ( op->ors_limit->lms_s_hard > 0 ) {
+                               rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                               send_ldap_result( op, rs );
+                               rs->sr_err = LDAP_SUCCESS;      
+                               return -1;
+                       }
+               
+                       /* negative hard limit means no limit */
+               }
+       }
+
+       return 0;
+}
+