X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fgroup.c;h=f8d5074bc8ff5dba34a8977ffe077b7a5fe9f6f3;hb=82540c5cc1be5bf17b22f3a41d12d1bc56180654;hp=eb35dc3d7e31715a296e1dfa7e6b2d08c0142d02;hpb=815a62930c342032381e7373502cb93c573bd3b0;p=openldap diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c index eb35dc3d7e..f8d5074bc8 100644 --- a/servers/slapd/back-ldbm/group.c +++ b/servers/slapd/back-ldbm/group.c @@ -1,4 +1,9 @@ /* group.c - ldbm backend acl group routine */ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ #include "portable.h" @@ -12,7 +17,6 @@ #include "proto-back-ldbm.h" -#ifdef SLAPD_ACLGROUPS /* return 0 IFF op_dn is a value in member attribute * of entry with gr_dn AND that entry has an objectClass * value of groupOfNames @@ -20,107 +24,200 @@ int ldbm_back_group( Backend *be, + Connection *conn, + Operation *op, Entry *target, - char *gr_ndn, - char *op_ndn, - char *objectclassValue, - char *groupattrName + struct berval *gr_ndn, + struct berval *op_ndn, + ObjectClass *group_oc, + AttributeDescription *group_at ) { - struct ldbminfo *li = (struct ldbminfo *) be->be_private; - Entry *e; - char *matched; - Attribute *objectClass; - Attribute *member; - int rc; - - Debug( LDAP_DEBUG_TRACE, + struct ldbminfo *li = (struct ldbminfo *) be->be_private; + Entry *e; + int rc = 1; + Attribute *attr; + + const char *group_oc_name = NULL; + const char *group_at_name = group_at->ad_cname.bv_val; + + if( group_oc->soc_names && group_oc->soc_names[0] ) { + group_oc_name = group_oc->soc_names[0]; + } else { + group_oc_name = group_oc->soc_oid; + } + +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ENTRY, + "ldbm_back_group: check (%s) member of (%s), oc %s\n", + op_ndn->bv_val, gr_ndn->bv_val, group_oc_name ); +#else + Debug( LDAP_DEBUG_ARGS, "=> ldbm_back_group: gr dn: \"%s\"\n", - gr_ndn, 0, 0 ); - Debug( LDAP_DEBUG_TRACE, + gr_ndn->bv_val, 0, 0 ); + + Debug( LDAP_DEBUG_ARGS, "=> ldbm_back_group: op dn: \"%s\"\n", - op_ndn, 0, 0 ); - Debug( LDAP_DEBUG_TRACE, - "=> ldbm_back_group: objectClass: \"%s\" attrName: \"%s\"\n", - objectclassValue, groupattrName, 0 ); + op_ndn->bv_val, 0, 0 ); + Debug( LDAP_DEBUG_ARGS, + "=> ldbm_back_group: oc: \"%s\" at: \"%s\"\n", + group_oc_name, group_at_name, 0 ); - Debug( LDAP_DEBUG_TRACE, + Debug( LDAP_DEBUG_ARGS, "=> ldbm_back_group: tr dn: \"%s\"\n", target->e_ndn, 0, 0 ); +#endif - if (strcmp(target->e_ndn, gr_ndn) == 0) { + if (dn_match(&target->e_nname, gr_ndn)) { /* we already have a LOCKED copy of the entry */ e = target; - Debug( LDAP_DEBUG_ARGS, +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, DETAIL1, + "ldbm_back_group: target is group (%s)\n", gr_ndn->bv_val, 0, 0 ); +#else + Debug( LDAP_DEBUG_ARGS, "=> ldbm_back_group: target is group: \"%s\"\n", - gr_ndn, 0, 0 ); + gr_ndn->bv_val, 0, 0 ); +#endif + + } else { /* can we find group entry with reader lock */ - if ((e = dn2entry_r(be, gr_ndn, &matched )) == NULL) { - Debug( LDAP_DEBUG_TRACE, - "=> ldbm_back_group: cannot find group: \"%s\" matched: \"%s\"\n", - gr_ndn, (matched ? matched : ""), 0 ); - if (matched != NULL) - free(matched); + if ((e = dn2entry_r(be, gr_ndn, NULL )) == NULL) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, DETAIL1, + "ldbm_back_group: cannot find group (%s)\n", + gr_ndn->bv_val, 0, 0 ); +#else + Debug( LDAP_DEBUG_ACL, + "=> ldbm_back_group: cannot find group: \"%s\"\n", + gr_ndn->bv_val, 0, 0 ); +#endif + return( 1 ); } - Debug( LDAP_DEBUG_ARGS, + +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, DETAIL1, + "ldbm_back_group: found group (%s)\n", gr_ndn->bv_val, 0, 0 ); +#else + Debug( LDAP_DEBUG_ACL, "=> ldbm_back_group: found group: \"%s\"\n", - gr_ndn, 0, 0 ); - } - - - /* check for deleted */ - - /* find it's objectClass and member attribute values - * make sure this is a group entry - * finally test if we can find op_dn in the member attribute value list * - */ - - rc = 1; - if ((objectClass = attr_find(e->e_attrs, "objectclass")) == NULL) { - Debug( LDAP_DEBUG_TRACE, "<= ldbm_back_group: failed to find objectClass\n", 0, 0, 0 ); - } - else if ((member = attr_find(e->e_attrs, groupattrName)) == NULL) { - Debug( LDAP_DEBUG_TRACE, "<= ldbm_back_group: failed to find %s\n", groupattrName, 0, 0 ); - } - else { - struct berval bvObjectClass; - struct berval bvMembers; - - Debug( LDAP_DEBUG_ARGS, "<= ldbm_back_group: found objectClass and %s\n", groupattrName, 0, 0 ); - - bvObjectClass.bv_val = objectclassValue; - bvObjectClass.bv_len = strlen( bvObjectClass.bv_val ); - - bvMembers.bv_val = op_ndn; - bvMembers.bv_len = strlen( op_ndn ); - - if (value_find(objectClass->a_vals, &bvObjectClass, SYNTAX_CIS, 1) != 0) { - Debug( LDAP_DEBUG_TRACE, - "<= ldbm_back_group: failed to find %s in objectClass\n", - objectclassValue, 0, 0 ); - } - else if (value_find(member->a_vals, &bvMembers, SYNTAX_CIS, 1) != 0) { - Debug( LDAP_DEBUG_ACL, - "<= ldbm_back_group: \"%s\" not in \"%s\": %s\n", - op_ndn, gr_ndn, groupattrName ); - } - else { - Debug( LDAP_DEBUG_ACL, - "<= ldbm_back_group: \"%s\" is in \"%s\": %s\n", - op_ndn, gr_ndn, groupattrName ); - rc = 0; - } - } + gr_ndn->bv_val, 0, 0 ); +#endif + + } + + /* find it's objectClass and member attribute values + * make sure this is a group entry + * finally test if we can find op_dn in the member attribute value list * + */ + + rc = 1; + + + if( is_entry_alias( e ) ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, INFO, + "ldbm_back_group: group (%s) is an alias\n", gr_ndn->bv_val, 0, 0 ); +#else + Debug( LDAP_DEBUG_ACL, + "<= ldbm_back_group: group is an alias\n", 0, 0, 0 ); +#endif + + goto return_results; + } + + if( is_entry_referral( e ) ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, INFO, + "ldbm_back_group: group (%s) is a referral.\n", gr_ndn->bv_val,0,0); +#else + Debug( LDAP_DEBUG_ACL, + "<= ldbm_back_group: group is an referral\n", 0, 0, 0 ); +#endif + goto return_results; + } + + if( !is_entry_objectclass( e, group_oc, 0 ) ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_group: failed to find %s in objectClass.\n", + group_oc_name, 0, 0 ); +#else + Debug( LDAP_DEBUG_ACL, + "<= ldbm_back_group: failed to find %s in objectClass\n", + group_oc_name, 0, 0 ); +#endif + + goto return_results; + } + + if ((attr = attr_find(e->e_attrs, group_at)) == NULL) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, INFO, + "ldbm_back_group: failed to find %s\n", group_at_name, 0, 0 ); +#else + Debug( LDAP_DEBUG_ACL, + "<= ldbm_back_group: failed to find %s\n", + group_at_name, 0, 0 ); +#endif + + goto return_results; + } + +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ENTRY, + "ldbm_back_group: found objectClass %s and %s\n", + group_oc_name, group_at_name, 0 ); +#else + Debug( LDAP_DEBUG_ACL, + "<= ldbm_back_group: found objectClass %s and %s\n", + group_oc_name, group_at_name, 0 ); +#endif + + + if( value_find( group_at, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, DETAIL1, + "ldbm_back_group: \"%s\" not in \"%s\": %s\n", + op_ndn->bv_val, gr_ndn->bv_val, group_at_name ); +#else + Debug( LDAP_DEBUG_ACL, + "<= ldbm_back_group: \"%s\" not in \"%s\": %s\n", + op_ndn->bv_val, gr_ndn->bv_val, group_at_name ); +#endif + + goto return_results; + } + + +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, DETAIL1, + "ldbm_back_group: %s is in %s: %s\n", + op_ndn->bv_val, gr_ndn->bv_val, group_at_name ); +#else + Debug( LDAP_DEBUG_ACL, + "<= ldbm_back_group: \"%s\" is in \"%s\": %s\n", + op_ndn->bv_val, gr_ndn->bv_val, group_at_name ); +#endif + + + rc = 0; + +return_results: if( target != e ) { /* free entry and reader lock */ - cache_return_entry_r( &li->li_cache, e ); + cache_return_entry_r( &li->li_cache, e ); } - Debug( LDAP_DEBUG_ARGS, "ldbm_back_group: rc: %d\n", rc, 0, 0 ); +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_group: rc=%d\n", rc, 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, "ldbm_back_group: rc=%d\n", rc, 0, 0 ); +#endif + return(rc); } -#endif /* SLAPD_ACLGROUPS */