-/* acl.c - routines to parse and check acl's */
+/* aclparse.c - routines to parse and check acl's */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
)
{
int i;
- char *left, *right;
+ char *left, *right, *style;
AccessControl *a;
Access *b;
+ int rc;
+ const char *text;
a = NULL;
for ( i = 1; i < argc; i++ ) {
}
split( argv[i], '=', &left, &right );
+ split( left, '.', &left, &style );
+
+ if ( right == NULL || *right == '\0' ) {
+ fprintf( stderr,
+ "%s: line %d: missing \"=\" in (or value after) \"%s\" in to clause\n",
+ fname, lineno, left );
+ acl_usage();
+ }
if ( strcasecmp( left, "dn" ) == 0 ) {
if( a->acl_dn_pat != NULL ) {
acl_usage();
}
- if ( right == NULL ) {
- fprintf( stderr,
- "%s: line %d: missing \"=\" in \"%s\" in to clause\n",
- fname, lineno, left );
- acl_usage();
- }
+ if ( style == NULL || *style == '\0'
+ || strcasecmp( style, "regex" ) == 0 )
+ {
+ a->acl_dn_style = ACL_STYLE_REGEX;
+ if ( strcmp(right, "*") == 0
+ || strcmp(right, ".*") == 0
+ || strcmp(right, ".*$") == 0
+ || strcmp(right, "^.*") == 0
+ || strcmp(right, "^.*$$") == 0
+ || strcmp(right, ".*$$") == 0
+ || strcmp(right, "^.*$$") == 0 )
+ {
+ a->acl_dn_pat = ch_strdup( "*" );
- if( *right == '\0' ) {
- a->acl_dn_pat = ch_strdup("^$");
+ } else {
+ a->acl_dn_pat = ch_strdup( right );
+ }
+ } else if ( strcasecmp( style, "base" ) == 0 ) {
+ a->acl_dn_style = ACL_STYLE_BASE;
+ a->acl_dn_pat = ch_strdup( right );
- } else if ( strcmp(right, "*") == 0
- || strcmp(right, ".*") == 0
- || strcmp(right, ".*$") == 0
- || strcmp(right, "^.*") == 0
- || strcmp(right, "^.*$$") == 0
- || strcmp(right, ".*$$") == 0
- || strcmp(right, "^.*$$") == 0 )
- {
- a->acl_dn_pat = ch_strdup( "*" );
+ } else if ( strcasecmp( style, "one" ) == 0 ) {
+ a->acl_dn_style = ACL_STYLE_ONE;
+ a->acl_dn_pat = ch_strdup( right );
- } else {
+ } else if ( strcasecmp( style, "subtree" ) == 0 ) {
+ a->acl_dn_style = ACL_STYLE_SUBTREE;
+ a->acl_dn_pat = ch_strdup( right );
+
+ } else if ( strcasecmp( style, "children" ) == 0 ) {
+ a->acl_dn_style = ACL_STYLE_CHILDREN;
a->acl_dn_pat = ch_strdup( right );
+
+ } else {
+ fprintf( stderr,
+ "%s: line %d: unknown dn style \"%s\" in to clause\n",
+ fname, lineno, style );
+ acl_usage();
}
continue;
}
- if ( right == NULL || *right == '\0' ) {
- fprintf( stderr,
- "%s: line %d: missing \"=\" in (or value after) \"%s\" in to clause\n",
- fname, lineno, left );
- acl_usage();
- }
-
if ( strcasecmp( left, "filter" ) == 0 ) {
if ( (a->acl_filter = str2filter(
right )) == NULL ) {
}
if( a->acl_dn_pat != NULL ) {
- int e = regcomp( &a->acl_dn_re, a->acl_dn_pat,
- REG_EXTENDED | REG_ICASE );
- if ( e ) {
- char buf[512];
- regerror( e, &a->acl_dn_re, buf, sizeof(buf) );
- fprintf( stderr,
- "%s: line %d: regular expression \"%s\" bad because of %s\n",
- fname, lineno, right, buf );
- acl_usage();
+ if ( a->acl_dn_style != ACL_STYLE_REGEX )
+ {
+ dn_normalize(a->acl_dn_pat);
+
+ } else {
+ int e = regcomp( &a->acl_dn_re, a->acl_dn_pat,
+ REG_EXTENDED | REG_ICASE );
+ if ( e ) {
+ char buf[512];
+ regerror( e, &a->acl_dn_re, buf, sizeof(buf) );
+ fprintf( stderr,
+ "%s: line %d: regular expression \"%s\" bad because of %s\n",
+ fname, lineno, right, buf );
+ acl_usage();
+ }
}
}
/* get <who> */
for ( ; i < argc; i++ ) {
char *pat;
+ slap_style_t sty = ACL_STYLE_REGEX;
+
split( argv[i], '=', &left, &right );
+ split( left, '.', &left, &style );
+ if ( style == NULL || *style == '\0'
+ || strcasecmp( style, "regex" ) == 0 )
+ {
+ sty = ACL_STYLE_REGEX;
+ } else if ( strcasecmp( style, "exact" ) == 0 ) {
+ sty = ACL_STYLE_EXACT;
+ } else if ( strcasecmp( style, "base" ) == 0 ) {
+ sty = ACL_STYLE_BASE;
+ } else if ( strcasecmp( style, "one" ) == 0 ) {
+ sty = ACL_STYLE_ONE;
+ } else if ( strcasecmp( style, "subtree" ) == 0 ) {
+ sty = ACL_STYLE_SUBTREE;
+ } else if ( strcasecmp( style, "children" ) == 0 ) {
+ sty = ACL_STYLE_CHILDREN;
+ } else {
+ fprintf( stderr,
+ "%s: line %d: unknown style \"%s\" in by clause\n",
+ fname, lineno, style );
+ acl_usage();
+ }
if ( strcasecmp( argv[i], "*" ) == 0 ) {
pat = ch_strdup( "*" );
pat = ch_strdup( "users" );
} else if ( strcasecmp( left, "dn" ) == 0 ) {
- if( right == NULL ) {
- /* no '=' */
- pat = ch_strdup( "users" );
-
- } else if (*right == '\0' ) {
- /* dn="" */
- pat = ch_strdup( "anonymous" );
-
- } else if ( strcmp( right, "*" ) == 0 ) {
- /* dn=* /
- /* any or users? any for now */
- pat = ch_strdup( "users" );
-
- } else if ( strcmp( right, ".+" ) == 0
- || strcmp( right, "^.+" ) == 0
- || strcmp( right, ".+$" ) == 0
- || strcmp( right, "^.+$" ) == 0
- || strcmp( right, ".+$$" ) == 0
- || strcmp( right, "^.+$$" ) == 0 )
- {
- pat = ch_strdup( "users" );
-
- } else if ( strcmp( right, ".*" ) == 0
- || strcmp( right, "^.*" ) == 0
- || strcmp( right, ".*$" ) == 0
- || strcmp( right, "^.*$" ) == 0
- || strcmp( right, ".*$$" ) == 0
- || strcmp( right, "^.*$$" ) == 0 )
- {
- pat = ch_strdup( "*" );
+ if ( sty == ACL_STYLE_REGEX ) {
+ b->a_dn_style = ACL_STYLE_REGEX;
+ if( right == NULL ) {
+ /* no '=' */
+ pat = ch_strdup( "users" );
+
+ } else if (*right == '\0' ) {
+ /* dn="" */
+ pat = ch_strdup( "anonymous" );
+
+ } else if ( strcmp( right, "*" ) == 0 ) {
+ /* dn=* */
+ /* any or users? users for now */
+ pat = ch_strdup( "users" );
+
+ } else if ( strcmp( right, ".+" ) == 0
+ || strcmp( right, "^.+" ) == 0
+ || strcmp( right, ".+$" ) == 0
+ || strcmp( right, "^.+$" ) == 0
+ || strcmp( right, ".+$$" ) == 0
+ || strcmp( right, "^.+$$" ) == 0 )
+ {
+ pat = ch_strdup( "users" );
+
+ } else if ( strcmp( right, ".*" ) == 0
+ || strcmp( right, "^.*" ) == 0
+ || strcmp( right, ".*$" ) == 0
+ || strcmp( right, "^.*$" ) == 0
+ || strcmp( right, ".*$$" ) == 0
+ || strcmp( right, "^.*$$" ) == 0 )
+ {
+ pat = ch_strdup( "*" );
+
+ } else {
+ regtest(fname, lineno, right);
+ pat = ch_strdup( right );
+ }
+ } else if ( right == NULL || *right == '\0' ) {
+ fprintf( stderr,
+ "%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+ fname, lineno, left );
+ acl_usage();
} else {
- regtest(fname, lineno, right);
pat = ch_strdup( right );
}
}
b->a_dn_pat = pat;
+ b->a_dn_style = sty;
+ if ( sty != ACL_STYLE_REGEX )
+ dn_normalize(pat);
continue;
}
if ( strcasecmp( left, "dnattr" ) == 0 ) {
- if( b->a_dn_pat != NULL ) {
+ if( b->a_dn_at != NULL ) {
fprintf( stderr,
"%s: line %d: dnattr already specified.\n",
fname, lineno );
acl_usage();
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- b->a_dn_at = at_find( right );
+ rc = slap_str2ad( right, &b->a_dn_at, &text );
- if( b->a_dn_at == NULL ) {
+ if( rc != LDAP_SUCCESS ) {
fprintf( stderr,
- "%s: line %d: dnattr attribute type undefined.\n",
- fname, lineno );
+ "%s: line %d: dnattr \"%s\": %s\n",
+ fname, lineno, right, text );
acl_usage();
}
-#ifdef SLAPD_OID_DN_SYNTAX
- if( strcmp( b->a_dn_at->sat_syntax_oid,
- SLAPD_OID_DN_SYNTAX ) != 0 )
+
+ if( !is_at_syntax( b->a_dn_at->ad_type,
+ SLAPD_DN_SYNTAX ) )
{
fprintf( stderr,
- "%s: line %d: dnattr attribute type not of DN syntax.\n",
- fname, lineno );
+ "%s: line %d: dnattr \"%s\": "
+ "inappropriate syntax: %s\n",
+ fname, lineno, right,
+ b->a_dn_at->ad_type->sat_syntax_oid );
acl_usage();
}
-#endif
-#else
- b->a_dn_at = ch_strdup( right );
-#endif
+
continue;
}
+ if (sty != ACL_STYLE_REGEX && sty != ACL_STYLE_BASE) {
+ fprintf( stderr,
+ "%s: line %d: inappropriate style \"%s\" in by clause\n",
+ fname, lineno, style );
+ acl_usage();
+ }
+
if ( strncasecmp( left, "group", sizeof("group")-1 ) == 0 ) {
char *name = NULL;
char *value = NULL;
}
}
- regtest(fname, lineno, right);
- b->a_group_pat = ch_strdup( right );
+ b->a_group_style = sty;
+ if (sty == ACL_STYLE_REGEX) {
+ regtest(fname, lineno, right);
+ b->a_group_pat = ch_strdup( right );
+ } else {
+ b->a_group_pat = ch_strdup( right );
+ dn_normalize(b->a_group_pat);
+ }
if (value && *value) {
- b->a_group_oc = ch_strdup(value);
+ b->a_group_oc = oc_find( value );
*--value = '/';
+
+ if( b->a_group_oc == NULL ) {
+ fprintf( stderr,
+ "%s: line %d: group objectclass "
+ "\"%s\" unknown\n",
+ fname, lineno, value );
+ acl_usage();
+ }
} else {
- b->a_group_oc = ch_strdup("groupOfNames");
+ b->a_group_oc = oc_find(SLAPD_GROUP_CLASS);
+
+ if( b->a_group_oc == NULL ) {
+ fprintf( stderr,
+ "%s: line %d: group default objectclass "
+ "\"%s\" unknown\n",
+ fname, lineno, SLAPD_GROUP_CLASS );
+ acl_usage();
+ }
+ }
+
+ if( is_object_subclass( b->a_group_oc,
+ slap_schema.si_oc_referral ) )
+ {
+ fprintf( stderr,
+ "%s: line %d: group objectclass \"%s\" "
+ "is subclass of referral\n",
+ fname, lineno, value );
+ acl_usage();
+ }
+
+ if( is_object_subclass( b->a_group_oc,
+ slap_schema.si_oc_alias ) )
+ {
+ fprintf( stderr,
+ "%s: line %d: group objectclass \"%s\" "
+ "is subclass of alias\n",
+ fname, lineno, value );
+ acl_usage();
}
if (name && *name) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- b->a_group_at = at_find( name );
-#else
- b->a_group_at = ch_strdup(name);
-#endif
- *--name = '/';
+ rc = slap_str2ad( right, &b->a_group_at, &text );
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: group \"%s\": %s\n",
+ fname, lineno, right, text );
+ acl_usage();
+ }
+ *--name = '/';
} else {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- b->a_group_at = at_find("member");
-#else
- b->a_group_at = ch_strdup("member");
-#endif
+ rc = slap_str2ad( SLAPD_GROUP_ATTR, &b->a_group_at, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: group \"%s\": %s\n",
+ fname, lineno, SLAPD_GROUP_ATTR, text );
+ acl_usage();
+ }
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if( b->a_group_at == NULL ) {
+ if( !is_at_syntax( b->a_group_at->ad_type,
+ SLAPD_DN_SYNTAX ) )
+ {
fprintf( stderr,
- "%s: line %d: group attribute type undefined.\n",
- fname, lineno );
+ "%s: line %d: group \"%s\": inappropriate syntax: %s\n",
+ fname, lineno, right,
+ b->a_group_at->ad_type->sat_syntax_oid );
acl_usage();
}
-#ifdef SLAPD_OID_DN_SYNTAX
- if( strcmp( b->a_group_at->sat_syntax_oid,
- SLAPD_OID_DN_SYNTAX ) != 0 )
+
{
- fprintf( stderr,
- "%s: line %d: group attribute type not of DN syntax.\n",
- fname, lineno );
- acl_usage();
+ int rc;
+ struct berval val;
+ struct berval *vals[2];
+
+ val.bv_val = b->a_group_oc->soc_oid;
+ val.bv_len = strlen(val.bv_val);
+ vals[0] = &val;
+ vals[1] = NULL;
+
+
+ rc = oc_check_allowed( b->a_group_at->ad_type, vals );
+
+ if( rc != 0 ) {
+ fprintf( stderr,
+ "%s: line %d: group: \"%s\" not allowed by \"%s\"\n",
+ fname, lineno,
+ b->a_group_at->ad_cname->bv_val,
+ b->a_group_oc->soc_oid );
+ acl_usage();
+ }
}
-#endif /* SLAPD_OID_DN_SYNTAX */
-#endif /* SLAPD_SCHEMA_NOT_COMPAT */
continue;
}
acl_usage();
}
- regtest(fname, lineno, right);
+ b->a_peername_style = sty;
+ if (sty == ACL_STYLE_REGEX) {
+ regtest(fname, lineno, right);
+ }
b->a_peername_pat = ch_strdup( right );
continue;
}
acl_usage();
}
- regtest(fname, lineno, right);
+ b->a_sockname_style = sty;
+ if (sty == ACL_STYLE_REGEX) {
+ regtest(fname, lineno, right);
+ }
b->a_sockname_pat = ch_strdup( right );
continue;
}
acl_usage();
}
- regtest(fname, lineno, right);
+ b->a_domain_style = sty;
+ if (sty == ACL_STYLE_REGEX) {
+ regtest(fname, lineno, right);
+ }
b->a_domain_pat = ch_strdup( right );
continue;
}
acl_usage();
}
- regtest(fname, lineno, right);
+ b->a_sockurl_style = sty;
+ if (sty == ACL_STYLE_REGEX) {
+ regtest(fname, lineno, right);
+ }
b->a_sockurl_pat = ch_strdup( right );
continue;
}
+ if ( strcasecmp( left, "set" ) == 0 ) {
+ if( b->a_set_pat != NULL ) {
+ fprintf( stderr,
+ "%s: line %d: set attribute already specified.\n",
+ fname, lineno );
+ acl_usage();
+ }
+
+ if ( right == NULL || *right == '\0' ) {
+ fprintf( stderr,
+ "%s: line %d: no set is defined\n",
+ fname, lineno );
+ acl_usage();
+ }
+
+ b->a_set_style = sty;
+ b->a_set_pat = ch_strdup(right);
+
+ continue;
+ }
+
#ifdef SLAPD_ACI_ENABLED
if ( strcasecmp( left, "aci" ) == 0 ) {
if( b->a_aci_at != NULL ) {
acl_usage();
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
if ( right != NULL && *right != '\0' ) {
- b->a_aci_at = at_find( right );
+ rc = slap_str2ad( right, &b->a_aci_at, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: aci \"%s\": %s\n",
+ fname, lineno, right, text );
+ acl_usage();
+ }
+
} else {
- b->a_aci_at = at_find( SLAPD_ACI_DEFAULT_ATTR );
- }
+ rc = slap_str2ad( SLAPD_ACI_ATTR, &b->a_aci_at, &text );
- if( b->a_aci_at == NULL ) {
- fprintf( stderr,
- "%s: line %d: aci attribute type undefined.\n",
- fname, lineno );
- acl_usage();
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: aci \"%s\": %s\n",
+ fname, lineno, SLAPD_ACI_ATTR, text );
+ acl_usage();
+ }
}
- if( strcmp( b->a_aci_at->sat_syntax_oid,
- SLAPD_OID_DN_SYNTAX ) != 0 )
+ if( !is_at_syntax( b->a_aci_at->ad_type,
+ SLAPD_ACI_SYNTAX) )
{
fprintf( stderr,
- "%s: line %d: aci attribute type not of DN syntax.\n",
- fname, lineno );
+ "%s: line %d: aci \"%s\": inappropriate syntax: %s\n",
+ fname, lineno, right,
+ b->a_aci_at->ad_type->sat_syntax_oid );
acl_usage();
}
-#else
- if ( right != NULL && *right != '\0' ) {
- b->a_aci_at = ch_strdup( right );
- } else {
- b->a_aci_at = ch_strdup( SLAPD_ACI_DEFAULT_ATTR );
- }
-#endif
+
continue;
}
#endif /* SLAPD_ACI_ENABLED */
{
slap_access_mask_t mask;
- if( !isalpha(str[0]) ) {
+ if( !ASCII_ALPHA(str[0]) ) {
int i;
if ( str[0] == '=' ) {
#ifdef LDAP_DEBUG
+static char *style_strings[5] = {
+ "regex",
+ "base",
+ "one",
+ "subtree",
+ "children"
+ };
+
+
static void
print_access( Access *b )
{
fprintf( stderr, " %s", b->a_dn_pat );
} else {
- fprintf( stderr, " dn=%s", b->a_dn_pat );
+ fprintf( stderr, " dn.%s=%s", style_strings[b->a_dn_style], b->a_dn_pat );
}
}
if ( b->a_dn_at != NULL ) {
- fprintf( stderr, " dnattr=%s", b->a_dn_at );
+ fprintf( stderr, " dnattr=%s", b->a_dn_at->ad_cname->bv_val );
}
if ( b->a_group_pat != NULL ) {
- fprintf( stderr, " group: %s", b->a_group_pat );
+ fprintf( stderr, " group=%s", b->a_group_pat );
if ( b->a_group_oc ) {
- fprintf( stderr, " objectClass: %s", b->a_group_oc );
+ fprintf( stderr, " objectClass: %s",
+ b->a_group_oc->soc_oclass.oc_oid );
if ( b->a_group_at ) {
- fprintf( stderr, " attributeType: %s", b->a_group_at );
+ fprintf( stderr, " attributeType: %s", b->a_group_at->ad_cname->bv_val );
}
}
}
#ifdef SLAPD_ACI_ENABLED
if ( b->a_aci_at != NULL ) {
- fprintf( stderr, " aci=%s", b->a_aci_at );
+ fprintf( stderr, " aci=%s", b->a_aci_at->ad_cname->bv_val );
}
#endif
if ( a->acl_dn_pat != NULL ) {
to++;
- fprintf( stderr, " dn=%s\n",
- a->acl_dn_pat );
+ fprintf( stderr, " dn.%s=%s\n",
+ style_strings[a->acl_dn_style], a->acl_dn_pat );
}
if ( a->acl_filter != NULL ) {
projects / openldap / blobdiff