#endif
static int regex_matches(
- char *pat, char *str, char *buf, regmatch_t *matches);
+ struct berval *pat, char *str, char *buf, regmatch_t *matches);
static void string_expand(
- struct berval *newbuf, char *pattern,
+ struct berval *newbuf, struct berval *pattern,
char *match, regmatch_t *matches);
typedef struct AciSetCookie {
Operation *op;
} AciSetCookie;
-BerVarray aci_set_gather (void *cookie, char *name, struct berval *attr);
+SLAP_SET_GATHER aci_set_gather;
static int aci_match_set ( struct berval *subj, Backend *be,
Entry *e, Connection *conn, Operation *op, int setref );
if ( dnlen <= patlen )
continue;
- if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) || DN_ESCAPE( e->e_ndn[dnlen - patlen - 2] ) )
+ if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) )
continue;
rdnlen = dn_rdnlen( NULL, &e->e_nname );
continue;
} else if ( a->acl_dn_style == ACL_STYLE_SUBTREE ) {
- if ( dnlen > patlen && ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) || DN_ESCAPE( e->e_ndn[dnlen - patlen - 2] ) ) )
+ if ( dnlen > patlen && !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) )
continue;
} else if ( a->acl_dn_style == ACL_STYLE_CHILDREN ) {
if ( dnlen <= patlen )
continue;
- if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) || DN_ESCAPE( e->e_ndn[dnlen - patlen - 2] ) )
+ if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) )
continue;
}
}
} else if ( b->a_dn_style == ACL_STYLE_REGEX ) {
- if ( b->a_dn_pat.bv_len != 1 ||
- ber_bvccmp( &b->a_dn_pat, '*' ) != 0 ) {
- int ret = regex_matches( b->a_dn_pat.bv_val,
+ if ( ber_bvccmp( &b->a_dn_pat, '*' ) == 0 ) {
+ int ret = regex_matches( &b->a_dn_pat,
op->o_ndn.bv_val, e->e_ndn, matches );
if( ret == 0 ) {
if ( odnlen <= patlen )
continue;
- if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) || DN_ESCAPE( op->o_ndn.bv_val[odnlen - patlen - 2] ) )
+ if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) )
continue;
rdnlen = dn_rdnlen( NULL, &op->o_ndn );
continue;
} else if ( b->a_dn_style == ACL_STYLE_SUBTREE ) {
- if ( odnlen > patlen && ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) || DN_ESCAPE( op->o_ndn.bv_val[odnlen - patlen - 2] ) ) )
+ if ( odnlen > patlen && !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) )
continue;
} else if ( b->a_dn_style == ACL_STYLE_CHILDREN ) {
if ( odnlen <= patlen )
continue;
- if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) || DN_ESCAPE( op->o_ndn.bv_val[odnlen - patlen - 2] ) )
+ if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) )
continue;
}
}
}
- if ( b->a_sockurl_pat != NULL ) {
+ if ( b->a_sockurl_pat.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_sockurl_pat: %s\n",
- conn->c_connid, b->a_sockurl_pat ));
+ conn->c_connid, b->a_sockurl_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
- b->a_sockurl_pat, 0, 0 );
+ b->a_sockurl_pat.bv_val, 0, 0 );
#endif
- if ( strcmp( b->a_sockurl_pat, "*" ) != 0) {
+ if ( ber_bvccmp( &b->a_sockurl_pat, '*' ) != 0) {
if ( b->a_sockurl_style == ACL_STYLE_REGEX) {
- if (!regex_matches( b->a_sockurl_pat, conn->c_listener_url,
+ if (!regex_matches( &b->a_sockurl_pat, conn->c_listener_url.bv_val,
e->e_ndn, matches ) )
{
continue;
}
} else {
- if ( strcasecmp( b->a_sockurl_pat, conn->c_listener_url ) != 0 )
+ if ( ber_bvstrcasecmp( &b->a_sockurl_pat, &conn->c_listener_url ) != 0 )
continue;
}
}
}
- if ( b->a_domain_pat != NULL ) {
+ if ( b->a_domain_pat.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_domain_pat: %s\n",
- conn->c_connid, b->a_domain_pat ));
+ conn->c_connid, b->a_domain_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
- b->a_domain_pat, 0, 0 );
+ b->a_domain_pat.bv_val, 0, 0 );
#endif
- if ( strcmp( b->a_domain_pat, "*" ) != 0) {
+ if ( ber_bvccmp( &b->a_domain_pat, '*' ) != 0) {
if ( b->a_domain_style == ACL_STYLE_REGEX) {
- if (!regex_matches( b->a_domain_pat, conn->c_peer_domain,
+ if (!regex_matches( &b->a_domain_pat, conn->c_peer_domain.bv_val,
e->e_ndn, matches ) )
{
continue;
}
} else {
- if ( strcasecmp( b->a_domain_pat, conn->c_peer_domain ) != 0 )
+ if ( ber_bvstrcasecmp( &b->a_domain_pat, &conn->c_peer_domain ) != 0 )
continue;
}
}
}
- if ( b->a_peername_pat != NULL ) {
+ if ( b->a_peername_pat.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_perrname_path: %s\n",
- conn->c_connid, b->a_peername_pat ));
+ conn->c_connid, b->a_peername_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
- b->a_peername_pat, 0, 0 );
+ b->a_peername_pat.bv_val, 0, 0 );
#endif
- if ( strcmp( b->a_peername_pat, "*" ) != 0) {
+ if ( ber_bvccmp( &b->a_peername_pat, '*' ) != 0) {
if ( b->a_peername_style == ACL_STYLE_REGEX) {
- if (!regex_matches( b->a_peername_pat, conn->c_peer_name,
+ if (!regex_matches( &b->a_peername_pat, conn->c_peer_name.bv_val,
e->e_ndn, matches ) )
{
continue;
}
} else {
- if ( strcasecmp( b->a_peername_pat, conn->c_peer_name ) != 0 )
+ if ( ber_bvstrcasecmp( &b->a_peername_pat, &conn->c_peer_name ) != 0 )
continue;
}
}
}
- if ( b->a_sockname_pat != NULL ) {
+ if ( b->a_sockname_pat.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_sockname_path: %s\n",
- conn->c_connid, b->a_sockname_pat ));
+ conn->c_connid, b->a_sockname_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
- b->a_sockname_pat, 0, 0 );
+ b->a_sockname_pat.bv_val, 0, 0 );
#endif
- if ( strcmp( b->a_sockname_pat, "*" ) != 0) {
+ if ( ber_bvccmp( &b->a_sockname_pat, '*' ) != 0) {
if ( b->a_sockname_style == ACL_STYLE_REGEX) {
- if (!regex_matches( b->a_sockname_pat, conn->c_sock_name,
+ if (!regex_matches( &b->a_sockname_pat, conn->c_sock_name.bv_val,
e->e_ndn, matches ) )
{
continue;
}
} else {
- if ( strcasecmp( b->a_sockname_pat, conn->c_sock_name ) != 0 )
+ if ( ber_bvstrcasecmp( &b->a_sockname_pat, &conn->c_sock_name ) != 0 )
continue;
}
}
*/
/* see if asker is listed in dnattr */
if ( b->a_group_style == ACL_STYLE_REGEX ) {
- string_expand(&bv, b->a_group_pat.bv_val, e->e_ndn, matches);
+ string_expand(&bv, &b->a_group_pat, e->e_ndn, matches);
if ( dnNormalize2(NULL, &bv, &ndn) != LDAP_SUCCESS ) {
/* did not expand to a valid dn */
continue;
b->a_group_oc, b->a_group_at);
if ( ndn.bv_val )
free( ndn.bv_val );
- if ( rc != 0 )
- {
+ if ( rc != 0 ) {
continue;
}
}
return(s);
}
-#ifdef SLAPD_ACI_ENABLED
-static int
-aci_strbvcmp(
- const char *s,
- struct berval *bv )
-{
- int res, len;
-
- res = strncasecmp( s, bv->bv_val, bv->bv_len );
- if (res)
- return(res);
- len = strlen(s);
- if (len > (int)bv->bv_len)
- return(1);
- if (len < (int)bv->bv_len)
- return(-1);
- return(0);
-}
-#endif
-
static int
aci_get_part(
struct berval *list,
}
BerVarray
-aci_set_gather (void *cookie, char *name, struct berval *attr)
+aci_set_gather (void *cookie, struct berval *name, struct berval *attr)
{
AciSetCookie *cp = cookie;
BerVarray bvals = NULL;
- struct berval bv, ndn;
+ struct berval ndn;
/* this routine needs to return the bervals instead of
* plain strings, since syntax is not known. It should
* also return the syntax or some "comparison cookie".
*/
- bv.bv_val = name;
- bv.bv_len = strlen( name );
- if (dnNormalize2(NULL, &bv, &ndn) == LDAP_SUCCESS) {
+ if (dnNormalize2(NULL, name, &ndn) == LDAP_SUCCESS) {
const char *text;
AttributeDescription *desc = NULL;
if (slap_bv2ad(attr, &desc, &text) == LDAP_SUCCESS) {
cookie.conn = conn;
cookie.op = op;
rc = (slap_set_filter(aci_set_gather, &cookie, &set,
- op->o_ndn.bv_val, e->e_ndn, NULL) > 0);
+ &op->o_ndn, &e->e_nname, NULL) > 0);
ch_free(set.bv_val);
}
return(rc);
)
{
struct berval bv;
- char *subjdn;
+ struct berval subjdn;
struct berval grpoc;
struct berval grpat;
ObjectClass *grp_oc = NULL;
int rc;
/* format of string is "group/objectClassValue/groupAttrName" */
- if (aci_get_part(subj, 0, '/', &bv) < 0) {
- return(0);
- }
-
- subjdn = aci_bvstrdup(&bv);
- if (subjdn == NULL) {
+ if (aci_get_part(subj, 0, '/', &subjdn) < 0) {
return(0);
}
struct berval ndn;
bv.bv_val = (char *)ch_malloc(1024);
bv.bv_len = 1024;
- string_expand(&bv, subjdn, e->e_ndn, matches);
+ string_expand(&bv, &subjdn, e->e_ndn, matches);
if ( dnNormalize2(NULL, &bv, &ndn) == LDAP_SUCCESS ) {
rc = (backend_group(be, conn, op, e, &ndn, &op->o_ndn, grp_oc, grp_ad) == 0);
free( ndn.bv_val );
}
done:
- ch_free(subjdn);
return(rc);
}
static void
string_expand(
struct berval *bv,
- char *pat,
+ struct berval *pat,
char *match,
regmatch_t *matches)
{
bv->bv_len--; /* leave space for lone $ */
flag = 0;
- for ( dp = bv->bv_val, sp = pat; size < bv->bv_len && *sp ; sp++) {
+ for ( dp = bv->bv_val, sp = pat->bv_val; size < bv->bv_len &&
+ sp < pat->bv_val + pat->bv_len ; sp++) {
/* did we previously see a $ */
if (flag) {
if (*sp == '$') {
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
- "string_expand: pattern = %s\n", pat ));
+ "string_expand: pattern = %.*s\n", pat->bv_len, pat->bv_val ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"string_expand: expanded = %s\n", bv->bv_val ));
#else
- Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %s\n", pat, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %.*s\n", pat->bv_len, pat->bv_val, 0 );
Debug( LDAP_DEBUG_TRACE, "=> string_expand: expanded: %s\n", bv->bv_val, 0, 0 );
#endif
}
static int
regex_matches(
- char *pat, /* pattern to expand and match against */
+ struct berval *pat, /* pattern to expand and match against */
char *str, /* string to match against pattern */
char *buf, /* buffer with $N expansion variables */
regmatch_t *matches /* offsets in buffer for $N expansion variables */
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_ERR,
"regex_matches: compile( \"%s\", \"%s\") failed %s\n",
- pat, str, error ));
+ pat->bv_val, str, error ));
#else
Debug( LDAP_DEBUG_TRACE,
"compile( \"%s\", \"%s\") failed %s\n",
- pat, str, error );
+ pat->bv_val, str, error );
#endif
return( 0 );
}
projects / openldap / blobdiff