Merge branch 'master' of https://github.com/wso2/product-apim into ai…

…_api_gateway
wso2 · Sep 27, 2024 · 046c4dd · 046c4dd
2 parents a211a0c + cf02393
commit 046c4dd
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 6 deletions.
diff --git a/modules/distribution/product/src/main/conf/deployment.toml b/modules/distribution/product/src/main/conf/deployment.toml
@@ -107,7 +107,7 @@ enable = true
 token = ""
 
 [apim.key_manager]
-enable_apikey_subscription_validation = true
+enable_lightweight_apikey_generation = true
 #service_url = "https://localhost:${mgt.transport.https.port}/services/"
 #username = "$ref{super_admin.username}"
 #password = "$ref{super_admin.password}"

diff --git a/modules/distribution/resources/api_templates/custom_backend_sequence_template.j2 b/modules/distribution/resources/api_templates/custom_backend_sequence_template.j2
@@ -0,0 +1,6 @@
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"{{sequence_name}}\">
+{% if custom_sequence is defined %}
+    {{ custom_sequence }}
+{% endif %}
+</sequence>
diff --git a/modules/distribution/resources/api_templates/velocity_template.xml b/modules/distribution/resources/api_templates/velocity_template.xml
@@ -210,7 +210,6 @@
 
         faultSequence=#print_string_if_exist($faultSequence "fault")>
 <inSequence>
-
                 ## check and set response caching
                 #if( $responseCacheEnabled )
 <cache scope="per-host" collector="false" hashGenerator="org.wso2.carbon.mediator.cache.digest.HttpRequestHashGenerator" timeout="$!responseCacheTimeOut">
@@ -245,8 +244,29 @@ $in_sequences.get("$resource.getUriTemplate()").get($uri)
                 #else
                     #set( $filterRegex = "PRODUCTION" )
                 #end
+                #if( $endpoint_config.get("endpoint_type") == 'sequence_backend' )
+                    #if( $endpoint_config.get("sandbox"))
+                        #set( $sequenceKey = $endpoint_config.get("sandbox") )
+                        <filter source="$ctx:AM_KEY_TYPE" regex="SANDBOX">
+                            <then>
+                                <sequence key="$sequenceKey"/>
+                                <loopback/>
+                            </then>
+                            <else/>
+                        </filter>
+                    #end
+                    #if( $endpoint_config.get("production"))
+                        #set( $sequenceKey = $endpoint_config.get("production") )
+                        <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                            <then>
+                                <sequence key="$sequenceKey"/>
+                                <loopback/>
+                            </then>
+                            <else/>
+                        </filter>
+                    #end
                 ## AWS Lambda: start
-                #if( $endpoint_config.get("endpoint_type") == 'awslambda' )
+                #elseif( $endpoint_config.get("endpoint_type") == 'awslambda' )
                     #set( $accessKey = $!{endpoint_config.get("amznAccessKey")} )
                     #set( $secretKey = $!{endpoint_config.get("amznSecretKey")} )
                     #set( $region = $!{endpoint_config.get("amznRegion")} )
@@ -344,6 +364,7 @@ $out_sequences.get("$resource.getUriTemplate()").get($uri)
                 #if( $responseCacheEnabled )
 <cache scope="per-host" collector="true"/>
                 #end
+#if( $endpoint_config.get("endpoint_type") != 'sequence_backend' )
 <filter source="$ctx:AM_KEY_TYPE" regex="$filterRegex">
     <then>
                     #if($endpointSecurityProd.clientId && ($endpointSecurityProd.type == "oauth" || $endpointSecurityProd.type == "OAUTH"))
@@ -356,7 +377,7 @@ $out_sequences.get("$resource.getUriTemplate()").get($uri)
                     #end
     </else>
 </filter>
-
+#end
 <send/>
 </outSequence>
         </resource>

diff --git a/...s-backend/src/test/java/org/wso2/am/integration/tests/websocket/WebSocketAPITestCase.java b/...s-backend/src/test/java/org/wso2/am/integration/tests/websocket/WebSocketAPITestCase.java
@@ -807,9 +807,11 @@ private void invokeAPI(WebSocketClient client, String accessToken, AUTH_IN in, H
         } else if (AUTH_IN.OAUTH_QUERY == in) {
             echoUri = new URI(apiEndPoint + "?access_token=" + accessToken);
         } else if (AUTH_IN.APIKEY_HEADER == in) {
+            Thread.sleep(24000);
             request.setHeader("apikey", accessToken);
             echoUri = new URI(apiEndPoint);
         } else if (AUTH_IN.APIKEY_QUERY == in) {
+            Thread.sleep(24000);
             echoUri = new URI(apiEndPoint + "?apikey=" + accessToken);
         }
 

diff --git a/...egration/tests-backend/src/test/resources/artifacts/AM/configFiles/common/deployment.toml b/...egration/tests-backend/src/test/resources/artifacts/AM/configFiles/common/deployment.toml
@@ -35,6 +35,9 @@ password =  "wso2carbon"
 alias =  "wso2carbon"
 key_password =  "wso2carbon"
 
+[apim.key_manager]
+enable_lightweight_apikey_generation = false
+
 [[apim.gateway.environment]]
 name = "Default"
 type = "hybrid"

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml
@@ -357,6 +357,7 @@
         <parameter name="group" value="group4"/>
         <classes>
             <class name="org.wso2.am.integration.tests.other.AdvancedConfigDeploymentConfig"/>
+            <class name="org.wso2.am.integration.tests.api.lifecycle.APISecurityTestCase" />
             <class name="org.wso2.am.integration.tests.other.NotificationTestCase"/>
             <class name="org.wso2.am.integration.tests.json.ESBJAVA3380TestCase"/>
             <!--THis test will be enabled once the stats event streams are finalized  -->
@@ -371,8 +372,6 @@
         </classes>
     </test>
 
-
-
     <test name="apim-integration-tests-application-sharing" preserve-order="true" parallel="false" group-by-instances="true">
         <parameter name="group" value="group1"/>
         <classes>