You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by lm...@apache.org on 2016/01/30 22:52:21 UTC

knox git commit: KNOX-662 - Change pac4j-knoxsso.xml Template to Reflect new Requirements

Repository: knox
Updated Branches:
  refs/heads/v0.8.0 a2e6c9a54 -> 3ad7acbc5


KNOX-662 - Change pac4j-knoxsso.xml Template to Reflect new Requirements

Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/3ad7acbc
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/3ad7acbc
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/3ad7acbc

Branch: refs/heads/v0.8.0
Commit: 3ad7acbc5173267b81567d00cab86a01adf10d5d
Parents: a2e6c9a
Author: Larry McCay <lm...@hortonworks.com>
Authored: Sat Jan 30 16:52:15 2016 -0500
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Sat Jan 30 16:52:15 2016 -0500

----------------------------------------------------------------------
 CHANGES                                         |  1 +
 .../home/templates/pac4j-knoxsso.xml            | 40 ++++++--------------
 2 files changed, 12 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/3ad7acbc/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 9e4fa40..494f1f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ Release Notes - Apache Knox - Version 0.8.0
     * [KNOX-657] - _default Topology Must Redeploy After Restart
     * [KNOX-660] - Incompatible Dependencies in Pac4j Provider
     * [KNOX-661] - NPE in Pac4j Provider when clientName Parameter is Missing
+    * [KNOX-662] - Change pac4j-knoxsso.xml Template to Reflect new Requirements
 
 ------------------------------------------------------------------------------
 Release Notes - Apache Knox - Version 0.7.0

http://git-wip-us.apache.org/repos/asf/knox/blob/3ad7acbc/gateway-release/home/templates/pac4j-knoxsso.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/pac4j-knoxsso.xml b/gateway-release/home/templates/pac4j-knoxsso.xml
index 95be8dc..111a0d4 100644
--- a/gateway-release/home/templates/pac4j-knoxsso.xml
+++ b/gateway-release/home/templates/pac4j-knoxsso.xml
@@ -16,9 +16,7 @@
   limitations under the License.
 -->
 <topology>
-
     <gateway>
-
         <provider>
             <role>federation</role>
             <name>pac4j</name>
@@ -27,41 +25,21 @@
                 <name>pac4j.callbackUrl</name>
                 <value>https://127.0.0.1:8443/gateway/knoxsso/api/v1/websso</value>
             </param>
-            <!--param>
-                <name>clientName</name>
-                <value>testBasicAuth</value>
-            </param-->
-            <param>
-                <name>cas.loginUrl</name>
-                <value>https://casserverpac4j.herokuapp.com/login</value>
-            </param>
-            <!--param>
-                <name>saml.keystorePath</name>
-                <value>/tmp/samlKeystore.jks</value>
-            </param>
             <param>
-                <name>saml.keystorePassword</name>
-                <value>pac4j-demo-passwd</value>
-            </param>
-            <param>
-                <name>saml.privateKeyPassword</name>
-                <value>pac4j-demo-passwd</value>
+                <name>clientName</name>
+                <value>SAML2Client</value>
             </param>
             <param>
                 <name>saml.identityProviderMetadataPath</name>
-                <value>/tmp/metadata-okta.xml</value>
-            </param>
-            <param>
-                <name>saml.maximumAuthenticationLifetime</name>
-                <value>3600</value>
+                <value>/tmp/idp-metadata.xml</value>
             </param>
             <param>
                 <name>saml.serviceProviderEntityId</name>
-                <value>https://127.0.0.1:8443/gateway/idp/api/v1/websso?client_name=SAML2Client</value>
+                <value>https://127.0.0.1:8443/gateway/knoxsso/api/v1/websso?pac4jCallback=true&amp;client_name=SAML2Client</value>
             </param>
-            <param>
-                <name>saml.serviceProviderMetadataPath</name>
-                <value>sp-metadata.xml</value>
+            <!--param>
+                <name>cas.loginUrl</name>
+                <value>https://casserverpac4j.herokuapp.com/login</value>
             </param-->
         </provider>
 
@@ -69,6 +47,10 @@
             <role>identity-assertion</role>
             <name>Default</name>
             <enabled>true</enabled>
+            <param>
+              <name>principal.mapping</name>
+              <value>guest@example.com=guest;</value>
+            </param>
         </provider>
 
     </gateway>