[11/17] knox git commit: KNOX-1073 - Upgrade PAC4J to a more recent version

2017-10-25 Thread more 
KNOX-1073 - Upgrade PAC4J to a more recent version


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

Branch: refs/heads/KNOX-998-Package_Restructuring
Commit: 994ac325d592426f8d4abcf45b1e95a5f2d267e8
Parents: a08aaf7
Author: Colm O hEigeartaigh 
Authored: Wed Oct 25 13:11:08 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Oct 25 13:11:08 2017 +0100

--
 gateway-provider-security-pac4j/pom.xml | 31 +++--
 .../pac4j/filter/Pac4jDispatcherFilter.java | 15 
 .../pac4j/filter/Pac4jIdentityAdapter.java  | 36 +++-
 .../gateway/pac4j/session/KnoxSessionStore.java | 28 ++-
 .../hadoop/gateway/pac4j/Pac4jProviderTest.java | 10 +++---
 pom.xml |  2 +-
 6 files changed, 89 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/knox/blob/994ac325/gateway-provider-security-pac4j/pom.xml
--
diff --git a/gateway-provider-security-pac4j/pom.xml 
b/gateway-provider-security-pac4j/pom.xml
index c420ad9..c8684e2 100644
--- a/gateway-provider-security-pac4j/pom.xml
+++ b/gateway-provider-security-pac4j/pom.xml
@@ -36,8 +36,8 @@
 
 
 
-1.2.2
-1.8.9
+3.0.0
+2.1.0
 
 
 
@@ -67,6 +67,33 @@
 
 
 org.pac4j
+pac4j-oidc
+${pac4j.version}
+
+
+org.pac4j
+pac4j-saml
+${pac4j.version}
+
+
+xalan
+xalan
+
+
+
+
+org.pac4j
+pac4j-cas
+${pac4j.version}
+
+
+org.pac4j
+pac4j-oauth
+${pac4j.version}
+
+
+
+org.pac4j
 pac4j-core
 ${pac4j.version}
 

http://git-wip-us.apache.org/repos/asf/knox/blob/994ac325/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
--
diff --git 
a/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
 
b/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
index 574dea5..fb5fa4a 100644
--- 
a/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
+++ 
b/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
@@ -31,12 +31,11 @@ import org.pac4j.core.client.Client;
 import org.pac4j.core.config.Config;
 import org.pac4j.core.config.ConfigSingleton;
 import org.pac4j.core.context.J2EContext;
-import org.pac4j.core.context.Pac4jConstants;
 import org.pac4j.core.util.CommonHelper;
 import org.pac4j.http.client.indirect.IndirectBasicAuthClient;
 import 
org.pac4j.http.credentials.authenticator.test.SimpleTestUsernamePasswordAuthenticator;
 import org.pac4j.j2e.filter.CallbackFilter;
-import org.pac4j.j2e.filter.RequiresAuthenticationFilter;
+import org.pac4j.j2e.filter.SecurityFilter;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -74,7 +73,7 @@ public class Pac4jDispatcherFilter implements Filter {
 
   private CallbackFilter callbackFilter;
 
-  private RequiresAuthenticationFilter requiresAuthenticationFilter;
+  private SecurityFilter securityFilter;
   private MasterService masterService = null;
   private KeystoreService keystoreService = null;
   private AliasService aliasService = null;
@@ -119,7 +118,7 @@ public class Pac4jDispatcherFilter implements Filter {
 final Config config;
 final String clientName;
 // client name from servlet parameter (mandatory)
-final String clientNameParameter = 
filterConfig.getInitParameter(Pac4jConstants.CLIENT_NAME);
+final String clientNameParameter = 
filterConfig.getInitParameter("clientName");
 if (clientNameParameter == null) {
   log.clientNameParameterRequired();
   throw new ServletException("Required pac4j clientName parameter is 
missing.");
@@ -154,9 +153,9 @@ public class Pac4jDispatcherFilter implements Filter {
 }
 
 callbackFilter = new CallbackFilter();
-requiresAuthenticationFilter = new RequiresAuthenticationFilter();
-requiresAuthenticationFilter.setClientName(clientName);
-requiresAuthenticationFilter.setConfig(config);
+securityFilter = new SecurityFilter();
+securityFilter.setClients(clie

knox git commit: KNOX-1073 - Upgrade PAC4J to a more recent version

2017-10-25 Thread coheigea 
Repository: knox
Updated Branches:
  refs/heads/master a08aaf742 -> 994ac325d


KNOX-1073 - Upgrade PAC4J to a more recent version


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

Branch: refs/heads/master
Commit: 994ac325d592426f8d4abcf45b1e95a5f2d267e8
Parents: a08aaf7
Author: Colm O hEigeartaigh 
Authored: Wed Oct 25 13:11:08 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Oct 25 13:11:08 2017 +0100

--
 gateway-provider-security-pac4j/pom.xml | 31 +++--
 .../pac4j/filter/Pac4jDispatcherFilter.java | 15 
 .../pac4j/filter/Pac4jIdentityAdapter.java  | 36 +++-
 .../gateway/pac4j/session/KnoxSessionStore.java | 28 ++-
 .../hadoop/gateway/pac4j/Pac4jProviderTest.java | 10 +++---
 pom.xml |  2 +-
 6 files changed, 89 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/knox/blob/994ac325/gateway-provider-security-pac4j/pom.xml
--
diff --git a/gateway-provider-security-pac4j/pom.xml 
b/gateway-provider-security-pac4j/pom.xml
index c420ad9..c8684e2 100644
--- a/gateway-provider-security-pac4j/pom.xml
+++ b/gateway-provider-security-pac4j/pom.xml
@@ -36,8 +36,8 @@
 
 
 
-1.2.2
-1.8.9
+3.0.0
+2.1.0
 
 
 
@@ -67,6 +67,33 @@
 
 
 org.pac4j
+pac4j-oidc
+${pac4j.version}
+
+
+org.pac4j
+pac4j-saml
+${pac4j.version}
+
+
+xalan
+xalan
+
+
+
+
+org.pac4j
+pac4j-cas
+${pac4j.version}
+
+
+org.pac4j
+pac4j-oauth
+${pac4j.version}
+
+
+
+org.pac4j
 pac4j-core
 ${pac4j.version}
 

http://git-wip-us.apache.org/repos/asf/knox/blob/994ac325/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
--
diff --git 
a/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
 
b/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
index 574dea5..fb5fa4a 100644
--- 
a/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
+++ 
b/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jDispatcherFilter.java
@@ -31,12 +31,11 @@ import org.pac4j.core.client.Client;
 import org.pac4j.core.config.Config;
 import org.pac4j.core.config.ConfigSingleton;
 import org.pac4j.core.context.J2EContext;
-import org.pac4j.core.context.Pac4jConstants;
 import org.pac4j.core.util.CommonHelper;
 import org.pac4j.http.client.indirect.IndirectBasicAuthClient;
 import 
org.pac4j.http.credentials.authenticator.test.SimpleTestUsernamePasswordAuthenticator;
 import org.pac4j.j2e.filter.CallbackFilter;
-import org.pac4j.j2e.filter.RequiresAuthenticationFilter;
+import org.pac4j.j2e.filter.SecurityFilter;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -74,7 +73,7 @@ public class Pac4jDispatcherFilter implements Filter {
 
   private CallbackFilter callbackFilter;
 
-  private RequiresAuthenticationFilter requiresAuthenticationFilter;
+  private SecurityFilter securityFilter;
   private MasterService masterService = null;
   private KeystoreService keystoreService = null;
   private AliasService aliasService = null;
@@ -119,7 +118,7 @@ public class Pac4jDispatcherFilter implements Filter {
 final Config config;
 final String clientName;
 // client name from servlet parameter (mandatory)
-final String clientNameParameter = 
filterConfig.getInitParameter(Pac4jConstants.CLIENT_NAME);
+final String clientNameParameter = 
filterConfig.getInitParameter("clientName");
 if (clientNameParameter == null) {
   log.clientNameParameterRequired();
   throw new ServletException("Required pac4j clientName parameter is 
missing.");
@@ -154,9 +153,9 @@ public class Pac4jDispatcherFilter implements Filter {
 }
 
 callbackFilter = new CallbackFilter();
-requiresAuthenticationFilter = new RequiresAuthenticationFilter();
-requiresAuthenticationFilter.setClientName(clientName);
-requiresAuthenticationFilter.setConfig(config);
+securityFilter = n