#include "slap.h"
+static char *
+limits2str( unsigned i )
+{
+ switch ( i ) {
+ case SLAP_LIMITS_UNDEFINED:
+ return "UNDEFINED";
+
+ case SLAP_LIMITS_EXACT:
+ return "EXACT";
+
+ case SLAP_LIMITS_ONE:
+ return "ONELEVEL";
+
+ case SLAP_LIMITS_SUBTREE:
+ return "SUBTREE";
+
+ case SLAP_LIMITS_CHILDREN:
+ return "CHILDREN";
+
+ case SLAP_LIMITS_REGEX:
+ return "REGEX";
+
+ case SLAP_LIMITS_ANONYMOUS:
+ return "ANONYMOUS";
+
+ case SLAP_LIMITS_USERS:
+ return "USERS";
+
+ case SLAP_LIMITS_ANY:
+ return "ANY";
+
+ default:
+ return "UNKNOWN";
+ }
+}
+
int
limits_get(
Operation *op,
assert( op );
assert( limit );
+#ifdef NEW_LOGGING
+ LDAP_LOG( SLAPD, DETAIL1, "==> limits_get: conn=%lu op=%lu dn=\"%s\"\n",
+ op->o_connid, op->o_opid,
+ BER_BVISNULL( ndn ) ? "[anonymous]" : ndn->bv_val );
+
+#else
+ Debug( LDAP_DEBUG_TRACE, "==> limits_get: conn=%lu op=%lu dn=\"%s\"\n",
+ op->o_connid, op->o_opid,
+ BER_BVISNULL( ndn ) ? "[anonymous]" : ndn->bv_val );
+#endif
/*
* default values
*/
lm[0]->lm_group_ad );
if ( rc == 0 ) {
*limit = &lm[0]->lm_limits;
+#ifdef NEW_LOGGING
+ LDAP_LOG( SLAPD, DETAIL1, "<== limits_get: type=GROUP match=EXACT "
+ "dn=\"%s\" oc=\"%s\" ad=\"%s\"\n",
+ lm[0]->lm_pat.bv_val,
+ lm[0]->lm_group_oc->soc_cname.bv_val,
+ lm[0]->lm_group_ad->ad_cname.bv_val );
+#else
+ Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=GROUP match=EXACT "
+ "dn=\"%s\" oc=\"%s\" ad=\"%s\"\n",
+ lm[0]->lm_pat.bv_val,
+ lm[0]->lm_group_oc->soc_cname.bv_val,
+ lm[0]->lm_group_ad->ad_cname.bv_val );
+
+#endif
return( 0 );
}
- }
+ } else {
- if ( dn_match( &lm[0]->lm_pat, ndn ) ) {
- *limit = &lm[0]->lm_limits;
- return( 0 );
+ if ( dn_match( &lm[0]->lm_pat, ndn ) ) {
+ *limit = &lm[0]->lm_limits;
+#ifdef NEW_LOGGING
+ LDAP_LOG( SLAPD, DETAIL1, "<== limits_get: type=DN match=EXACT dn=\"%s\"\n",
+ lm[0]->lm_pat.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=EXACT dn=\"%s\"\n",
+ lm[0]->lm_pat.bv_val, 0, 0 );
+#endif
+ return( 0 );
+ }
}
break;
}
*limit = &lm[0]->lm_limits;
+#ifdef NEW_LOGGING
+ LDAP_LOG( SLAPD, DETAIL1, "<== limits_get: type=DN match=%s dn=\"%s\"\n",
+ limits2str( style ), lm[0]->lm_pat.bv_val, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=%s dn=\"%s\"\n",
+ limits2str( style ), lm[0]->lm_pat.bv_val, 0 );
+#endif
return( 0 );
}
0, NULL, 0 ) == 0 )
{
*limit = &lm[0]->lm_limits;
+#ifdef NEW_LOGGING
+ LDAP_LOG( SLAPD, DETAIL1, "<== limits_get: type=DN match=%s dn=\"%s\"\n",
+ limits2str( style ), lm[0]->lm_pat.bv_val, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=%s dn=\"%s\"\n",
+ limits2str( style ), lm[0]->lm_pat.bv_val, 0 );
+#endif
return( 0 );
}
break;
case SLAP_LIMITS_ANONYMOUS:
if ( ndn->bv_len == 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( SLAPD, DETAIL1, "<== limits_get: type=DN match=%s\n",
+ limits2str( style ), 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=%s\n",
+ limits2str( style ), 0, 0 );
+#endif
*limit = &lm[0]->lm_limits;
return( 0 );
}
case SLAP_LIMITS_USERS:
if ( ndn->bv_len != 0 ) {
*limit = &lm[0]->lm_limits;
+#ifdef NEW_LOGGING
+ LDAP_LOG( SLAPD, DETAIL1, "<== limits_get: type=DN match=%s\n",
+ limits2str( style ), 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "<== limits_get: type=DN match=%s\n",
+ limits2str( style ), 0, 0 );
+#endif
return( 0 );
}
break;
/*
* sanity checks ...
+ *
+ * FIXME: add warnings?
*/
if ( limit.lms_t_hard > 0 &&
( limit.lms_t_hard < limit.lms_t_soft
/*
* defaults ...
+ *
+ * lms_t_hard:
+ * -1 => no limits
+ * 0 => same as soft
+ * > 0 => limit (in seconds)
+ *
+ * lms_s_hard:
+ * -1 => no limits
+ * 0 0> same as soft
+ * > 0 => limit (in entries)
+ *
+ * lms_s_pr_total:
+ * -2 => disable the control
+ * -1 => no limits
+ * 0 => same as soft
+ * > 0 => limit (in entries)
+ *
+ * lms_s_pr:
+ * -1 => no limits
+ * 0 => no limits?
+ * > 0 => limit size (in entries)
*/
- if ( limit.lms_t_hard == 0 ) {
- limit.lms_t_hard = limit.lms_t_soft;
- }
-
- if ( limit.lms_s_hard == 0 ) {
- limit.lms_s_hard = limit.lms_s_soft;
- }
-
- if ( limit.lms_s_pr_total == 0 ) {
- limit.lms_s_pr_total = limit.lms_s_hard;
+ if ( limit.lms_s_pr_total > 0 &&
+ limit.lms_s_pr > limit.lms_s_pr_total ) {
+ limit.lms_s_pr = limit.lms_s_pr_total;
}
rc = limits_add( be, flags, pattern, group_oc, group_ad, &limit );
arg++;
if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_t_soft = -1;
+
} else {
char *next = NULL;
arg += STRLENOF( "soft=" );
if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_s_soft = -1;
+
} else {
char *next = NULL;
int soft = strtol( arg, &next, 10 );
} else if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_s_pr = -1;
- } else if ( strcasecmp( arg, "disabled" ) == 0 ) {
- limit->lms_s_pr_total = -2;
-
} else {
char *next = NULL;
int pr = strtol( arg, &next, 10 );
if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_s_pr_total = -1;
+ } else if ( strcasecmp( arg, "disabled" ) == 0 ) {
+ limit->lms_s_pr_total = -2;
+
} else if ( strcasecmp( arg, "hard" ) == 0 ) {
limit->lms_s_pr_total = 0;
arg++;
if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_s_soft = -1;
+
} else {
char *next = NULL;
assert( op->ors_limit != NULL );
/* if no limit is required, use soft limit */
- if ( op->ors_tlimit <= 0 ) {
+ if ( op->ors_tlimit == 0 ) {
op->ors_tlimit = op->ors_limit->lms_t_soft;
+ /* limit required: check if legal */
} else {
- /* no hard limit means use soft instead */
if ( op->ors_limit->lms_t_hard == 0 ) {
- if ( op->ors_limit->lms_t_soft > -1
- && op->ors_tlimit > op->ors_limit->lms_t_soft ) {
+ if ( op->ors_limit->lms_t_soft > 0
+ && ( op->ors_tlimit < 0 || op->ors_tlimit > op->ors_limit->lms_t_soft ) ) {
op->ors_tlimit = op->ors_limit->lms_t_soft;
}
- /* -1 means no hard limit */
- } else if ( op->ors_limit->lms_t_hard == -1 ) {
- op->ors_tlimit = -1;
-
- /* error if exceeding hard limit */
- } else if ( op->ors_tlimit > op->ors_limit->lms_t_hard ) {
- rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
- send_ldap_result( op, rs );
- rs->sr_err = LDAP_SUCCESS;
- return -1;
+ } else if ( op->ors_limit->lms_t_hard > 0 ) {
+ if ( op->ors_tlimit < 0 || op->ors_tlimit > op->ors_limit->lms_t_hard ) {
+ /* error if exceeding hard limit */
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
+ rs->sr_err = LDAP_SUCCESS;
+ return -1;
+ }
}
}
+ /* else leave as is */
+
/* don't even get to backend if candidate check is disabled */
if ( op->ors_limit->lms_s_unchecked == 0 ) {
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
/* if paged results is requested */
if ( get_pagedresults( op ) ) {
int slimit = -2;
+ int pr_total;
/* paged results is not allowed */
if ( op->ors_limit->lms_s_pr_total == -2 ) {
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;
return -1;
+ }
+
+ if ( op->ors_limit->lms_s_pr > 0 && op->o_pagedresults_size > op->ors_limit->lms_s_pr ) {
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ rs->sr_text = "illegal pagedResults page size";
+ send_ldap_result( op, rs );
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_text = NULL;
+ return -1;
+ }
+
+ if ( op->ors_limit->lms_s_pr_total == 0 ) {
+ if ( op->ors_limit->lms_s_hard == 0 ) {
+ pr_total = op->ors_limit->lms_s_soft;
+ } else {
+ pr_total = op->ors_limit->lms_s_hard;
+ }
+ } else {
+ pr_total = op->ors_limit->lms_s_pr_total;
+ }
+
+ if ( pr_total == -1 ) {
+ slimit = -1;
+
+ } else if ( pr_total > 0 && ( op->ors_slimit == -1 || op->ors_slimit > pr_total ) ) {
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
+ rs->sr_err = LDAP_SUCCESS;
+ return -1;
} else {
/* if no limit is required, use soft limit */
int total;
- int slimit2 = -1;
+ int slimit2;
/* first round of pagedResults: set count to any appropriate limit */
/* if the limit is set, check that it does not violate any limit */
if ( op->ors_slimit > 0 ) {
slimit2 = op->ors_slimit;
- if ( op->ors_limit->lms_s_pr_total > 0 ) {
- if ( op->ors_slimit > op->ors_limit->lms_s_pr_total ) {
- slimit2 = -2;
- }
-
- } else if ( op->ors_limit->lms_s_hard > 0 ) {
- if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
- slimit2 = -2;
- }
-
- } else if ( op->ors_limit->lms_s_soft > 0 ) {
- if ( op->ors_slimit > op->ors_limit->lms_s_soft ) {
- slimit2 = -2;
- }
- }
- if ( slimit2 == -2 ) {
- rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
- send_ldap_result( op, rs );
- rs->sr_err = LDAP_SUCCESS;
- return -1;
- }
+ } else if ( op->ors_slimit == 0 ) {
+ slimit2 = pr_total;
} else {
- if ( op->ors_limit->lms_s_pr_total > 0 ) {
- slimit2 = op->ors_limit->lms_s_pr_total;
-
- } else if ( op->ors_limit->lms_s_hard > 0 ) {
- slimit2 = op->ors_limit->lms_s_hard;
-
- } else if ( op->ors_limit->lms_s_soft > 0 ) {
- slimit2 = op->ors_limit->lms_s_soft;
- }
+ slimit2 = -1;
}
total = slimit2 - op->o_pagedresults_state.ps_count;
- if ( total >= 0 && op->ors_limit->lms_s_pr > 0 ) {
- /* use the smallest limit set by total/per page */
- if ( total < op->ors_limit->lms_s_pr ) {
- slimit = total;
+ if ( total >= 0 ) {
+ if ( op->ors_limit->lms_s_pr > 0 ) {
+ /* use the smallest limit set by total/per page */
+ if ( total < op->ors_limit->lms_s_pr ) {
+ slimit = total;
+
+ } else {
+ /* use the perpage limit if any
+ * NOTE: + 1 because the given value must be legal */
+ slimit = op->ors_limit->lms_s_pr + 1;
+ }
} else {
- /* use the perpage limit if any
- * NOTE: + 1 because the given value must be legal */
- slimit = op->ors_limit->lms_s_pr + 1;
+ /* use the total limit if any */
+ slimit = total;
}
- } else if ( total >= 0 ) {
- /* use the total limit if any */
- slimit = total;
-
- } else if ( op->ors_limit->lms_s_pr != 0 ) {
+ } else if ( op->ors_limit->lms_s_pr > 0 ) {
/* use the perpage limit if any
* NOTE: + 1 because the given value must be legal */
slimit = op->ors_limit->lms_s_pr + 1;
if ( op->ors_slimit <= 0 ) {
op->ors_slimit = slimit;
- } else if ( op->ors_slimit - op->o_pagedresults_state.ps_count > slimit ) {
- rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
- send_ldap_result( op, rs );
- rs->sr_err = LDAP_SUCCESS;
- return -1;
- } else {
+ } else if ( slimit > 0 ) {
+ if ( op->ors_slimit - op->o_pagedresults_state.ps_count > slimit ) {
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
+ rs->sr_err = LDAP_SUCCESS;
+ return -1;
+ }
op->ors_slimit = slimit;
}
} else {
/* use the standard hard/soft limit if any */
- op->ors_slimit = op->ors_limit->lms_s_hard;
+ op->ors_slimit = pr_total;
}
+ /* no limit requested: use soft, whatever it is */
} else if ( op->ors_slimit == 0 ) {
op->ors_slimit = op->ors_limit->lms_s_soft;
+ /* limit requested: check if legal */
} else {
- /* no hard limit means use soft instead */
+ /* hard limit as soft (traditional behavior) */
if ( op->ors_limit->lms_s_hard == 0 ) {
- if ( op->ors_limit->lms_s_soft > -1
+ if ( op->ors_limit->lms_s_soft > 0
&& op->ors_slimit > op->ors_limit->lms_s_soft ) {
op->ors_slimit = op->ors_limit->lms_s_soft;
}
- /* -1 means no hard limit */
- } else if ( op->ors_limit->lms_s_hard == -1 ) {
- op->ors_slimit = -1;
-
- /* error if exceeding hard limit */
- } else if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
- rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
- send_ldap_result( op, rs );
- rs->sr_err = LDAP_SUCCESS;
- return -1;
+ /* explicit hard limit: error if violated */
+ } else if ( op->ors_limit->lms_s_hard > 0 ) {
+ if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
+ /* if limit exceeds hard, error */
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
+ rs->sr_err = LDAP_SUCCESS;
+ return -1;
+ }
}
}
+
+ /* else leave as is */
}
return 0;