[knox] branch master updated: KNOX-2801 Error Message should come in virtual group mapping provider if there are multiple occurrence's of a virtual group. (#630)

[am...@apache.org]

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 634a25d34 KNOX-2801 Error Message should come in virtual group mapping provider if there are multiple occurrence's of a virtual group. (#630)
634a25d34 is described below

commit 634a25d343d70c54be1efcf7064195d12f5a5550
Author: Attila Magyar <m....@gmail.com>
AuthorDate: Wed Sep 7 10:06:53 2022 +0200

    KNOX-2801 Error Message should come in virtual group mapping provider if there are multiple occurrence's of a virtual group. (#630)
---
 gateway-release/home/conf/topologies/homepage.xml                   | 4 ----
 .../main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java  | 2 ++
 .../src/main/java/org/apache/knox/gateway/topology/Provider.java    | 6 ++++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gateway-release/home/conf/topologies/homepage.xml b/gateway-release/home/conf/topologies/homepage.xml
index a3fce6587..67f78ce58 100644
--- a/gateway-release/home/conf/topologies/homepage.xml
+++ b/gateway-release/home/conf/topologies/homepage.xml
@@ -46,10 +46,6 @@
             <name>strict.transport.enabled</name>
             <value>false</value>
          </param>
-         <param>
-            <name>xframe.options.enabled</name>
-            <value>true</value>
-         </param>
          <param>
             <name>xframe.options</name>
             <value>SAMEORIGIN</value>
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java b/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java
index 2e000eda0..023695fe3 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/i18n/GatewaySpiMessages.java
@@ -79,4 +79,6 @@ public interface GatewaySpiMessages {
   @Message(level = MessageLevel.ERROR, text = "Failed to load truststore due to {0}")
   void failedToLoadTruststore(String message, @StackTrace(level = MessageLevel.DEBUG) Exception e);
 
+  @Message(level = MessageLevel.WARN, text = "Duplicated filter param key: {0}")
+  void duplicatedFilterParamKey(String name);
 }
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
index 5d20038fa..626b3be8c 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
@@ -19,6 +19,8 @@ package org.apache.knox.gateway.topology;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.knox.gateway.i18n.GatewaySpiMessages;
+import org.apache.knox.gateway.i18n.messages.MessagesFactory;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,6 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class Provider {
+  private static final GatewaySpiMessages LOG = MessagesFactory.get(GatewaySpiMessages.class);
 
   private String role;
   private String name;
@@ -60,6 +63,9 @@ public class Provider {
   }
 
   public void addParam(Param param) {
+    if (params.containsKey(param.getName())) {
+      LOG.duplicatedFilterParamKey(param.getName());
+    }
     params.put(param.getName(), param.getValue());
   }