You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dj...@apache.org on 2007/08/10 18:06:55 UTC
svn commit: r564642 - in
/directory/sandbox/djencks/triplesec-jacc2/store/src/main:
java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java
schema/safehaus.schema
Author: djencks
Date: Fri Aug 10 09:06:54 2007
New Revision: 564642
URL: http://svn.apache.org/viewvc?view=rev&rev=564642
Log:
Change to plausible apache-compatible oids
Modified:
directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java
directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/safehaus.schema
Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java?view=diff&rev=564642&r1=564641&r2=564642
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java Fri Aug 10 09:06:54 2007
@@ -560,7 +560,7 @@
// ou=permissions
name.add( "2.5.4.11=permissions" );
// permName=
- name.add( "1.2.6.1.4.1.22555.1.1.1.3.201=" + value );
+ name.add( "1.3.6.1.4.1.18060.0.4.6.2.201=" + value );
if( !next.hasEntry( new EntryOperationContext( name ) ) ) {
throw new SchemaViolationException( "No such permission: " + value );
@@ -586,7 +586,7 @@
name.add( "2.5.4.11=roles" );
// roleName=
- name.add( "1.2.6.1.4.1.22555.1.1.1.3.204=" + value );
+ name.add( "1.3.6.1.4.1.18060.0.4.6.2.204=" + value );
if( !next.hasEntry( new EntryOperationContext( name ) ) ) {
throw new SchemaViolationException( "No such role: " + value );
}
@@ -627,8 +627,8 @@
}
- private static final String PERMNAME_ATTR_OID = "1.2.6.1.4.1.22555.1.1.1.3.201";
- private static final String ROLENAME_ATTR_OID = "1.2.6.1.4.1.22555.1.1.1.3.204";
+ private static final String PERMNAME_ATTR_OID = "1.3.6.1.4.1.18060.0.4.6.2.201";
+ private static final String ROLENAME_ATTR_OID = "1.3.6.1.4.1.18060.0.4.6.2.204";
private void checkNotInUse( NextInterceptor next, LdapDN baseName, LdapDN name )
throws NamingException, SchemaViolationException
Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/safehaus.schema
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/safehaus.schema?view=diff&rev=564642&r1=564641&r2=564642
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/safehaus.schema (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/safehaus.schema Fri Aug 10 09:06:54 2007
@@ -11,53 +11,53 @@
# -----------------------------------------------------------------------------
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.100
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.100
NAME 'safehausUid'
DESC 'A safehaus user id'
SUP uid SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.101
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.101
NAME 'safehausRealm'
DESC 'The domain/realm name of the safehaus user account'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.102
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.102
NAME 'safehausSecret'
DESC 'The shared secret for the Safehaus user'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.103
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.103
NAME 'safehausFactor'
DESC 'The shared moving factor for the Safehaus user'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.104
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.104
NAME 'safehausInfo'
DESC 'Additional information about a Safehaus account'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.105
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.105
NAME 'safehausLabel'
DESC 'Additional information about a Safehaus account'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.106
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.106
NAME 'safehausResynchCount'
DESC 'The number of successful resync attempts so far'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.107
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.107
NAME 'safehausFailuresInEpoch'
DESC 'The number of authentication failures within an epoch used for lockouts'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.108
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.108
NAME 'safehausDeleted'
DESC 'An operational marker attribute for labelling an entry as deleted'
EQUALITY caseIgnoreIA5Match
@@ -67,49 +67,49 @@
NO-USER-MODIFICATION
USAGE directoryOperation )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.109
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.109
NAME 'safehausActivationKey'
DESC 'Activation key for safehaus accounts which if present means the account is not active'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.110
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.110
NAME 'safehausMidletName'
DESC 'Optional name override for the hauskeys midlet'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.111
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.111
NAME 'safehausNotifyBy'
DESC 'Mechanism used to notify the user'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.112
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.112
NAME 'safehausMobileCarrier'
DESC 'The mobile carrier for the cell phone of the user'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.113
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.113
NAME 'safehausTokenPin'
DESC 'The mobile token pin for the hauskeys application'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.114
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.114
NAME 'safehausDisabled'
DESC 'Used to disable user accounts and policyProfiles'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
-objectclass ( 1.2.6.1.4.1.22555.1.1.1.4.100 NAME 'safehausProfile'
+objectclass ( 1.3.6.1.4.1.18060.0.4.6.3.100 NAME 'safehausProfile'
SUP top
AUXILIARY
MUST ( safehausUid $ safehausRealm $ safehausLabel $ safehausSecret $
@@ -121,88 +121,88 @@
# Safehaus Policy Entities
# -----------------------------------------------------------------------------
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.200
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.200
NAME 'appName'
DESC 'the name of an application whose policy is managed by triplesec'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-objectclass ( 1.2.6.1.4.1.22555.1.1.1.4.200 NAME 'policyApplication'
+objectclass ( 1.3.6.1.4.1.18060.0.4.6.3.200 NAME 'policyApplication'
SUP top
STRUCTURAL
MUST ( appName )
MAY ( userPassword $ description ) )
-objectclass ( 1.2.6.1.4.1.22555.1.1.1.4.201 NAME 'policyUser'
+objectclass ( 1.3.6.1.4.1.18060.0.4.6.3.201 NAME 'policyUser'
SUP top
AUXILIARY
MUST ( uid )
MAY ( userPassword $ description $ safehausDisabled ) )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.201
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.201
NAME 'permName'
DESC 'the case sensitive name of a permission within the system, often a meaningless unique id'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-objectclass ( 1.2.6.1.4.1.22555.1.1.1.4.202 NAME 'policyPermission'
+objectclass ( 1.3.6.1.4.1.18060.0.4.6.3.202 NAME 'policyPermission'
SUP top
AUXILIARY
MUST ( permName )
MAY ( description )
)
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.202
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.202
NAME 'grants'
DESC 'the permissions granted to a role or a profile'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.203
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.203
NAME 'denials'
DESC 'the permissions denied for a role or a profile'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.204
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.204
NAME 'roleName'
DESC 'the name of a role'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.205
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.205
NAME 'roles'
DESC 'the roles assigned to a profile'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.206
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.206
NAME 'profileId'
DESC 'a profile identifier'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.207
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.207
NAME 'user'
DESC 'the name of a user defined in the policy store'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-objectclass ( 1.2.6.1.4.1.22555.1.1.1.4.203 NAME 'policyRole'
+objectclass ( 1.3.6.1.4.1.18060.0.4.6.3.203 NAME 'policyRole'
SUP top
AUXILIARY
MUST ( roleName )
MAY ( grants $ denials $ description ) )
-objectclass ( 1.2.6.1.4.1.22555.1.1.1.4.204 NAME 'policyProfile'
+objectclass ( 1.3.6.1.4.1.18060.0.4.6.3.204 NAME 'policyProfile'
SUP top
AUXILIARY
MUST ( profileId $ user )
@@ -212,28 +212,28 @@
# Java permission support
# -----------------------------------------------------------------------------
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.208
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.208
NAME 'permJavaClass'
DESC 'the java class for a permission'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.209
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.209
NAME 'permJavaName'
DESC 'the name of a java permission'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.22555.1.1.1.3.210
+attributetype ( 1.3.6.1.4.1.18060.0.4.6.2.210
NAME 'permJavaActions'
DESC 'the actions of a java permission'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-objectclass ( 1.2.6.1.4.1.22555.1.1.1.4.205 NAME 'javaPermission'
+objectclass ( 1.3.6.1.4.1.18060.0.4.6.3.205 NAME 'javaPermission'
SUP top
AUXILIARY
MUST ( permJavaClass $ permJavaName )