Andrew Bartlett wrote:
I've got my bitwise match plugin to load and run, but now I have an
issue. it appears that my matching rule needs to limit what attributes
it applies itself to.
That is, when I step though to code, from this query:
[abartlet@piglett source]$ bin/ldbsearch -H
ldapi:///data/samba/samba4/svn/source/st/dc/ldap/ldapi -b
"dc=samba,dc=example,dc=com" -s sub
'(|(&(!(groupType:1.2.840.113556.1.4.803:=1))(groupType:1.2.840.113556.1.4.803:=2147483648)(groupType:1.2.840.113556.1.4.804:=10)))' sAMAccountName groupType
# returned 0 records
I seem to be walking all the attributes, not just the attributes in the
search expression:
75 errno = 0;
76 a = strtoull((*vals)->bv_val, NULL, 10);
77 if (errno == ERANGE) {
78 ber_bvecfree( vals );
79 vals = NULL;
80 continue;
81 }
(gdb) p (*vals)->bv_val
$5 = 0x8411038 "(targetattr = \"*\") (version 3.0;acl \"full access to
all by all\";allow (all)(userdn = \"ldap:///anyone\";);)\n"
The collation plugin is again to opaque for me to quite get how I'm
meant to handle this...
This is what's really puzzling - the interface for the mr match function is this: typedef int (*mrFilterMatchFn) (void* filter, Slapi_Entry*, Slapi_Attr* vals); void *filter is a mr plugin private object (set with slapi_pblock_set (pb, SLAPI_PLUGIN_OBJECT, (void *)obj)) entry is the entry to be tested to see if this entry matches the extensible search filter. You would assume attr is the attribute from the search filter - but you would be wrong. Attr is really just e->e_attrs - the attribute list from entry, beginning with the first attribute in the list. The attribute type in question is not passed in either, which means the mr match function must somehow know which attribute type to look for. The collation plugin handles this by using or_filter_t as the obj - one of the fields is or_type, the attribute type. It also doesn't pass in the value from the filter ava, so the match fn has to keep track of that also.
So it looks like the workaround is to do something similar in the bitwise code - create a structure to use for the match function callback. It looks like the type and value don't have to be a copy - they are pointers into the pblock of the search operation which has a lifetime of well after the match fn is used. The new code is attached.
It looks like the better solution would be to change the code in test_extensible_filter() to pass in the type and value into the match function - it seems stupid for the plugin to have to keep track of that, but perhaps I'm missing something.
/** BEGIN COPYRIGHT BLOCK
* This Program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; version 2 of the License.
*
* This Program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
* In addition, as a special exception, Red Hat, Inc. gives You the additional
* right to link the code of this Program with code not covered under the GNU
* General Public License ("Non-GPL Code") and to distribute linked combinations
* including the two, subject to the limitations in this paragraph. Non-GPL Code
* permitted under this exception must only link to the code of this Program
* through those well defined interfaces identified in the file named EXCEPTION
* found in the source code files (the "Approved Interfaces"). The files of
* Non-GPL Code may instantiate templates or use macros or inline functions from
* the Approved Interfaces without causing the resulting work to be covered by
* the GNU General Public License. Only Red Hat, Inc. may make changes or
* additions to the list of Approved Interfaces. You must obey the GNU General
* Public License in all respects for all of the Program code and other code used
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
* provide this exception without modification, you must delete this exception
* statement from your version and license this file solely under the GPL without
* exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
/* orfilter.c - implementation of ordering rule filter */
#include <ldap.h> /* LDAP_UTF8INC */
#include <slap.h> /* for debug macros */
#include <slapi-plugin.h> /* slapi_berval_cmp, SLAPI_BERVAL_EQ */
#ifdef HPUX11
#include <dl.h>
#endif /* HPUX11 */
/* the match function needs the attribute type and value from the search
filter - this is unfortunately not passed into the match fn, so we
have to keep track of this
*/
struct bitwise_match_cb {
char *type; /* the attribute type from the filter ava */
struct berval *val; /* the value from the filter ava */
};
/*
The type and val pointers are assumed to have sufficient lifetime -
we don't have to copy them - they are usually just pointers into
the SLAPI_PLUGIN_MR_TYPE and SLAPI_PLUGIN_MR_VALUE fields of the
operation pblock, whose lifetime should encompass the creation
and destruction of the bitwise_match_cb object.
*/
static struct bitwise_match_cb *
new_bitwise_match_cb(char *type, struct berval *val)
{
struct bitwise_match_cb *bmc = (struct bitwise_match_cb *)slapi_ch_calloc(1, sizeof(struct bitwise_match_cb));
bmc->type = type;
bmc->val = val;
return bmc;
}
static void
delete_bitwise_match_cb(struct bitwise_match_cb *bmc)
{
slapi_ch_free((void **)&bmc);
}
static int
bitwise_filter_destroy(Slapi_PBlock* pb)
{
void *obj = NULL;
slapi_pblock_get(pb, SLAPI_PLUGIN_OBJECT, &obj);
if (obj) {
struct bitwise_match_cb *bmc = (struct bitwise_match_cb *)obj;
delete_bitwise_match_cb(bmc);
obj = NULL;
slapi_pblock_set(pb, SLAPI_PLUGIN_OBJECT, obj);
}
}
#define BITWISE_OP_AND 0
#define BITWISE_OP_OR 1
static int
internal_bitwise_filter_match(void* obj, Slapi_Entry* entry, Slapi_Attr* attr, int op)
/* returns: 0 filter matched
* -1 filter did not match
* >0 an LDAP error code
*/
{
struct bitwise_match_cb *bmc = obj;
unsigned long long a, b;
char *val_from_entry = NULL;
auto int rc = -1; /* no match */
val_from_entry = slapi_entry_attr_get_charptr(entry, bmc->type);
if (val_from_entry) {
errno = 0;
a = strtoull(val_from_entry, NULL, 10);
if (errno != ERANGE) {
errno = 0;
b = strtoull(bmc->val->bv_val, NULL, 10);
if (errno == ERANGE) {
rc = LDAP_CONSTRAINT_VIOLATION;
} else {
int result;
if (op == BITWISE_OP_AND) {
result = (a & b);
} else if (op == BITWISE_OP_OR) {
result = (a | b);
}
if (result) {
rc = 0;
}
}
}
slapi_ch_free_string(&val_from_entry);
}
return rc;
}
static int
bitwise_filter_match_and (void* obj, Slapi_Entry* entry, Slapi_Attr* attr)
/* returns: 0 filter matched
* -1 filter did not match
* >0 an LDAP error code
*/
{
return internal_bitwise_filter_match(obj, entry, attr, BITWISE_OP_AND);
}
static int
bitwise_filter_match_or (void* obj, Slapi_Entry* entry, Slapi_Attr* attr)
/* returns: 0 filter matched
* -1 filter did not match
* >0 an LDAP error code
*/
{
return internal_bitwise_filter_match(obj, entry, attr, BITWISE_OP_OR);
}
static int
bitwise_filter_create (Slapi_PBlock* pb)
{
auto int rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION; /* failed to initialize */
auto char* mrOID = NULL;
auto char* mrTYPE = NULL;
auto struct berval* mrVALUE = NULL;
if (!slapi_pblock_get (pb, SLAPI_PLUGIN_MR_OID, &mrOID) && mrOID != NULL &&
!slapi_pblock_get (pb, SLAPI_PLUGIN_MR_TYPE, &mrTYPE) && mrTYPE != NULL &&
!slapi_pblock_get (pb, SLAPI_PLUGIN_MR_VALUE, &mrVALUE) && mrVALUE != NULL) {
struct bitwise_match_cb *bmc = new_bitwise_match_cb(mrTYPE, mrVALUE);
slapi_pblock_set (pb, SLAPI_PLUGIN_OBJECT, bmc);
slapi_pblock_set (pb, SLAPI_PLUGIN_DESTROY_FN, (void*)bitwise_filter_destroy);
if (strcmp(mrOID, "1.2.840.113556.1.4.803") == 0) {
slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_MATCH_FN, (void*)bitwise_filter_match_and);
} else if (strcmp(mrOID, "1.2.840.113556.1.4.804") == 0) {
slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_MATCH_FN, (void*)bitwise_filter_match_or);
}
rc = LDAP_SUCCESS;
} else {
LDAPDebug (LDAP_DEBUG_FILTER, "=> bitwise_filter_create missing parameter(s)\n", 0, 0, 0);
}
LDAPDebug (LDAP_DEBUG_FILTER, "<= bitwise_filter_create %i\n", rc, 0, 0);
return LDAP_SUCCESS;
}
static Slapi_PluginDesc pdesc = { "bitwise", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
"bitwise match plugin" };
int /* LDAP error code */
bitwise_init (Slapi_PBlock* pb)
{
int rc;
int argc;
char** argv;
char* cfgpath;
rc = slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_CREATE_FN, (void*)bitwise_filter_create);
if ( rc == 0 ) {
rc = slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&pdesc );
}
LDAPDebug (LDAP_DEBUG_FILTER, "bitwise_init %i\n", rc, 0, 0);
return rc;
}
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature
-- Fedora-directory-devel mailing list Fedora-directory-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-directory-devel
