-/* 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;
+ const char *text;
+#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("anonymous");
+
+ } 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? 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 {
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();
+ }
+
+
+ if( !is_at_syntax( b->a_dn_at->ad_type,
+ SLAPD_DN_SYNTAX ) )
+ {
+ fprintf( stderr,
+ "%s: line %d: dnattr \"%s\": "
+ "inappropriate syntax: %s\n",
+ fname, lineno, right,
+ b->a_dn_at->ad_type->sat_syntax_oid );
+ acl_usage();
+ }
+
+#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';
b->a_group_pat = ch_strdup( right );
if (value && *value) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ b->a_group_oc = oc_find( value );
+#else
b->a_group_oc = ch_strdup(value);
+#endif
*--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");
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ 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();
+ }
+#else
+ b->a_group_oc = ch_strdup(SLAPD_GROUP_CLASS);
+#endif
+ }
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+#if 0
+ 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();
+ }
+#endif
+#endif
- 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
+ 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();
+ }
+#else
+ b->a_group_at = ch_strdup( SLAPD_GROUP_ATTR );
+#endif
}
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ if( !is_at_syntax( b->a_group_at->ad_type,
+ SLAPD_DN_SYNTAX ) )
+ {
+ fprintf( stderr,
+ "%s: line %d: group \"%s\": inappropriate syntax: %s\n",
+ fname, lineno, right,
+ b->a_group_at->ad_type->sat_syntax_oid );
+ 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_type,
+ b->a_group_oc->soc_oid );
+ acl_usage();
+ }
+ }
+#endif
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 {
+ rc = slap_str2ad( SLAPD_ACI_ATTR, &b->a_aci_at, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: aci \"%s\": %s\n",
+ fname, lineno, SLAPD_ACI_ATTR, text );
+ acl_usage();
+ }
+ }
+
+ if( !is_at_syntax( b->a_aci_at->ad_type,
+ SLAPD_ACI_SYNTAX) )
+ {
+ fprintf( stderr,
+ "%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 );
+ } else {
+ b->a_aci_at = ch_strdup( SLAPD_ACI_ATTR );
+ }
+#endif
continue;
}
-#endif
+#endif /* SLAPD_ACI_ENABLED */
if( right != NULL ) {
/* unsplit */
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 ) {
"<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
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 );
}
if ( b->a_dn_at != NULL ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ fprintf( stderr, " dnattr=%s", b->a_dn_at->ad_cname->bv_val );
+#else
fprintf( stderr, " dnattr=%s", b->a_dn_at );
+#endif
}
if ( b->a_group_pat != NULL ) {
fprintf( stderr, " objectClass: %s", b->a_group_oc );
if ( b->a_group_at ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ fprintf( stderr, " attributeType: %s", b->a_group_at->ad_cname->bv_val );
+#else
fprintf( stderr, " attributeType: %s", b->a_group_at );
+#endif
}
}
}
#ifdef SLAPD_ACI_ENABLED
if ( b->a_aci_at != NULL ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ fprintf( stderr, " aci=%s", b->a_aci_at->ad_cname->bv_val );
+#else
fprintf( stderr, " aci=%s", b->a_aci_at );
+#endif
}
#endif
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";
-
- } 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 );
-}
-
static void
print_acl( Backend *be, AccessControl *a )
projects / openldap / blobdiff