X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilterentry.c;h=586db3f9b4ccebdfc79c8d0b26e7d93786e3e867;hb=9c5fe98a79afc5303a1e82a93fd759532f289d27;hp=29dbb0886f0c3276f49b6ffc50679d568f868a76;hpb=665272dca1ea2b2ebac85766a12ed26c7e1264f7;p=openldap
diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 29dbb0886f..586db3f9b4 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -1,8 +1,27 @@
/* filterentry.c - apply a filter to an entry */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 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
+ * .
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
#include "portable.h"
@@ -15,24 +34,12 @@
#include "slap.h"
-static int test_filter_and( Backend *be,
- Connection *conn, Operation *op,
- Entry *e, Filter *flist );
-static int test_filter_or( Backend *be,
- Connection *conn, Operation *op,
- Entry *e, Filter *flist );
-static int test_substrings_filter( Backend *be,
- Connection *conn, Operation *op,
- Entry *e, Filter *f);
-static int test_ava_filter( Backend *be,
- Connection *conn, Operation *op,
- Entry *e, AttributeAssertion *ava, int type );
-static int test_mra_filter( Backend *be,
- Connection *conn, Operation *op,
- Entry *e, MatchingRuleAssertion *mra );
-static int test_presence_filter( Backend *be,
- Connection *conn, Operation *op,
- Entry *e, AttributeDescription *desc );
+static int test_filter_and( Operation *op, Entry *e, Filter *flist );
+static int test_filter_or( Operation *op, Entry *e, Filter *flist );
+static int test_substrings_filter( Operation *op, Entry *e, Filter *f);
+static int test_ava_filter( Operation *op, Entry *e, AttributeAssertion *ava, int type );
+static int test_mra_filter( Operation *op, Entry *e, MatchingRuleAssertion *mra );
+static int test_presence_filter( Operation *op, Entry *e, AttributeDescription *desc );
/*
@@ -46,73 +53,121 @@ static int test_presence_filter( Backend *be,
int
test_filter(
- Backend *be,
- Connection *conn,
Operation *op,
Entry *e,
Filter *f
)
{
int rc;
-
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, ENTRY, "test_filter: begin\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter\n", 0, 0, 0 );
+#endif
switch ( f->f_choice ) {
case SLAPD_FILTER_COMPUTED:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1,
+ "test_filter: COMPUTED %s (%d)\n",
+ 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, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " COMPUTED %s (%d)\n",
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, 0 );
+#endif
+
rc = f->f_result;
break;
case LDAP_FILTER_EQUALITY:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1, "test_filter: EQUALITY\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " EQUALITY\n", 0, 0, 0 );
- rc = test_ava_filter( be, conn, op, e, f->f_ava,
+#endif
+
+ rc = test_ava_filter( op, e, f->f_ava,
LDAP_FILTER_EQUALITY );
break;
case LDAP_FILTER_SUBSTRINGS:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1, "test_filter SUBSTRINGS\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " SUBSTRINGS\n", 0, 0, 0 );
- rc = test_substrings_filter( be, conn, op, e, f );
+#endif
+
+ rc = test_substrings_filter( op, e, f );
break;
case LDAP_FILTER_GE:
- rc = test_ava_filter( be, conn, op, e, f->f_ava,
+ rc = test_ava_filter( op, e, f->f_ava,
LDAP_FILTER_GE );
break;
case LDAP_FILTER_LE:
- rc = test_ava_filter( be, conn, op, e, f->f_ava,
+ rc = test_ava_filter( op, e, f->f_ava,
LDAP_FILTER_LE );
break;
case LDAP_FILTER_PRESENT:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1, "test_filter: PRESENT\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " PRESENT\n", 0, 0, 0 );
- rc = test_presence_filter( be, conn, op, e, f->f_desc );
+#endif
+
+ rc = test_presence_filter( op, e, f->f_desc );
break;
case LDAP_FILTER_APPROX:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1, "test_filter: APPROX\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " APPROX\n", 0, 0, 0 );
- rc = test_ava_filter( be, conn, op, e, f->f_ava,
+#endif
+ rc = test_ava_filter( op, e, f->f_ava,
LDAP_FILTER_APPROX );
break;
case LDAP_FILTER_AND:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1, "test_filter: AND\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " AND\n", 0, 0, 0 );
- rc = test_filter_and( be, conn, op, e, f->f_and );
+#endif
+
+ rc = test_filter_and( op, e, f->f_and );
break;
case LDAP_FILTER_OR:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1, "test_filter: OR\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " OR\n", 0, 0, 0 );
- rc = test_filter_or( be, conn, op, e, f->f_or );
+#endif
+
+ rc = test_filter_or( op, e, f->f_or );
break;
case LDAP_FILTER_NOT:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1, "test_filter: NOT\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " NOT\n", 0, 0, 0 );
- rc = test_filter( be, conn, op, e, f->f_not );
+#endif
+ rc = test_filter( op, e, f->f_not );
+
+ /* Flip true to false and false to true
+ * but leave Undefined alone.
+ */
switch( rc ) {
case LDAP_COMPARE_TRUE:
rc = LDAP_COMPARE_FALSE;
@@ -123,39 +178,230 @@ test_filter(
}
break;
-#ifdef SLAPD_EXT_FILTERS
case LDAP_FILTER_EXT:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, DETAIL1, "test_filter: EXT\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, " EXT\n", 0, 0, 0 );
- rc = test_mra_filter( be, conn, op, e, f->f_mra );
- break;
#endif
+ rc = test_mra_filter( op, e, f->f_mra );
+ break;
+
default:
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, INFO,
+ "test_filter: unknown filter type %lu\n", f->f_choice, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, " unknown filter type %lu\n",
f->f_choice, 0, 0 );
+#endif
+
rc = LDAP_PROTOCOL_ERROR;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, RESULTS, "test_filter: return=%d\n", rc, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter %d\n", rc, 0, 0 );
+#endif
+
return( rc );
}
+static int test_mra_filter(
+ Operation *op,
+ Entry *e,
+ MatchingRuleAssertion *mra )
+{
+ Attribute *a;
+ void *memctx = op ? op->o_tmpmemctx : NULL;
+
+ if ( mra->ma_desc ) {
+ /*
+ * if ma_desc is available, then we're filtering for
+ * one attribute, and SEARCH permissions can be checked
+ * directly.
+ */
+ if( !access_allowed( op, e,
+ mra->ma_desc, &mra->ma_value, ACL_SEARCH, NULL ) )
+ {
+ return LDAP_INSUFFICIENT_ACCESS;
+ }
+
+ for(a = attrs_find( e->e_attrs, mra->ma_desc );
+ a != NULL;
+ a = attrs_find( a->a_next, mra->ma_desc ) )
+ {
+ struct berval *bv;
+ /* If ma_rule is not the same as the attribute's
+ * normal rule, then we can't use the a_nvals.
+ */
+ if (mra->ma_rule == a->a_desc->ad_type->sat_equality) {
+ bv = a->a_nvals;
+ } else {
+ bv = a->a_vals;
+ }
+
+ for ( ; bv->bv_val != NULL; bv++ ) {
+ int ret;
+ int rc;
+ const char *text;
+
+ rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+ bv, &mra->ma_value, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if ( ret == 0 ) {
+ return LDAP_COMPARE_TRUE;
+ }
+ }
+ }
+ } else {
+
+ /*
+ * No attribute description: test all
+ */
+ for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
+ struct berval *bv, value;
+ const char *text = NULL;
+ int rc;
+
+ /* check if matching is appropriate */
+ if ( !mr_usable_with_at( mra->ma_rule, a->a_desc->ad_type )) {
+ continue;
+ }
+
+ /* normalize for equality */
+ rc = asserted_value_validate_normalize( a->a_desc, mra->ma_rule,
+ SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+ &mra->ma_value, &value, &text, memctx );
+ if ( rc != LDAP_SUCCESS ) {
+ continue;
+ }
+
+ /* check search access */
+ if ( !access_allowed( op, e,
+ a->a_desc, &value, ACL_SEARCH, NULL ) ) {
+ continue;
+ }
+
+ /* check match */
+ if (mra->ma_rule == a->a_desc->ad_type->sat_equality)
+ bv = a->a_nvals;
+ else
+ bv = a->a_vals;
+ for ( ; bv->bv_val != NULL; bv++ )
+ {
+ int ret;
+ int rc;
+
+ rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+ bv, &value, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if ( ret == 0 ) {
+ return LDAP_COMPARE_TRUE;
+ }
+ }
+ }
+ }
+
+ /* check attrs in DN AVAs if required */
+ if ( mra->ma_dnattrs ) {
+ LDAPDN dn = NULL;
+ int iRDN, iAVA;
+ int rc;
+
+ /* parse and pretty the dn */
+ rc = dnPrettyDN( NULL, &e->e_name, &dn, memctx );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ /* for each AVA of each RDN ... */
+ for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) {
+ LDAPRDN rdn = dn[ iRDN ];
+
+ for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) {
+ LDAPAVA *ava = rdn[ iAVA ];
+ struct berval *bv = &ava->la_value, value;
+ AttributeDescription *ad = (AttributeDescription *)ava->la_private;
+ int ret;
+ int rc;
+ const char *text;
+
+ assert( ad );
+
+ if ( mra->ma_desc ) {
+ /* have a mra type? check for subtype */
+ if ( !is_ad_subtype( ad, mra->ma_desc ) ) {
+ continue;
+ }
+ value = mra->ma_value;
+
+ } else {
+ const char *text = NULL;
+
+ /* check if matching is appropriate */
+ if ( !mr_usable_with_at( mra->ma_rule, ad->ad_type )) {
+ continue;
+ }
+
+ /* normalize for equality */
+ rc = asserted_value_validate_normalize( ad,
+ mra->ma_rule,
+ SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+ &mra->ma_value, &value, &text, memctx );
+ if ( rc != LDAP_SUCCESS ) {
+ continue;
+ }
+
+ /* check search access */
+ if ( !access_allowed( op, e,
+ ad, &value, ACL_SEARCH, NULL ) ) {
+ continue;
+ }
+ }
+
+ /* check match */
+ rc = value_match( &ret, ad, mra->ma_rule, 0,
+ bv, &value, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ ldap_dnfree_x( dn, memctx );
+ return rc;
+ }
+
+ if ( ret == 0 ) {
+ ldap_dnfree_x( dn, memctx );
+ return LDAP_COMPARE_TRUE;
+ }
+ }
+ }
+ }
+
+ return LDAP_COMPARE_FALSE;
+}
static int
test_ava_filter(
- Backend *be,
- Connection *conn,
- Operation *op,
- Entry *e,
+ Operation *op,
+ Entry *e,
AttributeAssertion *ava,
- int type
+ int type
)
{
- int i;
Attribute *a;
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- ava->aa_desc, ava->aa_value, ACL_SEARCH ) )
+ if ( !access_allowed( op, e,
+ ava->aa_desc, &ava->aa_value, ACL_SEARCH, NULL ) )
{
return LDAP_INSUFFICIENT_ACCESS;
}
@@ -165,12 +411,15 @@ test_ava_filter(
a = attrs_find( a->a_next, ava->aa_desc ) )
{
MatchingRule *mr;
+ struct berval *bv;
switch ( type ) {
case LDAP_FILTER_APPROX:
mr = a->a_desc->ad_type->sat_approx;
if( mr != NULL ) break;
+ /* use EQUALITY matching rule if no APPROX rule */
+
case LDAP_FILTER_EQUALITY:
mr = a->a_desc->ad_type->sat_equality;
break;
@@ -188,14 +437,14 @@ test_ava_filter(
continue;
}
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ )
+ {
int ret;
int rc;
const char *text;
- rc = value_match( &ret, a->a_desc, mr,
- a->a_vals[i], ava->aa_value,
- &text );
+ rc = value_match( &ret, a->a_desc, mr, 0,
+ bv, &ava->aa_value, &text );
if( rc != LDAP_SUCCESS ) {
return rc;
@@ -224,106 +473,177 @@ test_ava_filter(
}
}
+ if ( ava->aa_desc == slap_schema.si_ad_hasSubordinates
+ && op && op->o_bd && op->o_bd->be_has_subordinates ) {
+ int hasSubordinates;
+ struct berval hs;
+
+ /*
+ * No other match should be allowed ...
+ */
+ assert( type == LDAP_FILTER_EQUALITY );
+
+ if (op->o_bd->be_has_subordinates( op, e, &hasSubordinates ) != LDAP_SUCCESS) {
+ return LDAP_OTHER;
+ }
+
+ if ( hasSubordinates == LDAP_COMPARE_TRUE ) {
+ hs = slap_true_bv;
+
+ } else if ( hasSubordinates == LDAP_COMPARE_FALSE ) {
+ hs = slap_false_bv;
+
+ } else {
+ return LDAP_OTHER;
+ }
+
+ if ( bvmatch( &ava->aa_value, &hs ) ) {
+ return LDAP_COMPARE_TRUE;
+ }
+
+ return LDAP_COMPARE_FALSE;
+ }
+
return( LDAP_COMPARE_FALSE );
}
static int
test_presence_filter(
- Backend *be,
- Connection *conn,
- Operation *op,
- Entry *e,
+ Operation *op,
+ Entry *e,
AttributeDescription *desc
)
{
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- desc, NULL, ACL_SEARCH ) )
+ Attribute *a;
+
+ if ( !access_allowed( op, e, desc, NULL, ACL_SEARCH, NULL ) )
{
return LDAP_INSUFFICIENT_ACCESS;
}
- return attrs_find( e->e_attrs, desc ) != NULL
- ? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
+ a = attrs_find( e->e_attrs, desc );
+
+ if ( a == NULL && desc == slap_schema.si_ad_hasSubordinates ) {
+
+ /*
+ * XXX: fairly optimistic: if the function is defined,
+ * then PRESENCE must succeed, because hasSubordinate
+ * is boolean-valued; I think we may live with this
+ * simplification by now
+ */
+ if ( op && op->o_bd && op->o_bd->be_has_subordinates ) {
+ return LDAP_COMPARE_TRUE;
+ }
+
+ return LDAP_COMPARE_FALSE;
+ }
+
+ return a != NULL ? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
}
static int
test_filter_and(
- Backend *be,
- Connection *conn,
- Operation *op,
- Entry *e,
- Filter *flist
+ Operation *op,
+ Entry *e,
+ Filter *flist
)
{
Filter *f;
- int rtn = LDAP_COMPARE_TRUE;
+ int rtn = LDAP_COMPARE_TRUE; /* True if empty */
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, ENTRY, "test_filter_and: begin\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter_and\n", 0, 0, 0 );
+#endif
+
for ( f = flist; f != NULL; f = f->f_next ) {
- int rc = test_filter( be, conn, op, e, f );
+ int rc = test_filter( op, e, f );
if ( rc == LDAP_COMPARE_FALSE ) {
- rtn = LDAP_COMPARE_FALSE;
+ /* filter is False */
+ rtn = rc;
break;
}
+
if ( rc != LDAP_COMPARE_TRUE ) {
+ /* filter is Undefined unless later elements are False */
rtn = rc;
}
}
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, RESULTS, "test_filter_and: rc=%d\n", rtn, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter_and %d\n", rtn, 0, 0 );
+#endif
+
return rtn;
}
static int
test_filter_or(
- Backend *be,
- Connection *conn,
- Operation *op,
- Entry *e,
- Filter *flist
+ Operation *op,
+ Entry *e,
+ Filter *flist
)
{
Filter *f;
- int rtn = LDAP_COMPARE_FALSE;
+ int rtn = LDAP_COMPARE_FALSE; /* False if empty */
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, ENTRY, "test_filter_or: begin\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter_or\n", 0, 0, 0 );
+#endif
+
for ( f = flist; f != NULL; f = f->f_next ) {
- int rc = test_filter( be, conn, op, e, f );
+ int rc = test_filter( op, e, f );
if ( rc == LDAP_COMPARE_TRUE ) {
- rtn = LDAP_COMPARE_TRUE;
+ /* filter is True */
+ rtn = rc;
break;
}
- if ( rc != LDAP_COMPARE_TRUE ) {
+
+ if ( rc != LDAP_COMPARE_FALSE ) {
+ /* filter is Undefined unless later elements are True */
rtn = rc;
}
}
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, ENTRY, "test_filter_or: result=%d\n", rtn, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter_or %d\n", rtn, 0, 0 );
+#endif
+
return rtn;
}
static int
test_substrings_filter(
- Backend *be,
- Connection *conn,
- Operation *op,
- Entry *e,
- Filter *f
+ Operation *op,
+ Entry *e,
+ Filter *f
)
{
Attribute *a;
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, ENTRY, "test_substrings_filter: begin\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, "begin test_substrings_filter\n", 0, 0, 0 );
+#endif
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- f->f_sub_desc, NULL, ACL_SEARCH ) )
+
+ if ( !access_allowed( op, e,
+ f->f_sub_desc, NULL, ACL_SEARCH, NULL ) )
{
return LDAP_INSUFFICIENT_ACCESS;
}
@@ -332,21 +652,21 @@ test_substrings_filter(
a != NULL;
a = attrs_find( a->a_next, f->f_sub_desc ) )
{
- int i;
MatchingRule *mr = a->a_desc->ad_type->sat_substr;
+ struct berval *bv;
if( mr == NULL ) {
continue;
}
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ )
+ {
int ret;
int rc;
const char *text;
- rc = value_match( &ret, a->a_desc, mr,
- a->a_vals[i], f->f_sub,
- &text );
+ rc = value_match( &ret, a->a_desc, mr, 0,
+ bv, f->f_sub, &text );
if( rc != LDAP_SUCCESS ) {
return rc;
@@ -358,6 +678,11 @@ test_substrings_filter(
}
}
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, ENTRY, "test_substrings_filter: return FALSE\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter 1\n", 0, 0, 0 );
+#endif
+
return LDAP_COMPARE_FALSE;
}