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 );
+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 );
/*
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 );
-#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 );
-#endif
-
rc = test_substrings_filter( op, e, f );
break;
case LDAP_FILTER_GE:
+ Debug( LDAP_DEBUG_FILTER, " GE\n", 0, 0, 0 );
rc = test_ava_filter( op, e, f->f_ava, LDAP_FILTER_GE );
break;
case LDAP_FILTER_LE:
+ Debug( LDAP_DEBUG_FILTER, " LE\n", 0, 0, 0 );
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 );
-#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 );
-#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 );
-#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 );
-#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 );
-#endif
rc = test_filter( op, e, f->f_not );
/* Flip true to false and false to true
break;
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 );
-#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 );
}
return LDAP_INSUFFICIENT_ACCESS;
}
+ if ( mra->ma_desc == slap_schema.si_ad_entryDN ) {
+ int ret, rc;
+ const char *text;
+
+ rc = value_match( &ret, slap_schema.si_ad_entryDN, mra->ma_rule,
+ 0, &e->e_nname, &mra->ma_value, &text );
+
+
+ if( rc != LDAP_SUCCESS ) return rc;
+ if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+ return LDAP_COMPARE_FALSE;
+ }
+
for(a = attrs_find( e->e_attrs, mra->ma_desc );
a != NULL;
a = attrs_find( a->a_next, mra->ma_desc ) )
int rc;
const char *text;
- rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
- bv, &mra->ma_value, &text );
-
+#ifdef LDAP_COMP_MATCH
+ /* Component Matching */
+ if( mra->ma_cf &&
+ mra->ma_rule->smr_usage & SLAP_MR_COMPONENT )
+ {
+ rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+ (struct berval *)a,(void*) mra , &text );
+ } else
+#endif
+ {
+ 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;
}
for ( ; bv->bv_val != NULL; bv++ ) {
int ret;
- rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
- bv, &value, &text );
-
+#ifdef LDAP_COMP_MATCH
+ /* Component Matching */
+ if( mra->ma_cf &&
+ mra->ma_rule->smr_usage & SLAP_MR_COMPONENT)
+ {
+ rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+ (struct berval*)a, (void*)mra, &text );
+ } else
+#endif
+ {
+ rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+ bv, &value, &text );
+ }
+
if( rc != LDAP_SUCCESS ) break;
if ( ret == 0 ) {
/* check match */
rc = value_match( &ret, ad, mra->ma_rule, 0,
bv, &value, &text );
-
if ( value.bv_val != mra->ma_value.bv_val ) {
memfree( value.bv_val, memctx );
}
AttributeAssertion *ava,
int type )
{
+ int rc;
Attribute *a;
if ( !access_allowed( op, e,
return LDAP_INSUFFICIENT_ACCESS;
}
+ if ( ava->aa_desc == slap_schema.si_ad_hasSubordinates
+ && op && op->o_bd && op->o_bd->be_has_subordinates )
+ {
+ int hasSubordinates;
+ struct berval hs;
+
+ if( type != LDAP_FILTER_EQUALITY &&
+ type != LDAP_FILTER_APPROX )
+ {
+ /* No other match is allowed */
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
+ 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;
+ }
+
+ if ( ava->aa_desc == slap_schema.si_ad_entryDN ) {
+ MatchingRule *mr;
+ int rc, match;
+ const char *text;
+
+ if( type != LDAP_FILTER_EQUALITY &&
+ type != LDAP_FILTER_APPROX )
+ {
+ /* No other match is allowed */
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
+ mr = slap_schema.si_ad_entryDN->ad_type->sat_equality;
+ assert( mr );
+
+ rc = value_match( &match, slap_schema.si_ad_entryDN, mr, 0,
+ &e->e_nname, &ava->aa_value, &text );
+
+ if( rc != LDAP_SUCCESS ) return rc;
+ if( match == 0 ) return LDAP_COMPARE_TRUE;
+ return LDAP_COMPARE_FALSE;
+ }
+
+ rc = LDAP_COMPARE_FALSE;
+
for(a = attrs_find( e->e_attrs, ava->aa_desc );
a != NULL;
a = attrs_find( a->a_next, ava->aa_desc ) )
MatchingRule *mr;
struct berval *bv;
+ if (( ava->aa_desc != a->a_desc ) && !access_allowed( op,
+ e, a->a_desc, &ava->aa_value, ACL_SEARCH, NULL ))
+ {
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ continue;
+ }
+
switch ( type ) {
case LDAP_FILTER_APPROX:
mr = a->a_desc->ad_type->sat_approx;
}
if( mr == NULL ) {
+ rc = LDAP_INAPPROPRIATE_MATCHING;
continue;
}
for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
- int ret;
- int rc;
+ int ret, match;
const char *text;
- rc = value_match( &ret, a->a_desc, mr, 0,
+ ret = value_match( &match, a->a_desc, mr, 0,
bv, &ava->aa_value, &text );
- if( rc != LDAP_SUCCESS ) return rc;
+ if( ret != LDAP_SUCCESS ) {
+ rc = ret;
+ break;
+ }
switch ( type ) {
case LDAP_FILTER_EQUALITY:
case LDAP_FILTER_APPROX:
- if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+ if ( match == 0 ) return LDAP_COMPARE_TRUE;
break;
case LDAP_FILTER_GE:
- if ( ret >= 0 ) return LDAP_COMPARE_TRUE;
+ if ( match >= 0 ) return LDAP_COMPARE_TRUE;
break;
case LDAP_FILTER_LE:
- if ( ret <= 0 ) return LDAP_COMPARE_TRUE;
+ if ( match <= 0 ) return LDAP_COMPARE_TRUE;
break;
}
}
}
- 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 );
+ return rc;
}
AttributeDescription *desc )
{
Attribute *a;
+ int rc;
if ( !access_allowed( op, e, desc, NULL, ACL_SEARCH, NULL ) ) {
return LDAP_INSUFFICIENT_ACCESS;
}
- a = attrs_find( e->e_attrs, desc );
- if ( a == NULL && desc == slap_schema.si_ad_hasSubordinates ) {
-
+ if ( desc == slap_schema.si_ad_hasSubordinates ) {
/*
* XXX: fairly optimistic: if the function is defined,
* then PRESENCE must succeed, because hasSubordinate
return LDAP_COMPARE_FALSE;
}
- return a != NULL ? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
+ if ( desc == slap_schema.si_ad_entryDN ||
+ desc == slap_schema.si_ad_subschemaSubentry )
+ {
+ /* entryDN and subschemaSubentry are always present */
+ return LDAP_COMPARE_TRUE;
+ }
+
+ rc = LDAP_COMPARE_FALSE;
+
+ for(a = attrs_find( e->e_attrs, desc );
+ a != NULL;
+ a = attrs_find( a->a_next, desc ) )
+ {
+ if (( desc != a->a_desc ) && !access_allowed( op,
+ e, a->a_desc, NULL, ACL_SEARCH, NULL ))
+ {
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ continue;
+ }
+
+ rc = LDAP_COMPARE_TRUE;
+ break;
+ }
+
+ return rc;
}
Filter *f;
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( op, e, f );
}
}
-#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;
}
test_filter_or(
Operation *op,
Entry *e,
- Filter *flist
-)
+ Filter *flist )
{
Filter *f;
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( op, e, f );
}
}
-#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;
}
Filter *f )
{
Attribute *a;
+ int rc;
-#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 ( !access_allowed( op, e,
f->f_sub_desc, NULL, ACL_SEARCH, NULL ) )
return LDAP_INSUFFICIENT_ACCESS;
}
+ rc = LDAP_COMPARE_FALSE;
+
for(a = attrs_find( e->e_attrs, f->f_sub_desc );
a != NULL;
a = attrs_find( a->a_next, f->f_sub_desc ) )
{
- MatchingRule *mr = a->a_desc->ad_type->sat_substr;
+ MatchingRule *mr;
struct berval *bv;
- if( mr == NULL ) continue;
+ if (( f->f_sub_desc != a->a_desc ) && !access_allowed( op,
+ e, a->a_desc, NULL, ACL_SEARCH, NULL ))
+ {
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ continue;
+ }
+
+ mr = a->a_desc->ad_type->sat_substr;
+ if( mr == NULL ) {
+ rc = LDAP_INAPPROPRIATE_MATCHING;
+ continue;
+ }
for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
- int ret;
- int rc;
+ int ret, match;
const char *text;
- rc = value_match( &ret, a->a_desc, mr, 0,
+ ret = value_match( &match, a->a_desc, mr, 0,
bv, f->f_sub, &text );
- if( rc != LDAP_SUCCESS ) return rc;
- if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+ if( ret != LDAP_SUCCESS ) {
+ rc = ret;
+ break;
+ }
+ if ( match == 0 ) return LDAP_COMPARE_TRUE;
}
}
-#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;
+ Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter %d\n",
+ rc, 0, 0 );
+ return rc;
}
projects / openldap / blobdiff