You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2019/03/17 22:49:55 UTC

[directory-fortress-enmasse] branch master updated: FC-265 - add external switch for arbac02 enablement

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-enmasse.git


The following commit(s) were added to refs/heads/master by this push:
     new aec3d9e  FC-265 - add external switch for arbac02 enablement
aec3d9e is described below

commit aec3d9ee974e0798e90403169ab3b383ef2d4c1e
Author: Shawn McKinney <sm...@apache.org>
AuthorDate: Sun Mar 17 17:49:50 2019 -0500

    FC-265 - add external switch for arbac02 enablement
---
 README-QUICKSTART.md                               | 27 +++++++++++++++++++++-
 .../apache/directory/fortress/rest/SecUtils.java   |  3 ++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/README-QUICKSTART.md b/README-QUICKSTART.md
index 5d824db..9cf8749 100644
--- a/README-QUICKSTART.md
+++ b/README-QUICKSTART.md
@@ -26,6 +26,7 @@
  * SECTION 2. Configure Tomcat and Deploy Fortress Rest
  * SECTION 3. Load Sample Security Policy
  * SECTION 4. Test
+ * SECTION 5. Table with External Config Switches
 
 ___________________________________________________________________________________
 ## Document Overview
@@ -110,6 +111,30 @@ ________________________________________________________________________________
  ```
 
 2. Complete *SECTION 7: Alternate testing procedures* in [Fortress Core README.md](https://github.com/apache/directory-fortress-enmasse/blob/master/README.md)
-
 ___________________________________________________________________________________
+## SECTION 5. Table with External Config Switches
+
+|  # |  Name                            | Sample Values                      |
+| -- | -------------------------------- | ---------------------------------- |
+|  1 | fortress.host                    | localhost, myhostname, 10.14.74.28 |
+|  2 | fortress.port                    | 389 (default), 636, 1389, 1636     |
+|  3 | fortress.admin.user              | cn=manager,dc=example,dc=com       |
+|  4 | fortress.admin.pw                | secret                             |
+|  5 | fortress.min.admin.conn          | 1                                 |
+|  6 | fortress.max.admin.conn          | 10                                 |
+|  7 | fortress.log.user                | cn=log                             |
+|  8 | fortress.log.pw                  | secret                             |
+|  9 | fortress.min.log.conn            | 1                                  |
+| 10 | fortress.max.log.conn            | 5                                  |
+| 11 | fortress.enable.ldap.ssl         | false(default), true               |
+| 12 | fortress.enable.ldap.starttls    | false(default), true               |
+| 13 | fortress.enable.ldap.ssl.debug   | false(default), true               |
+| 14 | fortress.trust.store             | mytruststore                       |
+| 15 | fortress.trust.store.password    | changeit                           |
+| 16 | fortress.trust.store.onclasspath | false(default), true               |
+| 17 | fortress.config.realm            | default                            |
+| 18 | fortress.config.root             | ou=config,dc=example,dc=com        |
+| 19 | fortress.ldap.server.type        | apacheds, openldap, other          |
+| 20 | fortress.is.arbac02              | false(default), true               |
+
 #### END OF README-QUICKSTART
\ No newline at end of file
diff --git a/src/main/java/org/apache/directory/fortress/rest/SecUtils.java b/src/main/java/org/apache/directory/fortress/rest/SecUtils.java
index ac8be84..1ebfd98 100644
--- a/src/main/java/org/apache/directory/fortress/rest/SecUtils.java
+++ b/src/main/java/org/apache/directory/fortress/rest/SecUtils.java
@@ -22,6 +22,7 @@ package org.apache.directory.fortress.rest;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.model.FortRequest;
 import org.apache.directory.fortress.core.model.FortResponse;
@@ -66,7 +67,7 @@ public class SecUtils
         Session realmSession;
         FortResponse fortResponse = null;
         // Have the fortress arbac02 runtime checks been enabled?.
-        if (Config.getInstance().getBoolean("is.arbac02"))
+        if (Config.getInstance().getBoolean(GlobalIds.IS_ARBAC02))
         {
             if (httpRequest == null)
             {