[knox] branch master updated: KNOX-2795 Handling missing OIDC client name parameter (#626)

[amagyar]

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

amagyar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new c6fb098ef KNOX-2795 Handling missing OIDC client name parameter (#626)
c6fb098ef is described below

commit c6fb098ef1b4c4dd2806b52a2bbe5a6904e97927
Author: Attila Magyar <m.magy...@gmail.com>
AuthorDate: Mon Aug 29 14:54:44 2022 +0200

    KNOX-2795 Handling missing OIDC client name parameter (#626)
---
 .../src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java  | 3 ---
 .../org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java | 6 +-----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java
 
b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java
index f293d6146..7562ddee0 100644
--- 
a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java
+++ 
b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java
@@ -32,9 +32,6 @@ public interface Pac4jMessages {
   @Message( level = MessageLevel.ERROR, text = "pac4j callback URL required")
   void ssoAuthenticationProviderUrlRequired();
 
-  @Message( level = MessageLevel.ERROR, text = "pac4j clientName parameter 
required")
-  void clientNameParameterRequired();
-
   @Message( level = MessageLevel.ERROR, text = "At least one pac4j client must 
be defined")
   void atLeastOnePac4jClientMustBeDefined();
 
diff --git 
a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
 
b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
index a8c6fa737..b356cfe6a 100644
--- 
a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
+++ 
b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
@@ -161,10 +161,6 @@ public class Pac4jDispatcherFilter implements Filter {
 
     // client name from servlet parameter (mandatory)
     final String clientNameParameter = 
filterConfig.getInitParameter(PAC4J_CLIENT_NAME_PARAM);
-    if (clientNameParameter == null) {
-      log.clientNameParameterRequired();
-      throw new ServletException("Required pac4j clientName parameter is 
missing.");
-    }
 
     final String oidcType = filterConfig.getInitParameter(PAC4J_OIDC_TYPE);
     /*
@@ -266,7 +262,7 @@ public class Pac4jDispatcherFilter implements Filter {
 
   private void addDefaultConfig(String clientNameParameter, Map<String, 
String> properties) {
     // add default saml params
-    if (clientNameParameter.contains(SAML2Client.class.getSimpleName())) {
+    if (clientNameParameter != null && 
clientNameParameter.contains(SAML2Client.class.getSimpleName())) {
       properties.put(PropertiesConstants.SAML_KEYSTORE_PATH,
           keystoreService.getKeystorePath());