You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/05/19 13:30:24 UTC
[5/5] directory-fortress-core git commit: Replaced tabs by spaces
Replaced tabs by spaces
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/f02712d4
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/f02712d4
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/f02712d4
Branch: refs/heads/master
Commit: f02712d4ad4b832e9df7ddb6b33645dd1b2497f4
Parents: 4fde4a9
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue May 19 13:29:58 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue May 19 13:29:58 2015 +0200
----------------------------------------------------------------------
build.xml | 126 +-
deprecate/README-QUICKSTART-WINDOWS.html | 216 ++--
ldap/schema/fortress.schema | 452 +++----
ldap/schema/rbac.schema | 260 ++--
.../directory/fortress/core/GlobalIds.java | 3 +-
.../fortress/core/ant/Deladminrole.java | 26 +-
.../directory/fortress/core/rbac/AdminRole.java | 16 +-
.../fortress/core/rbac/AdminRoleDAO.java | 2 +-
.../directory/fortress/core/rbac/ClassUtil.java | 28 +-
.../directory/fortress/core/rbac/Hier.java | 51 +-
.../directory/fortress/core/rbac/OrgUnit.java | 27 +-
.../fortress/core/rbac/OrgUnitDAO.java | 18 +-
.../directory/fortress/core/rbac/PermDAO.java | 38 +-
.../directory/fortress/core/rbac/PermObj.java | 7 +-
.../fortress/core/rbac/Permission.java | 6 +-
.../directory/fortress/core/rbac/Role.java | 1200 +++++++++---------
.../directory/fortress/core/rbac/RoleDAO.java | 20 +-
.../directory/fortress/core/rbac/SDSet.java | 6 +-
.../directory/fortress/core/rbac/SdDAO.java | 4 +-
.../fortress/core/rest/AdminMgrRestImpl.java | 1037 +++++++--------
.../fortress/core/util/time/Constraint.java | 2 +-
.../core/DelegatedAccessMgrConsole.java | 214 ++--
.../core/DelegatedReviewMgrConsole.java | 124 +-
.../fortress/core/FortressConsole.java | 22 +-
.../fortress/core/PolicyMgrConsole.java | 227 ++--
.../fortress/core/ProcessMenuCommand.java | 17 +-
.../fortress/core/ReviewMgrConsole.java | 902 ++++++-------
.../fortress/core/ant/TestAddOrgunit.java | 41 +
.../fortress/core/example/Addexample.java | 25 +-
.../fortress/core/example/Delexample.java | 24 +-
.../fortress/core/example/Example.java | 97 +-
.../core/samples/AllSamplesJUnitTest.java | 41 +-
32 files changed, 2738 insertions(+), 2541 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2d17764..c556ad7 100644
--- a/build.xml
+++ b/build.xml
@@ -655,7 +655,7 @@
<target name="init-openldap-config" depends="init" description="--> map env params from build.properties to scripts and config files">
<echo message="############### Modify slapd configuration per user settings ###############"/>
<delete file="${target.slapd.conf}" failonerror="false"/>
- <copy file="${source.slapd.conf}" tofile="${target.slapd.conf}"/>
+ <copy file="${source.slapd.conf}" tofile="${target.slapd.conf}"/>
<replace file="${target.slapd.conf}" token="@SCHEMA_PATH@" value="${slapd.schema.dir}"/>
<replace file="${target.slapd.conf}" token="@SUFFIX@" value="${suffix}"/>
<replace file="${target.slapd.conf}" token="@PID_PATH@" value="${pid.dir}"/>
@@ -805,12 +805,12 @@
================================= -->
<target name="init-fortress-config-remote" depends="init" description="--> uses external build.properties to create local script and config files.." if="builder.home">
<echo message="############### Import fortress configuration from Builder directory ###############"/>
- <copy file="${builder.bootstrap.conf}" tofile="${dst.bootstrap.conf}"/>
- <copy file="${builder.remote.conf}" tofile="${dst.remote.conf}"/>
- <copy file="${builder.load.bootstrap.script}" tofile="${dst.load.bootstrap.script}"/>
+ <copy file="${builder.bootstrap.conf}" tofile="${dst.bootstrap.conf}"/>
+ <copy file="${builder.remote.conf}" tofile="${dst.remote.conf}"/>
+ <copy file="${builder.load.bootstrap.script}" tofile="${dst.load.bootstrap.script}"/>
<echo message="############### Copy ehcache config to bootstrap config folder ###############"/>
<delete file="${bootstrap.ehcache.conf}"/>
- <copy file="${ehcache.conf}" tofile="${bootstrap.ehcache.conf}"/>
+ <copy file="${ehcache.conf}" tofile="${bootstrap.ehcache.conf}"/>
<echo message="Target init-fortress-config-remote complete."/>
</target>
@@ -822,7 +822,7 @@
<delete file="${dst.bootstrap.conf}"/>
<delete file="${dst.remote.conf}"/>
- <copy file="${src.bootstrap.conf}" tofile="${dst.bootstrap.conf}"/>
+ <copy file="${src.bootstrap.conf}" tofile="${dst.bootstrap.conf}"/>
<replace file="${dst.bootstrap.conf}" token="@SUFFIX@" value="${suffix}"/>
<replace file="${dst.bootstrap.conf}" token="@LDAP_HOST@" value="${ldap.host}"/>
<replace file="${dst.bootstrap.conf}" token="@LDAP_PORT@" value="${ldap.port}"/>
@@ -859,7 +859,7 @@
<replace file="${dst.bootstrap.conf}" token="@TRUST_STORE_PW@" value="${trust.store.password}"/>
<replace file="${dst.bootstrap.conf}" token="@TRUST_STORE_SET_PROPW@" value="${trust.store.set.prop}"/>
- <copy file="${src.remote.conf}" tofile="${dst.remote.conf}"/>
+ <copy file="${src.remote.conf}" tofile="${dst.remote.conf}"/>
<replace file="${dst.remote.conf}" token="@SUFFIX@" value="${suffix}"/>
<replace file="${dst.remote.conf}" token="@LDAP_HOST@" value="${ldap.host}"/>
<replace file="${dst.remote.conf}" token="@LDAP_PORT@" value="${ldap.port}"/>
@@ -892,7 +892,7 @@
<echo message="############### Modify fortress load scripts per user settings ###############"/>
<delete file="${dst.load.bootstrap.script}"/>
- <copy file="${src.load.bootstrap.script}" tofile="${dst.load.bootstrap.script}"/>
+ <copy file="${src.load.bootstrap.script}" tofile="${dst.load.bootstrap.script}"/>
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX_NAME@" value="${suffix.name}"/>
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX_DC@" value="${suffix.dc}"/>
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX_DC2@" value="${suffix.dc2}"/>
@@ -915,7 +915,7 @@
<replace file="${dst.load.bootstrap.script}" token="@GROUP_PROPERTIES@" value="${group.properties}"/>
<echo message="############### Copy ehcache config to bootstrap config folder ###############"/>
<delete file="${bootstrap.ehcache.conf}"/>
- <copy file="${ehcache.conf}" tofile="${bootstrap.ehcache.conf}"/>
+ <copy file="${ehcache.conf}" tofile="${bootstrap.ehcache.conf}"/>
<echo message="Target init-fortress-config-local complete."/>
</target>
@@ -1015,7 +1015,7 @@
<copy todir="${slapd.dir}" file="${target.slapd.conf}"/>
<copy todir="${slapd.dir}" file="${target.symas.conf}"/>
- <antcall target="copy-access-libs"></antcall>
+ <antcall target="copy-access-libs"></antcall>
<antcall target="init-slapd-win-script"></antcall>
<antcall target="start-slapd"></antcall>
<antcall target="load-slapd"></antcall>
@@ -1043,11 +1043,11 @@
================================= -->
<target name="copy-access-libs" depends="init" >
<echo message="############### Copy access log libs ${openldap.install.artifact.dir} to openldap lib folder ${slapd.module.dir}"/>
- <copy todir="${slapd.module.dir}" failonerror="false">
- <fileset dir="${openldap.install.artifact.dir}">
- <include name="**/accesslog*"/>
- </fileset>
- </copy>
+ <copy todir="${slapd.module.dir}" failonerror="false">
+ <fileset dir="${openldap.install.artifact.dir}">
+ <include name="**/accesslog*"/>
+ </fileset>
+ </copy>
</target>
<!-- =================================
@@ -1214,7 +1214,7 @@
<target name="slapd.dir.check">
<condition property="slapd.dir.exists">
<available file="${slapd.exe.location}" type="dir"/>
- </condition>
+ </condition>
</target>
<!-- =================================
@@ -1234,7 +1234,7 @@
<arg value="/${fortress.home.drive}"/>
<arg value="${stop.slapd.script-win}"/>
</exec>
- </target>
+ </target>
<!-- =================================
target: bdb-delete - Use Caution as it removes the file volume containing the BerkeleyDB User data!
@@ -1536,7 +1536,7 @@
================================= -->
<target name="enmasse-maven-install" depends="init" description="--> deploy snapshot version to Maven snapshot repository">
<artifact:mvn pom="${enmasse.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="install"/>
+ <arg value="install"/>
</artifact:mvn>
</target>
@@ -1545,7 +1545,7 @@
================================= -->
<target name="enmasse-maven-deploy" depends="init" description="--> deploy snapshot version to Maven snapshot repository">
<artifact:mvn pom="${enmasse.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="tomcat:deploy"/>
+ <arg value="tomcat:deploy"/>
<arg value="-DfailIfNoTests=false" />
</artifact:mvn>
</target>
@@ -1555,7 +1555,7 @@
================================= -->
<target name="enmasse-maven-redeploy" depends="init" description="--> deploy snapshot version to Maven snapshot repository">
<artifact:mvn pom="${enmasse.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="tomcat:redeploy"/>
+ <arg value="tomcat:redeploy"/>
<arg value="-DfailIfNoTests=false" />
</artifact:mvn>
</target>
@@ -1565,7 +1565,7 @@
================================= -->
<target name="enmasse-maven-test" depends="init" description="--> deploy snapshot version to Maven snapshot repository">
<artifact:mvn pom="${enmasse.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="test"/>
+ <arg value="test"/>
</artifact:mvn>
</target>
@@ -1597,7 +1597,7 @@
================================= -->
<target name="commander-maven-install" depends="init" description="--> deploy snapshot version to Maven snapshot repository">
<artifact:mvn pom="${commander.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="install"/>
+ <arg value="install"/>
</artifact:mvn>
</target>
@@ -1606,7 +1606,7 @@
================================= -->
<target name="commander-maven-deploy" depends="init" description="--> deploy snapshot version to Maven snapshot repository">
<artifact:mvn pom="${commander.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="tomcat:deploy"/>
+ <arg value="tomcat:deploy"/>
</artifact:mvn>
</target>
@@ -1615,7 +1615,7 @@
================================= -->
<target name="commander-maven-redeploy" depends="init" description="--> deploy snapshot version to Maven snapshot repository">
<artifact:mvn pom="${commander.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="tomcat:redeploy"/>
+ <arg value="tomcat:redeploy"/>
</artifact:mvn>
</target>
@@ -1624,7 +1624,7 @@
================================= -->
<target name="commander-maven-load" depends="init" description="--> load Commander test policy into LDAP">
<artifact:mvn pom="${commander.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="test"/>
+ <arg value="test"/>
</artifact:mvn>
</target>
@@ -1634,8 +1634,8 @@
<target name="commander-maven-test" depends="init" description="--> deploy snapshot version to Maven snapshot repository">
<replace file="${commander.dir}/src/test/java/org/openldap/commander/integration/CommanderSeleniumITCase.java" token="http://192.168.1.101:8080" value="http://${http.host}:${http.port}"/>
<artifact:mvn pom="${commander.dir}/pom.xml" mavenHome="${M2_HOME}" fork="true">
- <arg value="verify"/>
- <arg value="-DskipTests=false"/>
+ <arg value="verify"/>
+ <arg value="-DskipTests=false"/>
</artifact:mvn>
</target>
@@ -1643,10 +1643,10 @@
target: download-ivy - pulls down ivy.jar from maven 2 website
================================= -->
<target name="download-ivy" depends="init" description="--> pull the ivy jar dependency" unless="local.mode">
- <!-- download from web site so that it can be used even without any special installation -->
- <echo message="downloading ivy to Ant home: ${ant.home}"/>
- <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
- dest="${ant.home}/lib" usetimestamp="true"/>
+ <!-- download from web site so that it can be used even without any special installation -->
+ <echo message="downloading ivy to Ant home: ${ant.home}"/>
+ <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ant.home}/lib" usetimestamp="true"/>
</target>
<!-- =================================
@@ -1659,8 +1659,8 @@
<!-- =================================
target: clean-cache
================================= -->
- <target name="clean-cache" description="--> clean the ivy cache">
- <ivy:cleancache />
+ <target name="clean-cache" description="--> clean the ivy cache">
+ <ivy:cleancache />
</target>
<!-- =================================
@@ -1679,38 +1679,38 @@
<!-- =================================
Update project version (both build.xml and pom.xml) from SNAPSHOT to RELEASE
================================= -->
- <target name="stage" depends="dist" description="--> deploy release version to Maven staging repository">
- <!-- sign and deploy the main artifact -->
- <artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
- <arg value="-Durl=${maven-staging-repository-url}" />
- <arg value="-DrepositoryId=${maven-staging-repository-id}" />
- <arg value="-DpomFile=pom.xml" />
- <arg value="-Dfile=${maven-jar}" />
+ <target name="stage" depends="dist" description="--> deploy release version to Maven staging repository">
+ <!-- sign and deploy the main artifact -->
+ <artifact:mvn>
+ <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+ <arg value="-Durl=${maven-staging-repository-url}" />
+ <arg value="-DrepositoryId=${maven-staging-repository-id}" />
+ <arg value="-DpomFile=pom.xml" />
+ <arg value="-Dfile=${maven-jar}" />
<arg value="-Pgpg" />
- </artifact:mvn>
-
- <!-- sign and deploy the sources artifact -->
- <artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
- <arg value="-Durl=${maven-staging-repository-url}" />
- <arg value="-DrepositoryId=${maven-staging-repository-id}" />
- <arg value="-DpomFile=pom.xml" />
- <arg value="-Dfile=${maven-sources-jar}" />
- <arg value="-Dclassifier=sources" />
+ </artifact:mvn>
+
+ <!-- sign and deploy the sources artifact -->
+ <artifact:mvn>
+ <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+ <arg value="-Durl=${maven-staging-repository-url}" />
+ <arg value="-DrepositoryId=${maven-staging-repository-id}" />
+ <arg value="-DpomFile=pom.xml" />
+ <arg value="-Dfile=${maven-sources-jar}" />
+ <arg value="-Dclassifier=sources" />
<arg value="-Pgpg" />
- </artifact:mvn>
-
- <!-- sign and deploy the javadoc artifact -->
- <artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
- <arg value="-Durl=${maven-staging-repository-url}" />
- <arg value="-DrepositoryId=${maven-staging-repository-id}" />
- <arg value="-DpomFile=pom.xml" />
- <arg value="-Dfile=${maven-javadoc-jar}" />
- <arg value="-Dclassifier=javadoc" />
+ </artifact:mvn>
+
+ <!-- sign and deploy the javadoc artifact -->
+ <artifact:mvn>
+ <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+ <arg value="-Durl=${maven-staging-repository-url}" />
+ <arg value="-DrepositoryId=${maven-staging-repository-id}" />
+ <arg value="-DpomFile=pom.xml" />
+ <arg value="-Dfile=${maven-javadoc-jar}" />
+ <arg value="-Dclassifier=javadoc" />
<arg value="-Pgpg" />
- </artifact:mvn>
- </target>
+ </artifact:mvn>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/deprecate/README-QUICKSTART-WINDOWS.html
----------------------------------------------------------------------
diff --git a/deprecate/README-QUICKSTART-WINDOWS.html b/deprecate/README-QUICKSTART-WINDOWS.html
index 4e34fa0..4601086 100644
--- a/deprecate/README-QUICKSTART-WINDOWS.html
+++ b/deprecate/README-QUICKSTART-WINDOWS.html
@@ -64,40 +64,40 @@ These instructions are intended for new users who want to quickly learn how to u
<hr>
<li>
<h3>Instructions to extract and configure Fortress Builder Package to Target System</h3>
- <ol type="A">
+ <ol type="A">
<li>Copy fortressBuilder-[platform]-[version].zip to hard drive on target server env.</li>
-<br>
+<br>
<li>Extract the zip. The location for archive can vary according to requirements. The location of package will be referred to as <em>FORTRESS_HOME</em> later on.</li>
-<br>
+<br>
</ol>
</li>
<hr>
<li>
<h3>Instructions to run the Fortress Ant Build</h3>
- <ol type="A">
+ <ol type="A">
<li>
From FORTRESS_HOME root folder, edit the b.bat script to point to java home:
<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">set JAVA_HOME=\Progra~1\Java\jdk1.7.0
</p></pre>
- </li>
- <img src="../images/Screenshot28-edit-javahome-win.png" /><br><br>
+ </li>
+ <img src="../images/Screenshot28-edit-javahome-win.png" /><br><br>
<li>
Run the distribution target:
-<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">b.bat dist
+<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">b.bat dist
</p></pre>
- <img src="../images/Screenshot29-ant-dist-win.png" />
+ <img src="../images/Screenshot29-ant-dist-win.png" />
<br>Note: The b.bat file referred to here uses Ant package that is local to Fortress quickstart package.
- </li>
-<br>
+ </li>
+<br>
<li>
Verify it ran correctly according to Ant:
<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">BUILD SUCCESSFUL
</p></pre>
- <img src="../images/Screenshot30-ant-dist-success-win.png" /><br><br>
- </li>
+ <img src="../images/Screenshot30-ant-dist-success-win.png" /><br><br>
+ </li>
</ol>
You may now view the project binaries and documentation located under FORTRESS_HOME/dist.
- <br><br><img src="../images/Screenshot5-dist-listing.png" /><br><br>
+ <br><br><img src="../images/Screenshot5-dist-listing.png" /><br><br>
</li>
<hr>
<li>
@@ -108,7 +108,7 @@ You may now view the project binaries and documentation located under FORTRESS_H
<ol type="A">
<br>
- <li>
+ <li>
From FORTRESS_HOME root folder, edit the build.properties file, setting the 3 properties below to match your environment:
<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">
slapd.exe.drive=C <-- contains the drive letter for openldap server
@@ -116,81 +116,81 @@ slapd.exe.dir=OpenLDAP <-- contains the folder to load openldap server bi
fortress.home.drive=C <-- contains the drive letter that you extracted fortress' builder package to.
</p></pre>
If you are not sure, what to use, the defaults usually work. Here's a screen shot of the build.properties.<br><br>
- <img src="../images/Screenshot39-build-properties-win.png" /><br><br>
- </li>
+ <img src="../images/Screenshot39-build-properties-win.png" /><br><br>
+ </li>
</strong>
- <li>
+ <li>
From FORTRESS_HOME root folder, enter the following command from a system prompt:
<pre><p style="font-family:monospace;color:blue;font-size:14px;">b init-slapd
</p></pre>
<br>Note: You will need to reply 'Yes' to the pop-up message:<br>
- <img src="../images/Screenshot33-window-warning.png" /><br><br>
+ <img src="../images/Screenshot33-window-warning.png" /><br><br>
<br>Note: You will need to reply 'Allow' to the pop-up security warning message if you intend to allow other machines to communicate with ldap server:<br>
- <img src="../images/Screenshot40-firewall-warning-win.png " /><br><br>
+ <img src="../images/Screenshot40-firewall-warning-win.png " /><br><br>
- <img src="../images/Screenshot31-init-slapd-win.png" /><br><br>
- </li>
+ <img src="../images/Screenshot31-init-slapd-win.png" /><br><br>
+ </li>
<li>
Verify it ran correctly according to Ant.
<pre><p style="font-family:monospace;color:blue;font-size:14px;">BUILD SUCCESSFUL
</p></pre>
- <img src="../images/Screenshot32-init-slapd-success-win.png" /><br><br>
+ <img src="../images/Screenshot32-init-slapd-success-win.png" /><br><br>
<li>
After above step completes, Symas OpenLDAP will be installed, configured and loaded with fortress bootstrap config. This
step also runs provisioning scripts which may be tailored according to requirements. Check out the xml load scripts
in FORTRESS_HOME/ldap/setup folder.
-<br><br>
- </li>
+<br><br>
+ </li>
<li>
Point your preferred LDAP browser, ours is <a href="http://directory.apache.org/studio/">Apache Directory Studio</a>, to the installed directory.
-
+
The configuration parameters you'll need to browse can be found in the generated 'slapd.conf' file.
<br><br>
To view data stored in default database:
-<pre><p style="font-family:monospace;color:blue;font-size:14px;">suffix "dc=openldap,dc=org"
+<pre><p style="font-family:monospace;color:blue;font-size:14px;">suffix "dc=openldap,dc=org"
rootdn "cn=Manager,dc=openldap,dc=org"
rootpw "secret"</p></pre>
The root pw will be encrypted before stored in slapd.conf
- <br><br><img src="../images/Screenshot8-ldap-browser.png" /><br><br>
-
+ <br><br><img src="../images/Screenshot8-ldap-browser.png" /><br><br>
+
To view data stored in audit log database:
<pre><p style="font-family:monospace;color:blue;font-size:14px;">suffix "cn=log"
rootdn "cn=Manager,cn=log"
rootpw "secret"</p></pre>
The log root pw will be encrypted before stored in slapd.conf
- <br><br><img src="../images/Screenshot9-ldap-browser-log.png" /><br><br>
-
- </li>
+ <br><br><img src="../images/Screenshot9-ldap-browser-log.png" /><br><br>
+
+ </li>
</ol>
</li>
<hr>
<li>
<h3>Instructions to regression test Fortress and Symas OpenLDAP on target machine</h3>
- <ol type="A">
+ <ol type="A">
<li>From FORTRESS_HOME root folder, enter the following command from a system prompt:
<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">b test-full
</p></pre>
- </li>
- <img src="../images/Screenshot34-ant-test-init-win.png" /><br><br>
-
+ </li>
+ <img src="../images/Screenshot34-ant-test-init-win.png" /><br><br>
+
<li>Verify these tests ran with no ERRORS.
-<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">BUILD SUCCESSFUL
+<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">BUILD SUCCESSFUL
</p></pre>
- </li>
- <img src="../images/Screenshot35-ant-test-init-success-win.png" /><br><br>
+ </li>
+ <img src="../images/Screenshot35-ant-test-init-success-win.png" /><br><br>
<li>
To re-run these tests:
<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">b test-full
</p></pre>
- </li>
+ </li>
</ol>
Note 1: WARNING messages in test output are good as these are negative tests in action:
- <br><img src="../images/Screenshot12-junit-warn.png" />
+ <br><img src="../images/Screenshot12-junit-warn.png" />
<br><br>Note 2: If you made it this far without junit or ant ERRORS, the Fortress and Symas OpenLDAP IAM system are certified to run on your machine.
<br><br>Note 3: These tests load tens of thousands of records into your newly installed directory.
The 'init-slapd' target may be re-run after the 'test-full-init' and 'test-full' targets have completed. This will delete the test data from the directory
@@ -231,23 +231,23 @@ Click on links on top or bottons on side of page to navigate between pages
<li>
<h3>Instructions to run the Fortress Command Line Interpreter (CLI) utility (optional)</h3>
This command line tool provides an interactive session with the user based on a simple command line syntax.<br><br>
- <ol type="A">
+ <ol type="A">
<li>
To start the CLI, enter:<pre><p style="font-family:monospace;color:blue;font-size:14px;">b cli
</p></pre>
- <img src="../images/Screenshot36-ant-cli-win.png" /><br><br>
+ <img src="../images/Screenshot36-ant-cli-win.png" /><br><br>
Which will bring up the command interpreter:
- <br><img src="../images/Screenshot14-cli.png" /><br><br>
- </li>
+ <br><img src="../images/Screenshot14-cli.png" /><br><br>
+ </li>
<li>
enter the command:
<pre><p style="font-family:monospace;color:blue;font-size:14px;">review fuser -u demo
</p></pre>
- <img src="../images/Screenshot15-cli-review.png" /><br><br>
+ <img src="../images/Screenshot15-cli-review.png" /><br><br>
This example will return all users with userId that begins with 'demo':<br><br>
<img src="../images/Screenshot16-cli-fuser.png" /><br><br>
- </li>
+ </li>
<li>
To learn more about the CLI and what it can do, follow instructions in the command line interpreter reference
manual in the javadoc located here:
@@ -255,7 +255,7 @@ manual in the javadoc located here:
<a href="./dist/docs/api/org/openldap/fortress/cli/package-summary.html">Command Line Interpreter</a>
<br><br>
Note: if javadocs are not found, go to Section X
- </li>
+ </li>
</ol>
</li>
<hr>
@@ -263,71 +263,71 @@ Note: if javadocs are not found, go to Section X
<h3>Instructions to run Fortress Console (optional)</h3>
For tasks like one-time setup of new users, password resets, searches
the Fortress Console application can be used.<br><br>
- <ol type="A">
+ <ol type="A">
<li>
From FORTRESS_HOME root folder, enter the following command
from a system prompt:
<pre><p style="font-family:monospace;color:blue;font-size:14px;">b console
</p></pre>
<img src="../images/Screenshot37-ant-console-win.png" /><br><br>
- </li>
-
+ </li>
+
<li>
Console Screenshots...
<ol type="1">
- <br>
+ <br>
<li>
Main Menu:
<br><img src="../images/Screenshot18-console-main.png" /><br>
- </li>
- <br>
+ </li>
+ <br>
<li>
- Enter choice and follow the screen prompts to edit RBAC data:
- <br><img src="../images/Screenshot19-console-admin.png" /><br>
- </li>
- <br>
-
+ Enter choice and follow the screen prompts to edit RBAC data:
+ <br><img src="../images/Screenshot19-console-admin.png" /><br>
+ </li>
+ <br>
+
<li>
Enter choice and follow the screen prompts to search RBAC data:
<br><img src="../images/Screenshot20-console-review.png" /><br>
- </li>
- <br>
+ </li>
+ <br>
<li>
Enter choice and follow the screen prompts to test RBAC policies:
<br><img src="../images/Screenshot21-console-access.png" /><br>
- </li>
- <br>
+ </li>
+ <br>
<li>
Enter choice and follow the screen prompts to setup ARBAC delegated policies:
<br><img src="../images/Screenshot22-console-deladmin.png" /><br>
- </li>
- <br>
+ </li>
+ <br>
<li>
Enter choice and follow the screen prompts to search through the AUDIT log:
<br><img src="../images/Screenshot23-console-audit.png" />
- </li>
+ </li>
</ol>
- </li>
+ </li>
</ol>
</li>
<hr>
<li>
<h3>Instructions to generate and view Javadoc (optional)</h3>
- <ol type="A">
+ <ol type="A">
<li>
Run the javadoc target:
<pre><p style="font-family:monospace;color:blue;font-size:14px;">b javadoc
</p></pre>
<img src="../images/Screenshot38-javadoc-win.png" /><br><br>
- </li>
+ </li>
<li>Navigate to where docs are genned:</li>
- <br>
+ <br>
<img src="../images/Screenshot25-javadoc-listing.png" /><br><br>
<li>Open 'index.html' using your preferred HTML Browser:</li>
<img src="../images/Screenshot26-javadoc.png" /><br><br>
-
+
<li>The javadoc provides coverage of the Fortress APIs and also provides explanations on how RBAC, ARBAC, PW Policies and Audit work.</li>
- <br> <a href=""></a>
+ <br> <a href=""></a>
<li>
Good places to start learning about Fortress:
<ul><br>
@@ -337,13 +337,13 @@ Good places to start learning about Fortress:
<li><a href="./dist/docs/api/org/openldap/fortress/cli/package-summary.html">Command Line Interpreter</a></li>
<li><a href="./dist/docs/api/org/openldap/fortress/ant/FortressAntTask.html">FortressAntTask</a></li>
</ul>
- </li>
+ </li>
</ol>
<hr>
<li>
<h3>Instructions to install EnMasse Policy Server Demo (optional)</h3>
- <ol type="A">
+ <ol type="A">
<li>
Run the install-enmasse-demo target:
<pre><p style="font-family:monospace;color:blue;font-size:14px;">b install-enmasse-demo
@@ -354,15 +354,15 @@ Run the install-enmasse-demo target:
Verify it ran correctly according to Ant.
<li>
After above step completes, Fortress EnMasse will be installed
-<br><br>
- </li>
- </ol>
+<br><br>
+ </li>
+ </ol>
<hr>
<li>
<h3>Instructions to regression test EnMasse Policy server on target machine (optional)</h3>
<ol type="A">
-
- <li>Edit file named 'build.properties' and enable REST protocol here:
+
+ <li>Edit file named 'build.properties' and enable REST protocol here:
<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">enable.mgr.impl.rest=true
</p></pre>
Accept the defaults for other HTTP parameters in build.properties:
@@ -371,67 +371,67 @@ http.pw=gX9JbCTxJW5RiH+otQEX0Ja0RIAoPBQf
http.host=localhost
http.port=8080
</p></pre>
- </li>
- Should look like the following:
- <br><br><img src="../images/Screenshot41-enmasse-http-settings.png" /><br><br>
-
- <li>Save and exit the text file editor
- </li><br>
-
+ </li>
+ Should look like the following:
+ <br><br><img src="../images/Screenshot41-enmasse-http-settings.png" /><br><br>
+
+ <li>Save and exit the text file editor
+ </li><br>
+
<li>From FORTRESS_HOME root folder, enter the following command from a system prompt:
-<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">b test-full
+<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">b test-full
</p></pre>
- </li>
- <img src="../images/Screenshot10-ant-test-init.png" /><br><br>
+ </li>
+ <img src="../images/Screenshot10-ant-test-init.png" /><br><br>
Note: The EnMasse regression tests will run for around 10 minutes.<br><br>
<li>Verify these tests ran with no ERRORS.
-<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">BUILD SUCCESSFUL
+<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">BUILD SUCCESSFUL
</p></pre>
- </li>
- <img src="../images/Screenshot43-ant-enmasse-test-success.png" /><br><br>
+ </li>
+ <img src="../images/Screenshot43-ant-enmasse-test-success.png" /><br><br>
<li>
This regression test may be rerun as often as necessary:
<br><pre><p style="font-family:monospace;color:blue;font-size:14px;">b test-full
</p></pre>
- </li>
+ </li>
Note 1: WARNING messages in test output are good as these are negative tests in action:
- <br><img src="../images/Screenshot12-junit-warn.png" />
+ <br><img src="../images/Screenshot12-junit-warn.png" />
<br><br>Note 2: If you made it this far without junit or ant ERRORS, EnMasse is installed and certified to run on your machine.
<br><br>Note 3: These tests load tens of thousands of records into your directory.
The 'test-full' target may be re-run as often as necessary. After regressions testing have completed, you may run the 'init-slapd' target to remove all test data from the directory.
</li>
- </li>
- </ol>
+ </li>
+ </ol>
<hr>
-
+
<hr>
<li>
<h3>More Utilities</h3>
Other execution targets:
<ol type="A">
- <br>
- <li>
+ <br>
+ <li>
'test-samples' - contains examples of how the Fortress API's work
check out the following javadoc for more info on the samples package:
-<a href="./dist/docs/samples/index.html">Samples Javadoc</a>
- </li>
- <br>
+<a href="./dist/docs/samples/index.html">Samples Javadoc</a>
+ </li>
+ <br>
<li>
'admin' - provides an XML-centric way to provision RBAC data policies and user accounts.
-check out the following javadoc for more info on this utility:
+check out the following javadoc for more info on this utility:
<a href="./dist/docs/api/org/openldap/fortress/ant/FortressAntTask.html">Fortress Ant admin script utility document</a>
- </li>
- <br>
+ </li>
+ <br>
<li>'encrypt' - interface to jacypt encryption utility</li>
- <br>
+ <br>
<li>'start-slapd' - Starts OpenLDAP on target machine.</li>
- <br>
+ <br>
<li>'stop-slapd' - Stops OpenLDAP on target machine.</li>
Note: for slapd commands sudo or elevated privileges may be required.
- <br><br>
+ <br><br>
<li>display all ant targets available:
<br><img src="../images/Screenshot27-ant-p.png" /><br><br>
- </li>
+ </li>
</ol>
</li>
</ol>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/ldap/schema/fortress.schema
----------------------------------------------------------------------
diff --git a/ldap/schema/fortress.schema b/ldap/schema/fortress.schema
index 78bcd37..c67f82e 100644
--- a/ldap/schema/fortress.schema
+++ b/ldap/schema/fortress.schema
@@ -35,360 +35,360 @@
# A1: Permission Name, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.1
NAME 'ftPermName'
- DESC 'Fortress Permission Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Permission Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A2: Permission Operation Name, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.2
NAME 'ftOpNm'
- DESC 'Fortress Permission Operation Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Permission Operation Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A3: Permission Object Name, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.3
NAME 'ftObjNm'
- DESC 'Fortress Permission Object Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Permission Object Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A4: Permission Object ID, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.4
NAME 'ftObjId'
- DESC 'Fortress Permission Object ID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Permission Object ID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A5: Role Name, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.5
NAME 'ftRoleName'
- DESC 'Fortress Role Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Role Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A6: TimeOut, type INTEGER, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.6
NAME 'ftTimeOut'
- DESC 'Fortress TimeOut'
- EQUALITY integerMatch
- ORDERING integerOrderingMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+ DESC 'Fortress TimeOut'
+ EQUALITY integerMatch
+ ORDERING integerOrderingMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
# A7: Group Names, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.7
NAME 'ftGroups'
- DESC 'Fortress Group Names'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress Group Names'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A8: Role Names, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.8
NAME 'ftRoles'
- DESC 'Fortress Role Names'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress Role Names'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A9: User IDs, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.9
NAME 'ftUsers'
- DESC 'Fortress User IDs'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress User IDs'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A10: Properties, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.10
NAME 'ftProps'
- DESC 'Fortress Properties'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress Properties'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A11: Type Name, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.11
NAME 'ftType'
- DESC 'Fortress Type Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Type Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A12: Unique ID, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.12
NAME 'ftId'
- DESC 'Fortress Entity Unique ID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Entity Unique ID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A13: User Temporal Constraint, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.13
NAME 'ftCstr'
- DESC 'Fortress User Temporal Constraint'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress User Temporal Constraint'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A14: User Role Assignments, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.14
NAME 'ftRA'
- DESC 'Fortress User Role Assignments'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress User Role Assignments'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A15: User Role Constraints, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.15
NAME 'ftRC'
- DESC 'Fortress User Role Constraints'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress User Role Constraints'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A16: Separation of Duties Set Name, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.16
NAME 'ftSetName'
- DESC 'Fortress Separation of Duties Set Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Separation of Duties Set Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A17: Separation of Duties Set Cardinality, type INTEGER, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.17
NAME 'ftSetCardinality'
- DESC 'Fortress Separation of Duties Set Cardinality'
- EQUALITY integerMatch
- ORDERING integerOrderingMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+ DESC 'Fortress Separation of Duties Set Cardinality'
+ EQUALITY integerMatch
+ ORDERING integerOrderingMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
# A18: Child to Parent Relationships, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.18
NAME 'ftRels'
- DESC 'Fortress Child to Parent Relationships'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress Child to Parent Relationships'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A19: User Organizational Unit Pool, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.19
NAME 'ftOSU'
- DESC 'Fortress User Organizational Unit Pool'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress User Organizational Unit Pool'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A20: Permission Organizational Unit Pool, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.20
NAME 'ftOSP'
- DESC 'Fortress Permission Organizational Unit Pool'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress Permission Organizational Unit Pool'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A21: Admin Role Constraints, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.21
NAME 'ftARC'
- DESC 'Fortress Admin Role Constraints'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress Admin Role Constraints'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A22: Admin Role Assignments, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.22
NAME 'ftARA'
- DESC 'Fortress Admin Role Assignments'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress Admin Role Assignments'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A23: Role Hierarchy Range, type STRING
attributetype ( 1.3.6.1.4.1.1.38088.1.23
NAME 'ftRange'
- DESC 'Fortress Role Hierarchy Range'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Role Hierarchy Range'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A24: Audit Modifier Internal UserID, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.24
NAME 'ftModifier'
- DESC 'Fortress Audit Modifier Internal UserID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Audit Modifier Internal UserID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A25: Audit Modifier Operation Code, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.25
NAME 'ftModCode'
- DESC 'Fortress Audit Modifier Operation Code'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Audit Modifier Operation Code'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A26: Audit Modifier Unique ID, type STRING, SINGLE VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.26
NAME 'ftModId'
- DESC 'Fortress Audit Modifier Unique ID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'Fortress Audit Modifier Unique ID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
# A27: System User Flag, type BOOLEAN
attributetype ( 1.3.6.1.4.1.1.38088.1.27
NAME 'ftSystem'
- DESC 'Fortress System User'
- EQUALITY booleanMatch
+ DESC 'Fortress System User'
+ EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
# A28: Parent Nodes, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.28
NAME 'ftParents'
- DESC 'Fortress Parent Nodes'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'Fortress Parent Nodes'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A29: Protocol, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.29
NAME 'configProtocol'
- DESC 'LDAP Group protocol attribute'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'LDAP Group protocol attribute'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
# A30: Config params, type STRING, MULTI VALUE
attributetype ( 1.3.6.1.4.1.1.38088.1.30
NAME 'configParameter'
- DESC 'LDAP Group config properties'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'LDAP Group config properties'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
######################################################################
## 2. OpenLDAP Fortress Structural object class definitions
######################################################################
## OC1: Fortress Roles Structural Object Class
-objectclass ( 1.3.6.1.4.1.38088.2.1
+objectclass ( 1.3.6.1.4.1.38088.2.1
NAME 'ftRls'
- DESC 'Fortress Role Structural Object Class'
+ DESC 'Fortress Role Structural Object Class'
SUP organizationalrole
STRUCTURAL
- MUST (
- ftId $
- ftRoleName
- )
+ MUST (
+ ftId $
+ ftRoleName
+ )
MAY (
- description $
+ description $
ftCstr $
ftParents
- )
- )
+ )
+ )
## OC2: Fortress Permission Structural Object Class
-objectclass ( 1.3.6.1.4.1.38088.2.2
+objectclass ( 1.3.6.1.4.1.38088.2.2
NAME 'ftObject'
- DESC 'Fortress Permission Object Class'
+ DESC 'Fortress Permission Object Class'
SUP organizationalunit
STRUCTURAL
- MUST (
- ftId $
- ftObjNm
- )
+ MUST (
+ ftId $
+ ftObjNm
+ )
MAY (
- ftType
- )
- )
+ ftType
+ )
+ )
## OC3: Fortress Operation Structural Object Class
-objectclass ( 1.3.6.1.4.1.38088.2.3
+objectclass ( 1.3.6.1.4.1.38088.2.3
NAME 'ftOperation'
- DESC 'Fortress Permission Operation Structural Object Class'
+ DESC 'Fortress Permission Operation Structural Object Class'
SUP organizationalrole
STRUCTURAL
- MUST (
- ftId $
- ftPermName $
- ftObjNm $
- ftOpNm
- )
+ MUST (
+ ftId $
+ ftPermName $
+ ftObjNm $
+ ftOpNm
+ )
MAY (
ftObjId $
- ftRoles $
- ftUsers $
- ftType
- )
- )
+ ftRoles $
+ ftUsers $
+ ftType
+ )
+ )
## OC4: Fortress Static Separation of Duties Structural Object Class
-objectclass ( 1.3.6.1.4.1.38088.2.4
+objectclass ( 1.3.6.1.4.1.38088.2.4
NAME 'ftSSDSet'
- DESC 'Fortress Role Static Separation of Duty Set Structural Object Class'
+ DESC 'Fortress Role Static Separation of Duty Set Structural Object Class'
SUP organizationalrole
STRUCTURAL
- MUST (
- ftId $
- ftSetName $
- ftSetCardinality
- )
+ MUST (
+ ftId $
+ ftSetName $
+ ftSetCardinality
+ )
MAY (
- ftRoles $
- description
- )
- )
+ ftRoles $
+ description
+ )
+ )
## OC5: Fortress Dynamic Separation of Duties Structural Object Class
-objectclass ( 1.3.6.1.4.1.38088.2.5
+objectclass ( 1.3.6.1.4.1.38088.2.5
NAME 'ftDSDSet'
- DESC 'Fortress Role Dynamic Separation of Duty Set Structural Object Class'
+ DESC 'Fortress Role Dynamic Separation of Duty Set Structural Object Class'
SUP organizationalrole
STRUCTURAL
- MUST (
- ftId $
- ftSetName $
- ftSetCardinality
- )
+ MUST (
+ ftId $
+ ftSetName $
+ ftSetCardinality
+ )
MAY (
- ftRoles $
- description
- )
- )
+ ftRoles $
+ description
+ )
+ )
## OC6: Fortress Organizational Structural Object Class
-objectclass ( 1.3.6.1.4.1.38088.2.6
+objectclass ( 1.3.6.1.4.1.38088.2.6
NAME 'ftOrgUnit'
- DESC 'Fortress OrgUnit Structural Object Class'
+ DESC 'Fortress OrgUnit Structural Object Class'
SUP organizationalunit
STRUCTURAL
- MUST (
- ftId
- )
+ MUST (
+ ftId
+ )
MAY (
ftParents
- )
- )
+ )
+ )
## OC7: Fortress Hierarchies Structural Object Class
-objectclass ( 1.3.6.1.4.1.38088.2.7
+objectclass ( 1.3.6.1.4.1.38088.2.7
NAME 'ftHier'
- DESC 'Fortress Hierarchy Structural Object Class'
+ DESC 'Fortress Hierarchy Structural Object Class'
SUP organizationalrole
STRUCTURAL
- MUST (
- cn
- )
+ MUST (
+ cn
+ )
MAY (
- ftRels $
- description
- )
- )
+ ftRels $
+ description
+ )
+ )
## OC8: LDAP Configuration Group Structural Object Class
objectClass ( 1.3.6.1.4.1.38088.2.8
@@ -405,52 +405,52 @@ objectClass ( 1.3.6.1.4.1.38088.2.8
## AC1: Fortress User Attributes Auxiliary Object Class
objectclass ( 1.3.6.1.4.1.38088.3.1
- NAME 'ftUserAttrs'
- DESC 'Fortress User Attribute AUX Object Class'
- AUXILIARY
- MUST (
- ftId
- )
- MAY (
- ftRC $
- ftRA $
- ftARC $
- ftARA $
- ftCstr $
+ NAME 'ftUserAttrs'
+ DESC 'Fortress User Attribute AUX Object Class'
+ AUXILIARY
+ MUST (
+ ftId
+ )
+ MAY (
+ ftRC $
+ ftRA $
+ ftARC $
+ ftARA $
+ ftCstr $
ftSystem
- )
- )
+ )
+ )
## AC2: Fortress Properties Auxiliary Object Class
objectclass ( 1.3.6.1.4.1.38088.3.2
- NAME 'ftProperties'
- DESC 'Fortress Properties AUX Object Class'
- AUXILIARY
- MAY (
- ftProps
- )
- )
+ NAME 'ftProperties'
+ DESC 'Fortress Properties AUX Object Class'
+ AUXILIARY
+ MAY (
+ ftProps
+ )
+ )
## AC3: Fortress Organizational Pools Auxiliary Object Class
objectclass ( 1.3.6.1.4.1.38088.3.3
- NAME 'ftPools'
- DESC 'Fortress Pools AUX Object Class'
- AUXILIARY
- MAY (
- ftOSU $
- ftOSP $
- ftRange
- )
- )
+ NAME 'ftPools'
+ DESC 'Fortress Pools AUX Object Class'
+ AUXILIARY
+ MAY (
+ ftOSU $
+ ftOSP $
+ ftRange
+ )
+ )
## AC4: Fortress Audit Modification Auxiliary Object Class
objectclass ( 1.3.6.1.4.1.38088.3.4
- NAME 'ftMods'
- DESC 'Fortress Modifiers AUX Object Class'
- AUXILIARY
- MAY (
- ftModifier $
- ftModCode $
- ftModId
- )
- )
\ No newline at end of file
+ NAME 'ftMods'
+ DESC 'Fortress Modifiers AUX Object Class'
+ AUXILIARY
+ MAY (
+ ftModifier $
+ ftModCode $
+ ftModId
+ )
+ )
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/ldap/schema/rbac.schema
----------------------------------------------------------------------
diff --git a/ldap/schema/rbac.schema b/ldap/schema/rbac.schema
index 28cbf8c..213f792 100644
--- a/ldap/schema/rbac.schema
+++ b/ldap/schema/rbac.schema
@@ -33,166 +33,166 @@ objectIdentifier RBACobjectClass RBAC:4
## A1: rbacSessid, type STRING, SINGLE VALUE
attributetype ( RBACattributeType:1
NAME 'rbacSessid'
- DESC 'RBAC Session ID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC Session ID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
## A2: rbacRoles, type STRING, MULTI VALUE
attributetype ( RBACattributeType:2
NAME 'rbacRoles'
- DESC 'RBAC User Role Assignments'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC User Role Assignments'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## A3: User Role Constraints, type STRING, MULTI VALUE
attributetype ( RBACattributeType:3
NAME 'rbacRoleConstraints'
- DESC 'RBAC User Role Constraints'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC User Role Constraints'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## A4: rbacUserdn, type STRING, SINGLE VALUE
## A4: should be DN syntax
attributetype ( RBACattributeType:4
NAME 'rbacUserDN'
- DESC 'RBAC User DN'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC User DN'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
#
## A5: Permission Operation Name, type STRING, SINGLE VALUE
attributetype ( RBACattributeType:5
NAME 'rbacOpName'
- DESC 'RBAC Permission Operation Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC Permission Operation Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
##
## A6: Permission Object Name, type STRING, SINGLE VALUE
attributetype ( RBACattributeType:6
NAME 'rbacObjName'
- DESC 'RBAC Permission Object Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC Permission Object Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
#
## A4: Permission Object ID, type STRING, SINGLE VALUE
#attributetype ( 1.3.6.1.4.1.1.38088.1.4
# NAME 'ftObjId'
-# DESC 'Fortress Permission Object ID'
-# EQUALITY caseIgnoreMatch
-# SUBSTR caseIgnoreSubstringsMatch
-# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+# DESC 'Fortress Permission Object ID'
+# EQUALITY caseIgnoreMatch
+# SUBSTR caseIgnoreSubstringsMatch
+# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
#
#
## A5: Role Name, type STRING, SINGLE VALUE
attributetype ( RBACattributeType:7
NAME 'rbacRoleName'
- DESC 'RBAC Role Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC Role Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
## A6: tenant id, type STRING, SINGLE VALUE
attributetype ( RBACattributeType:8
NAME 'tenantid'
- DESC 'RBAC tenant id'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC tenant id'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
## A7: Audit operation id, type STRING, SINGLE VALUE
attributetype ( RBACattributeType:9
NAME 'rbacAuditOp'
- DESC 'RBAC operation id'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC operation id'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
## A8: Audit roles, type STRING, MULTIPLE VALUES
attributetype ( RBACattributeType:10
NAME 'rbacAuditRoles'
- DESC 'RBAC Roles in a session '
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC Roles in a session '
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## A9: Audit requested roles, type STRING, MULTIPLE VALUES
attributetype ( RBACattributeType:11
NAME 'rbacAuditRequestedRoles'
- DESC 'RBAC Roles in a request'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC Roles in a request'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## A10: Audit resources, type STRING, MULTIPLE VALUES
attributetype ( RBACattributeType:12
NAME 'rbacAuditResources'
- DESC 'RBAC audit resources'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC audit resources'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## A11: Audit result, type STRING, SINGLE VALUE
attributetype ( RBACattributeType:13
NAME 'rbacAuditResult'
- DESC 'RBAC operation result'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC operation result'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
## A12: Audit properties, type STRING, MULTIPLE VALUES
attributetype ( RBACattributeType:14
NAME 'rbacAuditProperties'
- DESC 'RBAC operation result'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC operation result'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## A13: Audit properties, type STRING, SINGLE VALUE
attributetype ( RBACattributeType:15
NAME 'rbacAuditTimestamp'
- DESC 'RBAC audit timestamp'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC audit timestamp'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
## A14: Audit messages, type STRING, MULTIPLE VALUES
attributetype ( RBACattributeType:16
NAME 'rbacAuditMessages'
- DESC 'RBAC audit messages'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC audit messages'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## A15: Audit Objects, type STRING, MULTIPLE VALUES
attributetype ( RBACattributeType:17
NAME 'rbacAuditObjects'
- DESC 'RBAC audit objects'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC audit objects'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
## A16: Audit Operations, type STRING, MULTIPLE VALUES
attributetype ( RBACattributeType:18
NAME 'rbacAuditOperations'
- DESC 'RBAC audit operations'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ DESC 'RBAC audit operations'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
attributetype ( RBACattributeType:19
NAME 'rbacAuditId'
- DESC 'RBAC audit id'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+ DESC 'RBAC audit id'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
#
@@ -202,59 +202,59 @@ attributetype ( RBACattributeType:19
#
objectclass ( RBACobjectClass:1
- NAME 'rbacSession'
- DESC 'RBAC Session Object Class'
- STRUCTURAL
- MUST (
- rbacSessid $
- uid $
- tenantid
- )
- MAY (
- rbacUserdn $
- rbacRoles $
- rbacRoleConstraints
- )
- )
+ NAME 'rbacSession'
+ DESC 'RBAC Session Object Class'
+ STRUCTURAL
+ MUST (
+ rbacSessid $
+ uid $
+ tenantid
+ )
+ MAY (
+ rbacUserdn $
+ rbacRoles $
+ rbacRoleConstraints
+ )
+ )
objectclass ( RBACobjectClass:2
- NAME 'rbacPermission'
- DESC 'RBAC Permission Object Class'
- STRUCTURAL
- MAY (
- rbacRoles $
- rbacObjName $
- rbacOpName $
- uid
- )
- )
+ NAME 'rbacPermission'
+ DESC 'RBAC Permission Object Class'
+ STRUCTURAL
+ MAY (
+ rbacRoles $
+ rbacObjName $
+ rbacOpName $
+ uid
+ )
+ )
objectclass ( RBACobjectClass:3
- NAME 'rbacAudit'
- DESC 'RBAC Audit Object Class'
- STRUCTURAL
- MAY (
- uid $
- rbacAuditId $
- rbacSessid $
- rbacAuditOp $
- rbacAuditRoles $
- rbacAuditRequestedRoles $
- rbacAuditObjects $
- rbacAuditOperations $
- rbacAuditResult $
- rbacAuditResources $
- rbacAuditProperties $
- rbacAuditTimestamp $
- rbacAuditMessages
- )
- )
+ NAME 'rbacAudit'
+ DESC 'RBAC Audit Object Class'
+ STRUCTURAL
+ MAY (
+ uid $
+ rbacAuditId $
+ rbacSessid $
+ rbacAuditOp $
+ rbacAuditRoles $
+ rbacAuditRequestedRoles $
+ rbacAuditObjects $
+ rbacAuditOperations $
+ rbacAuditResult $
+ rbacAuditResources $
+ rbacAuditProperties $
+ rbacAuditTimestamp $
+ rbacAuditMessages
+ )
+ )
objectclass ( RBACobjectClass:4
- NAME 'rbacContainer'
- DESC 'RBAC Container Object Class'
- STRUCTURAL
- MAY (
- cn
- )
- )
\ No newline at end of file
+ NAME 'rbacContainer'
+ DESC 'RBAC Container Object Class'
+ STRUCTURAL
+ MAY (
+ cn
+ )
+ )
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index 091e505..8b3b592 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -111,7 +111,7 @@ public class GlobalIds
*/
public static final String GROUP_IMPLEMENTATION = "groupmgr.implementation";
- // AUTHENTICATION_TYPE
+ // AUTHENTICATION_TYPE
/**
* This property is used to specify if authentication is being performed within a security realm.
*/
@@ -453,7 +453,6 @@ public class GlobalIds
public static final String LDAP_HOST = "host";
public static final String LDAP_PORT = "port";
-
/**
* maximum number of entries allowed for ldap filter replacements.
*/
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
index ec55622..bb84a39 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.ant;
+
import java.util.ArrayList;
import java.util.List;
@@ -43,12 +44,15 @@ import java.util.List;
*/
public class Deladminrole
{
- final private List<AdminRoleAnt> roles = new ArrayList<>();
+ final private List<AdminRoleAnt> roles = new ArrayList<>();
+
/**
* All Ant data entities must have a default constructor.
*/
- public Deladminrole() { }
+ public Deladminrole()
+ {
+ }
/**
@@ -63,18 +67,18 @@ public class Deladminrole
*
* @param role contains extension of {@link org.apache.directory.fortress.core.rbac.AdminRole}.
*/
- public void addRole(AdminRoleAnt role)
- {
- this.roles.add(role);
- }
+ public void addRole( AdminRoleAnt role )
+ {
+ this.roles.add( role );
+ }
+
/**
* Used by {@link FortressAntTask#deleteAdminRoles()} to retrieve list of AdminRoles as defined in input xml file.
* @return collection containing {@link AdminRoleAnt}s targeted for removal.
*/
- public List<AdminRoleAnt> getRoles()
- {
- return this.roles;
- }
+ public List<AdminRoleAnt> getRoles()
+ {
+ return this.roles;
+ }
}
-
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
index c18aba8..5580676 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
@@ -91,7 +91,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* <pre>
* ------------------------------------------
* Fortress Roles Structural Object Class
- * objectclass ( 1.3.6.1.4.1.38088.2.1
+ * objectclass ( 1.3.6.1.4.1.38088.2.1
* NAME 'ftRls'
* DESC 'Fortress Role Structural Object Class'
* SUP organizationalrole
@@ -480,27 +480,28 @@ public class AdminRole extends Role implements Administrator
{
return true;
}
-
+
if ( this.getName() == null )
{
return false;
}
-
+
if ( !( thatObj instanceof AdminRole ) )
{
return false;
}
-
+
Role thatRole = ( Role ) thatObj;
-
+
if ( thatRole.getName() == null )
{
return false;
}
-
+
return thatRole.getName().equalsIgnoreCase( this.getName() );
}
+
@Override
public int hashCode()
{
@@ -513,6 +514,7 @@ public class AdminRole extends Role implements Administrator
return result;
}
+
/**
* @see Object#toString()
*/
@@ -523,7 +525,7 @@ public class AdminRole extends Role implements Administrator
sb.append( "AdminRole object: \n" );
sb.append( super.toString( " " ) ).append( '\n' );
-
+
if ( beginRange != null )
{
sb.append( " beginRange :" ).append( beginRange ).append( '\n' );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
index 105208d..2c3977b 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
@@ -59,7 +59,7 @@ import org.apache.directory.fortress.core.util.time.CUtil;
* <h4>1. ftRls Structural objectclass is used to store the AdminRole information like name, and temporal constraints</h4>
* <ul>
* <li> ------------------------------------------
- * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.1</code>
+ * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.1</code>
* <li> <code>NAME 'ftRls'</code>
* <li> <code>DESC 'Fortress Role Object Class'</code>
* <li> <code>SUP organizationalrole</code>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java
index fd58e12..b4c3c32 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.rbac;
+
import org.apache.directory.fortress.core.CfgException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.api.util.Strings;
@@ -53,38 +54,39 @@ public class ClassUtil
* @throws org.apache.directory.fortress.core.CfgException in the event of failure to instantiate.
*
*/
- public static Object createInstance(String className) throws CfgException
+ public static Object createInstance( String className ) throws CfgException
{
Object target;
-
+
try
{
if ( Strings.isEmpty( className ) )
{
String error = "createInstance() null or empty classname";
- throw new CfgException(GlobalErrIds.FT_MGR_CLASS_NAME_NULL, error);
+ throw new CfgException( GlobalErrIds.FT_MGR_CLASS_NAME_NULL, error );
}
-
+
target = Class.forName( className ).newInstance();
}
catch ( ClassNotFoundException e )
{
- String error = "createInstance() className [" + className + "] caught java.lang.ClassNotFoundException=" + e;
- throw new CfgException(GlobalErrIds.FT_MGR_CLASS_NOT_FOUND, error, e);
+ String error = "createInstance() className [" + className + "] caught java.lang.ClassNotFoundException="
+ + e;
+ throw new CfgException( GlobalErrIds.FT_MGR_CLASS_NOT_FOUND, error, e );
}
catch ( InstantiationException e )
{
String error = "createInstance() [" + className + "] caught java.lang.InstantiationException=" + e;
- throw new CfgException(GlobalErrIds.FT_MGR_INST_EXCEPTION, error, e);
+ throw new CfgException( GlobalErrIds.FT_MGR_INST_EXCEPTION, error, e );
}
catch ( IllegalAccessException e )
{
String error = "createInstance() [" + className + "] caught java.lang.IllegalAccessException=" + e;
- throw new CfgException(GlobalErrIds.FT_MGR_ILLEGAL_ACCESS, error, e);
+ throw new CfgException( GlobalErrIds.FT_MGR_ILLEGAL_ACCESS, error, e );
}
-
+
return target;
- }
+ }
/**
@@ -96,12 +98,12 @@ public class ClassUtil
public static InputStream resourceAsStream( String name ) throws CfgException
{
InputStream is = ClassUtil.class.getClassLoader().getResourceAsStream( name );
-
+
if ( is == null )
{
- throw new CfgException(GlobalErrIds.FT_RESOURCE_NOT_FOUND, name);
+ throw new CfgException( GlobalErrIds.FT_RESOURCE_NOT_FOUND, name );
}
-
+
return is;
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java b/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java
index c191aac..196fda8 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java
@@ -19,12 +19,14 @@
*/
package org.apache.directory.fortress.core.rbac;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.directory.api.util.Strings;
+
/**
* All entities (User, Role, Permission, Policy, SDSet, etc...) are used to carry data between Fortress's
* layers starting with the (1) Manager layer down thru middle (2) Process layer and it's processing rules into
@@ -59,7 +61,7 @@ import org.apache.directory.api.util.Strings;
* <pre>
* ------------------------------------------
* Fortress Hierarchies Structural Object Class
- * objectclass ( 1.3.6.1.4.1.38088.2.7
+ * objectclass ( 1.3.6.1.4.1.38088.2.7
* NAME 'ftHier'
* DESC 'Fortress Hierarchy Structural Object Class'
* SUP organizationalrole
@@ -96,23 +98,24 @@ import org.apache.directory.api.util.Strings;
public class Hier extends FortEntity implements Serializable
{
private static final long serialVersionUID = 1L;
-
+
/** The operation */
public Op op;
-
+
/** The hierarchy type - ROLE, AROLE, USER, PERM */
public Type type;
-
+
/** the list of relationships that are set in collection on this entity */
private List<Relationship> relationships;
+
/**
* default constructor is used by internal components.
*/
public Hier()
{
}
-
+
/**
* construct hierarchy given a list of parent-child relationships.
@@ -123,7 +126,7 @@ public class Hier extends FortEntity implements Serializable
{
this.relationships = relationships;
}
-
+
/**
* Construct entity given a hierarchy type - ROLE, AROLE, USER, PERM.
@@ -134,7 +137,7 @@ public class Hier extends FortEntity implements Serializable
{
this.type = type;
}
-
+
/**
* Construct entity given a parent, child and a hierarchy type.
@@ -148,7 +151,7 @@ public class Hier extends FortEntity implements Serializable
this.type = type;
setRelationship( child, parent );
}
-
+
/**
* Construct entity given a parent and child.
@@ -160,7 +163,6 @@ public class Hier extends FortEntity implements Serializable
{
setRelationship( child, parent );
}
-
/**
* Operation type specifies if Add, Update or Deletion of relationship is being targeted.
@@ -182,7 +184,7 @@ public class Hier extends FortEntity implements Serializable
*/
REM
}
-
+
/**
* Return the operation to execute on behalf of this entity.
@@ -193,18 +195,17 @@ public class Hier extends FortEntity implements Serializable
{
return op;
}
-
+
/**
* The the operation for which this entity is bound for. Add, Update or Delete.
*
* @param op type contains 'ADD', 'MOD', or 'REM'.
*/
- public void setOp(Op op)
+ public void setOp( Op op )
{
this.op = op;
}
-
/**
* Enumeration is used to specify which hierarchy node this entity is bound to. RBAC Role, Admin Roles, User OU or Perm OU.
@@ -231,7 +232,7 @@ public class Hier extends FortEntity implements Serializable
*/
PERM
}
-
+
/**
* Return required the type of node this entity is bound to.
@@ -242,7 +243,7 @@ public class Hier extends FortEntity implements Serializable
{
return type;
}
-
+
/**
* Set the required type which determines which directory node this entity is bound to.
@@ -265,7 +266,7 @@ public class Hier extends FortEntity implements Serializable
public boolean isRelationship( String role, String parent )
{
boolean result = false;
-
+
if ( relationships != null )
{
result = relationships.contains(
@@ -274,7 +275,7 @@ public class Hier extends FortEntity implements Serializable
return result;
}
-
+
/**
* Set the child and parent into the collection of valid relationships stored in this entity.
@@ -284,16 +285,16 @@ public class Hier extends FortEntity implements Serializable
*/
public void setRelationship( String role, String parent )
{
- if (relationships == null)
+ if ( relationships == null )
{
relationships = new ArrayList<Relationship>();
}
relationships.add(
- new Relationship( Strings.toUpperCase( role ), Strings.toUpperCase(parent ) ) );
+ new Relationship( Strings.toUpperCase( role ), Strings.toUpperCase( parent ) ) );
}
-
+
/**
* Set the relationship object into the collection of valid relationships stored in this entity.
*
@@ -301,14 +302,14 @@ public class Hier extends FortEntity implements Serializable
*/
public void setRelationship( Relationship rel )
{
- if (relationships == null)
+ if ( relationships == null )
{
relationships = new ArrayList<Relationship>();
}
relationships.add( rel );
}
-
+
/**
* Remove the specified relationship from the collection of valid relationships stored in this entity.
@@ -318,13 +319,13 @@ public class Hier extends FortEntity implements Serializable
*/
public void removeRelationship( String role, String parent )
{
- if (relationships != null)
+ if ( relationships != null )
{
relationships.remove(
new Relationship( Strings.toUpperCase( role ), Strings.toUpperCase( parent ) ) );
}
}
-
+
/**
* Return the list of relationships that are set in collection on this entity.
@@ -335,7 +336,7 @@ public class Hier extends FortEntity implements Serializable
{
return relationships;
}
-
+
/**
* Set the list of relationships that are set in collection on this entity.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
index 2d92565..c50cdaa 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
@@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+
/**
* All entities ({@link AdminRole}, {@link OrgUnit},
* {@link org.apache.directory.fortress.core.rbac.SDSet} etc...) are used to carry data between three Fortress
@@ -116,7 +117,7 @@ import javax.xml.bind.annotation.XmlType;
* <pre>
* ------------------------------------------
* Fortress Organizational Structural Object Class
- * objectclass ( 1.3.6.1.4.1.38088.2.6
+ * objectclass ( 1.3.6.1.4.1.38088.2.6
* NAME 'ftOrgUnit'
* DESC 'Fortress OrgUnit Structural Object Class'
* SUP organizationalunit
@@ -171,20 +172,20 @@ public class OrgUnit extends FortEntity implements Graphable, Serializable
* {@code ou=OS-U}, or Permission, {@code ou=OS-P}, tree in ldap.
*/
public Type type;
-
+
/** The name required attribute of the OrgUnit object */
private String name;
-
+
/** the internal id that is associated with OrgUnit */
private String id;
-
+
/** The description that is associated with OrgUnit */
private String description;
-
+
/** The names of orgUnits that are parents (direct ascendants) of this orgUnit */
@XmlElement(nillable = true)
private Set<String> parents;
-
+
/** The set of child orgUnit names (direct descendants) of this orgUnit */
@XmlElement(nillable = true)
private Set<String> children;
@@ -371,7 +372,7 @@ public class OrgUnit extends FortEntity implements Graphable, Serializable
{
this.parents = new HashSet<>();
}
-
+
this.parents.add( parent );
}
@@ -419,27 +420,28 @@ public class OrgUnit extends FortEntity implements Graphable, Serializable
{
return true;
}
-
+
if ( this.getName() == null )
{
return false;
}
-
+
if ( !( thatObj instanceof OrgUnit ) )
{
return false;
}
-
+
OrgUnit thatOrg = ( OrgUnit ) thatObj;
-
+
if ( thatOrg.getName() == null )
{
return false;
}
-
+
return thatOrg.getName().equalsIgnoreCase( this.getName() );
}
+
@Override
public int hashCode()
{
@@ -452,6 +454,7 @@ public class OrgUnit extends FortEntity implements Graphable, Serializable
return result;
}
+
/**
* @see Object#toString()
*/
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
index 8f934c9..5839c9e 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
@@ -75,7 +75,7 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
* <h4>2. ftOrgUnit Structural objectclass is used to store the OrgUnit internal id</h4>
* <ul> org.apache.directory.fortress.arbac.
* <li> ------------------------------------------
- * <li> <code> objectclass ( 1.3.6.1.4.1.38088.2.6</code>
+ * <li> <code> objectclass ( 1.3.6.1.4.1.38088.2.6</code>
* <li> <code>NAME 'ftOrgUnit'</code>
* <li> <code>DESC 'Fortress OrgUnit Class'</code>
* <li> <code>SUP organizationalunit</code>
@@ -139,7 +139,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
entry.add( SchemaConstants.OBJECT_CLASS_AT, ORGUNIT_OBJ_CLASS );
entity.setId();
entry.add( GlobalIds.FT_IID, entity.getId() );
-
+
String description = entity.getDescription();
if ( !Strings.isEmpty( description ) )
@@ -494,7 +494,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
{
ouSet.add( getAttribute( searchResults.getEntry(), SchemaConstants.OU_AT ) );
}
-
+
searchResults.close();
}
catch ( LdapException e )
@@ -600,19 +600,21 @@ final class OrgUnitDAO extends ApacheDsDataProvider
private Dn getDn( OrgUnit orgUnit )
{
Dn dn = null;
-
+
try
{
switch ( orgUnit.type )
{
case USER:
- dn = new Dn( SchemaConstants.OU_AT + "=" + orgUnit.getName(), getRootDn( orgUnit.getContextId(), GlobalIds.OSU_ROOT ) );
+ dn = new Dn( SchemaConstants.OU_AT + "=" + orgUnit.getName(), getRootDn( orgUnit.getContextId(),
+ GlobalIds.OSU_ROOT ) );
break;
-
+
case PERM:
- dn = new Dn( SchemaConstants.OU_AT + "=" + orgUnit.getName(), getRootDn( orgUnit.getContextId(), GlobalIds.PSU_ROOT ) );
+ dn = new Dn( SchemaConstants.OU_AT + "=" + orgUnit.getName(), getRootDn( orgUnit.getContextId(),
+ GlobalIds.PSU_ROOT ) );
break;
-
+
default:
String warning = "getDn invalid type";
LOG.warn( warning );