-/* 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
*/
char *left, *right;
AccessControl *a;
Access *b;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ int rc;
+ char *text;
+ static AttributeDescription *member = NULL;
+ static AttributeDescription *aci = NULL;
+#endif
a = NULL;
for ( i = 1; i < argc; i++ ) {
}
if ( strcasecmp( argv[i], "*" ) == 0 ) {
- a->acl_dn_pat = ch_strdup( ".*" );
+ if( a->acl_dn_pat != NULL ) {
+ fprintf( stderr,
+ "%s: line %d: dn pattern"
+ " already specified in to clause.\n",
+ fname, lineno );
+ acl_usage();
+ }
+
+ a->acl_dn_pat = ch_strdup( "*" );
continue;
}
split( argv[i], '=', &left, &right );
+
+ if ( strcasecmp( left, "dn" ) == 0 ) {
+ if( a->acl_dn_pat != NULL ) {
+ fprintf( stderr,
+ "%s: line %d: dn pattern"
+ " already specified in to clause.\n",
+ fname, lineno );
+ acl_usage();
+ }
+
+ if ( right == NULL ) {
+ fprintf( stderr,
+ "%s: line %d: missing \"=\" in \"%s\" in to clause\n",
+ fname, lineno, left );
+ acl_usage();
+ }
+
+ if( *right == '\0' ) {
+ a->acl_dn_pat = ch_strdup("^$");
+
+ } 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 {
+ a->acl_dn_pat = ch_strdup( right );
+ }
+
+ continue;
+ }
+
if ( right == NULL || *right == '\0' ) {
fprintf( stderr,
"%s: line %d: missing \"=\" in (or value after) \"%s\" in to clause\n",
acl_usage();
}
- } else if ( strcasecmp( left, "dn" ) == 0 ) {
- a->acl_dn_pat = ch_strdup( right );
-
} else if ( strncasecmp( left, "attr", 4 ) == 0 ) {
char **alist;
}
}
- if ( a->acl_dn_pat != NULL ) {
+ if ( a->acl_dn_pat != NULL && strcmp(a->acl_dn_pat, "*") == 0) {
+ free( a->acl_dn_pat );
+ a->acl_dn_pat = NULL;
+ }
+
+ if( a->acl_dn_pat != NULL ) {
int e = regcomp( &a->acl_dn_re, a->acl_dn_pat,
REG_EXTENDED | REG_ICASE );
if ( e ) {
split( argv[i], '=', &left, &right );
if ( strcasecmp( argv[i], "*" ) == 0 ) {
- pat = ch_strdup( ".*" );
+ pat = ch_strdup( "*" );
+
} else if ( strcasecmp( argv[i], "anonymous" ) == 0 ) {
pat = ch_strdup( "anonymous" );
+
} else if ( strcasecmp( argv[i], "self" ) == 0 ) {
pat = ch_strdup( "self" );
+
+ } else if ( strcasecmp( argv[i], "users" ) == 0 ) {
+ pat = ch_strdup( "users" );
+
} else if ( strcasecmp( left, "dn" ) == 0 ) {
- regtest(fname, lineno, right);
- pat = ch_strdup( right );
+ 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( "*" );
+
+ } else {
+ regtest(fname, lineno, right);
+ pat = ch_strdup( right );
+ }
+
} else {
pat = NULL;
}
}
if ( strcasecmp( left, "dnattr" ) == 0 ) {
- if( b->a_dn_pat != NULL ) {
+ if( b->a_dn_at != NULL ) {
fprintf( stderr,
- "%s: line %d: dnaddr already specified.\n",
+ "%s: line %d: dnattr already specified.\n",
fname, lineno );
acl_usage();
}
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ rc = slap_str2ad( right, &b->a_dn_at, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: dnattr \"%s\": %s\n",
+ fname, lineno, right, text );
+ acl_usage();
+ }
+
+#ifdef SLAPD_OID_DN_SYNTAX
+ if( strcmp( b->a_dn_at->ad_type->sat_syntax_oid,
+ SLAPD_OID_DN_SYNTAX ) != 0 )
+ {
+ fprintf( stderr,
+ "%s: line %d: dnattr attribute type not of DN syntax.\n",
+ fname, lineno );
+ acl_usage();
+ }
+#endif
+#else
b->a_dn_at = ch_strdup( right );
+#endif
continue;
}
/* format of string is "group/objectClassValue/groupAttrName" */
if ((value = strchr(left, '/')) != NULL) {
*value++ = '\0';
- if (value && *value
+ if (*value
&& (name = strchr(value, '/')) != NULL)
{
*name++ = '\0';
*--value = '/';
} else {
b->a_group_oc = ch_strdup("groupOfNames");
+ }
- if (name && *name) {
- b->a_group_at = ch_strdup(name);
- *--name = '/';
+ if (name && *name) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ rc = slap_str2ad( right, &b->a_group_at, &text );
- } else {
- b->a_group_at = ch_strdup("member");
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: group \"%s\": %s\n",
+ fname, lineno, right, text );
+ acl_usage();
}
+#else
+ b->a_group_at = ch_strdup(name);
+#endif
+ *--name = '/';
+
+ } else {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ b->a_group_at = member;
+#else
+ b->a_group_at = ch_strdup("member");
+#endif
+ }
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ if( b->a_group_at == NULL ) {
+ fprintf( stderr,
+ "%s: line %d: group attribute type undefined.\n",
+ fname, lineno );
+ acl_usage();
}
+
+#ifdef SLAPD_OID_DN_SYNTAX
+ if( strcmp( b->a_group_at->ad_type->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();
+ }
+#endif /* SLAPD_OID_DN_SYNTAX */
+#endif /* SLAPD_SCHEMA_NOT_COMPAT */
continue;
}
acl_usage();
}
- if ( right != NULL && *right != '\0' )
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ if ( right != NULL && *right != '\0' ) {
+ 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 = aci;
+ }
+
+ if( b->a_aci_at == NULL ) {
+ fprintf( stderr,
+ "%s: line %d: aci attribute type undefined.\n",
+ fname, lineno );
+ acl_usage();
+ }
+
+ if( strcmp( b->a_aci_at->ad_type->sat_syntax_oid,
+ SLAPD_OID_ACI_SYNTAX ) != 0 )
+ {
+ fprintf( stderr,
+ "%s: line %d: aci attribute type not of ACI syntax.\n",
+ fname, lineno );
+ acl_usage();
+ }
+#else
+ if ( right != NULL && *right != '\0' ) {
b->a_aci_at = ch_strdup( right );
- else
+ } else {
b->a_aci_at = ch_strdup( SLAPD_ACI_DEFAULT_ATTR );
+ }
+#endif
continue;
}
-#endif
+#endif /* SLAPD_ACI_ENABLED */
if( right != NULL ) {
/* unsplit */
if( i == argc || ( strcasecmp( left, "stop" ) == 0 )) {
/* out of arguments or plain stop */
- ACL_PRIV_ASSIGN(b->a_mask, ACL_NONE);
+ ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
b->a_type = ACL_STOP;
access_append( &a->acl_access, b );
if( strcasecmp( left, "continue" ) == 0 ) {
/* plain continue */
- ACL_PRIV_ASSIGN(b->a_mask, ACL_NONE);
+ ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
b->a_type = ACL_CONTINUE;
access_append( &a->acl_access, b );
if( strcasecmp( left, "break" ) == 0 ) {
/* plain continue */
- ACL_PRIV_ASSIGN(b->a_mask, ACL_NONE);
+ ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
b->a_type = ACL_BREAK;
access_append( &a->acl_access, b );
if ( strcasecmp( left, "by" ) == 0 ) {
/* we've gone too far */
--i;
- ACL_PRIV_ASSIGN(b->a_mask, ACL_NONE);
+ ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
b->a_type = ACL_STOP;
access_append( &a->acl_access, b );
fname, lineno );
} else {
-
#ifdef LDAP_DEBUG
- if (ldap_debug & LDAP_DEBUG_ACL)
- print_acl(be, a);
+ if (ldap_debug & LDAP_DEBUG_ACL)
+ print_acl(be, a);
#endif
if ( a->acl_access == NULL ) {
}
char *
-accessmask2str( slap_access_mask_t mask )
+accessmask2str( slap_access_mask_t mask, char *buf )
{
- static char buf[sizeof("unknown (+wrsca0)")];
int none=1;
+ assert( buf != NULL );
+
if ( ACL_IS_INVALID( mask ) ) {
return "invalid";
}
}
if ( none && ACL_PRIV_ISSET(mask, ACL_PRIV_NONE) ) {
- strcat( buf, "0" );
+ none = 0;
+ strcat( buf, "n" );
}
+ if ( none ) {
+ strcat( buf, "0" );
+ }
+
if ( ACL_IS_LEVEL( mask ) ) {
strcat(buf, ")");
}
} else if( TOLOWER(str[i]) == 'x' ) {
ACL_PRIV_SET(mask, ACL_PRIV_AUTH);
- } else {
+ } else if( str[i] != '0' ) {
ACL_INVALIDATE(mask);
return mask;
}
"<what> ::= * | [dn=<regex>] [filter=<ldapfilter>] [attrs=<attrlist>]\n"
"<attrlist> ::= <attr> | <attr> , <attrlist>\n"
"<attr> ::= <attrname> | entry | children\n"
- "<who> ::= [ * | anonymous | self | dn=<regex> ]\n"
+ "<who> ::= [ * | anonymous | users | self | dn=<regex> ]\n"
"\t[dnattr=<attrname>]\n"
"\t[group[/<objectclass>[/<attrname>]]=<regex>]\n"
"\t[peername=<regex>] [sockname=<regex>]\n"
*l = a;
}
+char *
+access2str( slap_access_t access )
+{
+ if ( access == ACL_NONE ) {
+ return "none";
+
+ } else if ( access == ACL_AUTH ) {
+ return "auth";
+
+ } else if ( access == ACL_COMPARE ) {
+ return "compare";
+
+ } else if ( access == ACL_SEARCH ) {
+ return "search";
+
+ } else if ( access == ACL_READ ) {
+ return "read";
+
+ } else if ( access == ACL_WRITE ) {
+ return "write";
+ }
+
+ return "unknown";
+}
+
+slap_access_t
+str2access( const char *str )
+{
+ if ( strcasecmp( str, "none" ) == 0 ) {
+ return ACL_NONE;
+
+ } else if ( strcasecmp( str, "auth" ) == 0 ) {
+ return ACL_AUTH;
+
+ } else if ( strcasecmp( str, "compare" ) == 0 ) {
+ return ACL_COMPARE;
+
+ } else if ( strcasecmp( str, "search" ) == 0 ) {
+ return ACL_SEARCH;
+
+ } else if ( strcasecmp( str, "read" ) == 0 ) {
+ return ACL_READ;
+
+ } else if ( strcasecmp( str, "write" ) == 0 ) {
+ return ACL_WRITE;
+ }
+
+ return( ACL_INVALID_ACCESS );
+}
+
#ifdef LDAP_DEBUG
static void
print_access( Access *b )
{
+ char maskbuf[ACCESSMASK_MAXLEN];
+
fprintf( stderr, "\tby" );
if ( b->a_dn_pat != NULL ) {
- if( strcmp(b->a_dn_pat, "anonymous") == 0 ) {
- fprintf( stderr, " anonymous" );
-
- } else if( strcmp(b->a_dn_pat, "self") == 0 ) {
- fprintf( stderr, " self" );
+ if( strcmp(b->a_dn_pat, "*") == 0
+ || strcmp(b->a_dn_pat, "users") == 0
+ || strcmp(b->a_dn_pat, "anonymous") == 0
+ || strcmp(b->a_dn_pat, "self") == 0 )
+ {
+ fprintf( stderr, " %s", b->a_dn_pat );
} else {
fprintf( stderr, " dn=%s", b->a_dn_pat );
fprintf( stderr, " %s%s",
b->a_dn_self ? "self" : "",
- accessmask2str( b->a_mask ) );
+ accessmask2str( b->a_mask, maskbuf ) );
- fprintf( stderr, "\n" );
-}
-
-char *
-access2str( slap_access_t access )
-{
- if ( access == ACL_NONE ) {
- return "none";
-
- } else if ( access == ACL_AUTH ) {
- return "auth";
-
- } else if ( access == ACL_COMPARE ) {
- return "compare";
-
- } else if ( access == ACL_SEARCH ) {
- return "search";
+ if( b->a_type == ACL_BREAK ) {
+ fprintf( stderr, " break" );
- } else if ( access == ACL_READ ) {
- return "read";
+ } else if( b->a_type == ACL_CONTINUE ) {
+ fprintf( stderr, " continue" );
- } else if ( access == ACL_WRITE ) {
- return "write";
+ } else if( b->a_type != ACL_STOP ) {
+ fprintf( stderr, " unknown-control" );
}
- return "unknown";
-}
-
-slap_access_t
-str2access( const char *str )
-{
- if ( strcasecmp( str, "none" ) == 0 ) {
- return ACL_NONE;
-
- } else if ( strcasecmp( str, "auth" ) == 0 ) {
- return ACL_AUTH;
-
- } else if ( strcasecmp( str, "compare" ) == 0 ) {
- return ACL_COMPARE;
-
- } else if ( strcasecmp( str, "search" ) == 0 ) {
- return ACL_SEARCH;
-
- } else if ( strcasecmp( str, "read" ) == 0 ) {
- return ACL_READ;
-
- } else if ( strcasecmp( str, "write" ) == 0 ) {
- return ACL_WRITE;
- }
-
- return( ACL_INVALID_ACCESS );
+ fprintf( stderr, "\n" );
}