Merge pull request #3751 from shanakama/header-to-metadata

Adding  header-to-metadata filter

Author: shanakama

adapter/internal/oasparser/envoyconf/http_filters.go

@@ -26,6 +26,7 @@ import (
 	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_config_ratelimit_v3 "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v3"
 	cors_filter_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cors/v3"
+	header_to_metadata_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/header_to_metadata/v3"
 	ext_authv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_authz/v3"
 	local_ratelimit_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/local_ratelimit/v3"
 	luav3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/lua/v3"
@@ -56,8 +57,10 @@ func getHTTPFilters() []*hcmv3.HttpFilter {
 	lua := getLuaFilter()
 	cors := getCorsHTTPFilter()
 	localRateLimit := getHTTPLocalRateLimitFilter()
+	headerToMetadata := getHeaderToMetadataHTTPFilter()
 
 	httpFilters := []*hcmv3.HttpFilter{
+	    headerToMetadata,
 		cors,
 		localRateLimit,
 		extAauth,
@@ -385,3 +388,44 @@ func getMgwWebSocketWASMFilter() *hcmv3.HttpFilter {
 	return &mgwWebSocketFilter
 
 }
+
+func getHeaderToMetadataHTTPFilter() *hcmv3.HttpFilter {
+    logger.LoggerOasparser.Debug("Creating header-to-metadata HTTP filter")
+    headerToMetadataConf := header_to_metadata_v3.Config{
+        ResponseRules: []*header_to_metadata_v3.Config_Rule{
+            {
+                Header: "x-choreo-host",
+                OnHeaderPresent: &header_to_metadata_v3.Config_KeyValuePair{
+                    MetadataNamespace: "envoy.lb",
+                    Key:               "choreo-upstream-host",
+                    Type:              header_to_metadata_v3.Config_STRING,
+                },
+                Remove: true,
+            },
+        },
+    }
+
+    filterTypedConf, err := anypb.New(&headerToMetadataConf)
+
+    if err != nil {
+    	logger.LoggerOasparser.Error("Error marshaling header-to-metadata filter configs. ", err)
+    }
+    logger.LoggerOasparser.Debug("Successfully created header-to-metadata filter configuration")
+    filter := hcmv3.HttpFilter{
+    	Name:       "envoy.filters.http.header_to_metadata",
+    	ConfigType: &hcmv3.HttpFilter_TypedConfig{TypedConfig: filterTypedConf},
+    }
+
+    if (enableRouterConfigValidation) {
+        err = filter.Validate()
+        if err != nil {
+            if panicOnValidationFailure {
+                 logger.LoggerOasparser.Fatal("Error while validating header-to-metadata HTTP filter configs. ", err)
+            } else {
+                 logger.LoggerOasparser.Error("Error while validating header-to-metadata HTTP filter configs. ", err)
+            }
+        }
+    }
+
+    return &filter
+}

adapter/pkg/config/log_types.go

@@ -122,6 +122,7 @@ func getDefaultLogConfig() *LogConfig {
 				"apiUuid":       "%DYNAMIC_METADATA(envoy.filters.http.ext_authz:apiUUID)%",
 				"extAuthDtls":   "%DYNAMIC_METADATA(envoy.filters.http.ext_authz:extAuthDetails)%",
 				"resourcePath":  "%DYNAMIC_METADATA(envoy.filters.http.ext_authz:resourcePath)%",
+				"choreoUpstreamHost": "%DYNAMIC_METADATA(envoy.lb:choreo-upstream-host)%",
 			},
 		},
 		InsightsLogs: &insightsLog{

enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/validator/JWTValidator.java

@@ -32,7 +32,6 @@
 import org.wso2.carbon.apimgt.common.gateway.exception.JWTGeneratorException;
 import org.wso2.carbon.apimgt.common.gateway.jwttransformer.DefaultJWTTransformer;
 import org.wso2.carbon.apimgt.common.gateway.jwttransformer.JWTTransformer;
-import org.wso2.choreo.connect.enforcer.config.ConfigHolder;
 import org.wso2.choreo.connect.enforcer.config.dto.ExtendedTokenIssuerDto;
 import org.wso2.choreo.connect.enforcer.constants.APIConstants;
 import org.wso2.choreo.connect.enforcer.exception.EnforcerException;

integration/test-integration/src/test/resources/testng-cc-standalone.xml

@@ -84,7 +84,8 @@
     <test name="cc-with-jwt-config-and-transformer" preserve-order="true" parallel="false">
         <classes>
             <class name="org.wso2.choreo.connect.tests.setup.standalone.CcWithJwtConfigAndTransformer"/>
-            <class name="org.wso2.choreo.connect.tests.testcases.standalone.jwtGenerator.CustomJwtTransformerTestCase"/>
+<!--        Ignore the custom JWT transformer test due to the removal of the functionality    -->
+<!--            <class name="org.wso2.choreo.connect.tests.testcases.standalone.jwtGenerator.CustomJwtTransformerTestCase"/>-->
             <class name="org.wso2.choreo.connect.tests.testcases.standalone.filter.CustomFilterTestCase"/>
             <class name="org.wso2.choreo.connect.tests.testcases.standalone.ratelimit.APILevelWithoutRateLimitTestCase"/>
             <class name="org.wso2.choreo.connect.tests.testcases.standalone.ratelimit.ApiLevelRatelimitTestCase"/>

resources/conf/log_config.toml

@@ -74,3 +74,4 @@ respDur = "%RESPONSE_DURATION%"
 apiUUID = "%DYNAMIC_METADATA(envoy.filters.http.ext_authz:apiUUID)%"
 extAuthDtls = "%DYNAMIC_METADATA(envoy.filters.http.ext_authz:extAuthDetails)%"
 resourcePath = "%DYNAMIC_METADATA(envoy.filters.http.ext_authz:resourcePath)%"
+choreoUpstreamHost = "%DYNAMIC_METADATA(envoy.lb:choreo-upstream-host)%"