Merge branch 'wso2:master' into changeApiProvider

wso2 · Jan 24, 2024 · 06e5b02 · 06e5b02
2 parents bafe7a7 + 1466a84
commit 06e5b02
Show file tree

Hide file tree

Showing 143 changed files with 3,037 additions and 319 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -45,7 +45,7 @@ jobs:
       with:
         node-version: '10.x'
     - name: Build product-apim with Test.
-      run: mvn clean install --file pom.xml -DskipBenchMarkTest=true
+      run: mvn clean install --file pom.xml -DskipBenchMarkTest=true -DskipRestartTests=true
       env:
         PRODUCT_APIM_TEST_GROUPS: ${{ matrix.segment }}
     - name: Prepare upload testng report

diff --git a/README.md b/README.md
@@ -204,7 +204,7 @@ System Requirements
 Installation & Running
 ==================================
 
-1. Extract the wso2am-4.2.0.zip and go to the 'bin' directory
+1. Extract the wso2am-4.3.0.zip and go to the 'bin' directory
 2. Run the api-manager.sh or api-manager.bat script based on you operating system.
 3. Access the respective WSO2 API-M interfaces
     * API Publisher web application is running at - https://localhost:9443/publisher \
@@ -229,6 +229,16 @@ For additional support information please refer to http://wso2.com/support
 
 For more information on WSO2 API Manager please visit https://wso2.com/api-management/
 
+Survey On Open Source Community Communication
+==================================
+
+WSO2 wants to learn more about our open source software (OSS) community and your communication preferences to serve you better.
+
+In addition, we may reach out to a small number of respondents to ask additional questions and offer a small gift.
+
+Link to survey: https://forms.gle/h5q4M3K7vyXba3bK6
+
+
 Known Issues of WSO2 API Manager
 ==================================
 

diff --git a/README.txt b/README.txt
@@ -168,7 +168,7 @@ is recommended.
 Installation & Running
 ==================================
 
-1. Extract the wso2am-4.2.0.zip and go to the 'bin' directory
+1. Extract the wso2am-4.3.0.zip and go to the 'bin' directory
 2. Run the api-manager.sh or api-manager.bat script based on you operating system.
 3. Access the respective WSO2 API-M interfaces
     * API Publisher web application is running at - https://localhost:9443/publisher
@@ -182,7 +182,7 @@ Documentation
 ==============
 
 Online product documentation is available at:
-        https://apim.docs.wso2.com/en/4.2.0/
+        https://apim.docs.wso2.com/en/4.3.0/
 
 Support
 ==================================

diff --git a/docs/xdoc/release-notes.xml b/docs/xdoc/release-notes.xml
@@ -23,14 +23,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <meta content="text/html; charset=iso-8859-1" http-equiv="content-type"/>
-    <title>WSO2 API Manager v4.2.0 - 11th March 2023</title>
+    <title>WSO2 API Manager v4.3.0 - 1st April 2024</title>
 </head>
 <body>
 <div id="main-content">
-<h1>WSO2 API Manager 4.2.0 Released!</h1>
+<h1>WSO2 API Manager 4.3.0 Released!</h1>
 
 <p>
-    The WSO2 API Manager team is pleased to announce the release of version 4.2.0 of
+    The WSO2 API Manager team is pleased to announce the release of version 4.3.0 of
     the Open Source API Manager.
 </p>
 
@@ -77,7 +77,7 @@
     <li>Use "admin", "admin" as the username and password to login as an admin</li>
 </ol>
 
-    <h2>Bug Fixes And Improvements in 4.2.0</h2>
+    <h2>Bug Fixes And Improvements in 4.3.0</h2>
     <ul>
         <li>GitHub (<a href="https://github.com/wso2/api-manager/issues?q=is%3Aissue+is%3Aclosed+label%3AComponent%2FAPIM+closed%3A2022-04-05..2023-03-11">api-manager</a>)
         </li>

diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/callhome/pom.xml b/modules/callhome/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/distribution/apim-is-plugin/README.md b/modules/distribution/apim-is-plugin/README.md
@@ -1,4 +1,4 @@
-# WSO2 APIM IS Plugin - 4.2.0
+# WSO2 APIM IS Plugin - 4.3.0
 
 ## Prerequisites:
 1. Download WSO2 IS product

diff --git a/modules/distribution/apim-is-plugin/pom.xml b/modules/distribution/apim-is-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/product/pom.xml b/modules/distribution/product/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-distribution-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/product/src/main/assembly/bin.xml b/modules/distribution/product/src/main/assembly/bin.xml
@@ -370,6 +370,15 @@
                 <include>**/**.j2</include>
             </includes>
         </fileSet>
+        <!-- Gateway policy templates -->
+        <fileSet>
+            <directory>../resources/templates</directory>
+            <outputDirectory>wso2am-${pom.version}/repository/resources/templates</outputDirectory>
+            <includes>
+                <include>**/**.xml</include>
+                <include>**/**.j2</include>
+            </includes>
+        </fileSet>
         <!-- Operation policy specifications -->
         <fileSet>
             <directory>../resources/operation_policies/specifications</directory>

diff --git a/modules/distribution/product/src/main/assembly/filter.properties b/modules/distribution/product/src/main/assembly/filter.properties
@@ -1,9 +1,9 @@
 product.name=WSO2 API Manager
 product.key=AM
-product.version=4.2.0
+product.version=4.3.0
 product.wum.name=wso2am
 
 carbon.version=4.8.1
-am.version=4.2.0
+am.version=4.3.0
 default.server.role=APIManager
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
diff --git a/modules/distribution/product/src/main/conf/synapse-configs/default/sequences/main.xml b/modules/distribution/product/src/main/conf/synapse-configs/default/sequences/main.xml
@@ -26,6 +26,7 @@
             <property name="RESOURCE" expression="fn:concat('/', $axis2:REST_URL_POSTFIX)"/>
             <property name="HEALTH CHECK URL" expression="$axis2:TransportInURL"/>
         </log>
+        <property name="message.builder.invoked" value="true" scope="axis2" type="BOOLEAN"/>
         <property name="url_axis2" expression="$axis2:TransportInURL"/>
         <filter source="$axis2:TransportInURL" regex="/">
             <payloadFactory media-type="xml">

diff --git a/modules/distribution/product/src/main/extensions/basicauth.jsp b/modules/distribution/product/src/main/extensions/basicauth.jsp
@@ -93,14 +93,16 @@
 
                     if (userName.value) {
                         let contextPath = "<%=proxyContextPath%>"
+                        let loginRequestPath = "<%=loginContextRequestUrl%>"
                         if (contextPath !== "") {
                             contextPath = contextPath.startsWith('/') ? contextPath : "/" + contextPath
                             contextPath = contextPath.endsWith('/') ?
                                 contextPath.substring(0, contextPath.length - 1) : contextPath
+                            loginRequestPath = loginRequestPath.startsWith('../') ? loginRequestPath.substring(2, loginRequestPath.length) : loginRequestPath
                         }
                         $.ajax({
                             type: "GET",
-                            url: contextPath + "<%=loginContextRequestUrl%>",
+                            url: contextPath + loginRequestPath,
                             xhrFields: { withCredentials: true },
                             success: function (data) {
                                 if (data && data.status == 'redirect' && data.redirectUrl && data.redirectUrl.length > 0) {

diff --git a/modules/distribution/product/src/main/extensions/login.jsp b/modules/distribution/product/src/main/extensions/login.jsp
@@ -501,9 +501,13 @@
     <script>
         function checkSessionKey() {
             var proxyPath = "<%=contextPath%>"
+            let loginRequestPath = "<%=loginContextRequestUrl%>"
+            if (proxyPath !== "") {
+                loginRequestPath = loginRequestPath.startsWith('../') ? loginRequestPath.substring(2, loginRequestPath.length) : loginRequestPath
+            }
             $.ajax({
                 type: "GET",
-                url: proxyPath + "<%=loginContextRequestUrl%>",
+                url: proxyPath + loginRequestPath,
                 xhrFields: { withCredentials: true },
                 success: function (data) {
                     if (data && data.status == 'redirect' && data.redirectUrl && data.redirectUrl.length > 0) {

diff --git a/modules/distribution/product/src/main/resources/conf/default.json b/modules/distribution/product/src/main/resources/conf/default.json
@@ -45,8 +45,8 @@
   "oauth.grant_type.uma_ticket.grant_handler": "org.wso2.carbon.identity.oauth.uma.grant.UMA2GrantHandler",
   "oauth.grant_type.uma_ticket.grant_validator": "org.wso2.carbon.identity.oauth.uma.grant.GrantValidator",
   "system.parameter.'org.wso2.CipherTransformation'": "RSA/ECB/OAEPwithSHA1andMGF1Padding",
-  "server.userAgent": "WSO2 AM 4.2.0",
-  "server.serverDetails": "WSO2 AM 4.2.0",
+  "server.userAgent": "WSO2 AM 4.3.0",
+  "server.serverDetails": "WSO2 AM 4.3.0",
   "message_formatter.form_urlencoded": "org.apache.axis2.transport.http.XFormURLEncodedFormatter",
   "message_formatter.multipart_form_data": "org.apache.axis2.transport.http.MultipartFormDataFormatter",
   "message_formatter.application_xml": "org.apache.axis2.transport.http.ApplicationXMLFormatter",
@@ -128,12 +128,13 @@
   "transport.netty.https.sender.ssl_profile.read_interval": "600000",
   "transport.ws.sender.enable": true,
   "transport.ws.sender.parameters.\u0027ws.custom.header\u0027": "websocket-custom-header",
-  "transport.ws.sender.parameters.ws.outflow.dispatch.sequence": "outflowDispatchSeq",
-  "transport.ws.sender.parameters.ws.outflow.dispatch.fault.sequence": "outflowFaultSeq",
+  "transport.ws.sender.parameters.\u0027ws.outflow.dispatch.sequence\u0027": "outflowDispatchSeq",
+  "transport.ws.sender.parameters.\u0027ws.outflow.dispatch.fault.sequence\u0027": "outflowFaultSeq",
   "transport.wss.sender.enable": true,
   "transport.wss.sender.parameters.\u0027ws.custom.header\u0027": "websocket-custom-header",
-  "transport.wss.sender.parameters.ws.outflow.dispatch.sequence": "outflowDispatchSeq",
-  "transport.wss.sender.parameters.ws.outflow.dispatch.fault.sequence": "outflowFaultSeq",
+  "transport.wss.sender.parameters.\u0027ws.outflow.dispatch.sequence\u0027": "outflowDispatchSeq",
+  "transport.wss.sender.parameters.\u0027ws.outflow.dispatch.fault.sequence\u0027": "outflowFaultSeq",
+  "transport.wss.sender.parameters.\u0027ws.client.enable.hostname.verification\u0027": "true",
   "transport.wss.sender.trust_store.location": "repository/resources/security/$ref{truststore.file_name}",
   "transport.wss.sender.trust_store.password": "$ref{truststore.password}",
   "transport.blocking_http.sender.parameters.PROTOCOL": "HTTP/1.1",

diff --git a/...distribution/product/src/main/resources/conf/templates/repository/conf/axis2/axis2.xml.j2 b/...distribution/product/src/main/resources/conf/templates/repository/conf/axis2/axis2.xml.j2
@@ -46,6 +46,9 @@
     <!-- Sandesha2 persistance storage manager -->
     <parameter name="Sandesha2StorageManager" locked="false">inmemory</parameter>
 
+    <!-- This property will enable strict service URL validation -->
+    <parameter name="strictServicePathValidation" locked="false">{{server.strict_service_path_validation}}</parameter>
+
     <!-- Our HTTP endpoints can handle both REST and SOAP under the following service path. In -->
     <!-- case of a servlet container, if you change this you have to manually change the -->
     <!-- settings of your servlet container to map this context path to proper Axis2 servlets -->

diff --git a/...roduct/src/main/resources/conf/templates/repository/conf/tomcat/carbon/WEB-INF/web.xml.j2 b/...roduct/src/main/resources/conf/templates/repository/conf/tomcat/carbon/WEB-INF/web.xml.j2
@@ -26,6 +26,10 @@
         <param-name>Owasp.CsrfGuard.Config</param-name>
         <param-value>repository/conf/security/Owasp.CsrfGuard.Carbon.properties</param-value>
     </context-param>
+    <context-param>
+        <param-name>contextPath</param-name>
+        <param-value>{{server.proxy_context_path}}</param-value>
+    </context-param>
 
     <servlet id="bridge">
         <servlet-name>bridgeservlet</servlet-name>

diff --git a/modules/distribution/product/src/main/startup-scripts/api-manager.bat b/modules/distribution/product/src/main/startup-scripts/api-manager.bat
@@ -204,6 +204,7 @@ if %JAVA_VERSION% GEQ 110 set CARBON_CLASSPATH=".\lib\endorsed\*";%CARBON_CLASSP
 
 if %JAVA_VERSION% LEQ 18 set JAVA_VER_BASED_OPTS=-Djava.endorsed.dirs=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
 if %JAVA_VERSION% GEQ 110 set JAVA_VER_BASED_OPTS=--add-opens=java.base/sun.security.x509=ALL-UNNAMED --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED  --add-opens=java.base/java.io=ALL-UNNAMED
+set JAVA_VER_BASED_OPTS=%JAVA_VER_BASED_OPTS% -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true
 
 set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% %JAVA_VER_BASED_OPTS%

diff --git a/modules/distribution/product/src/main/startup-scripts/api-manager.sh b/modules/distribution/product/src/main/startup-scripts/api-manager.sh
@@ -355,6 +355,8 @@ do
     -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector \
     -Dorg.ops4j.pax.logging.logReaderEnabled=false \
     -Dorg.ops4j.pax.logging.eventAdminEnabled=false \
+    -Djdk.util.zip.disableZip64ExtraFieldValidation=true \
+    -Djdk.nio.zipfs.allowDotZipEntry=true \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?
 done
diff --git a/...tion_policies/definitions/addHeader_v1.j2 → ...tion_policies/definitions/addHeader_v2.j2 b/...tion_policies/definitions/addHeader_v1.j2 → ...tion_policies/definitions/addHeader_v2.j2
diff --git a/...policies/specifications/addHeader_v1.json → ...policies/specifications/addHeader_v2.json b/...policies/specifications/addHeader_v1.json → ...policies/specifications/addHeader_v2.json
@@ -1,23 +1,23 @@
 {
   "category": "Mediation",
   "name": "addHeader",
-  "version": "v1",
+  "version": "v2",
   "displayName": "Add Header",
   "description": "This policy allows you to add a new header to the request",
   "policyAttributes": [
     {
       "name": "headerName",
       "displayName": "Header Name",
       "description": "Name of the header to be added",
-      "validationRegex": "^([a-zA-Z_][a-zA-Z\\d_\\-\\ ]*)$",
+      "validationRegex": "^.+$",
       "type": "String",
       "required": true
     },
     {
       "name": "headerValue",
       "displayName": "Header Value",
       "description": "Value of the header",
-      "validationRegex": "^([a-zA-Z\\d_][a-zA-Z\\d_\\-\\ ]*)$",
+      "validationRegex": "^.+$",
       "type": "String",
       "required": true
     }

diff --git a/modules/distribution/resources/templates/gateway_policy_template.j2 b/modules/distribution/resources/templates/gateway_policy_template.j2
@@ -0,0 +1,8 @@
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"{{sequence_name}}\">
+{% if gateway_policies is defined %}
+   {% for policy in gateway_policies %}
+       {{policy}}
+   {% endfor %}
+{% endif %}
+</sequence>
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml b/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>am-features</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/features/product/org.wso2.am.security.feature/pom.xml b/modules/features/product/org.wso2.am.security.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>am-features</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/features/product/org.wso2.am.styles.feature/pom.xml b/modules/features/product/org.wso2.am.styles.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-features</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/features/product/pom.xml b/modules/features/product/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
     	<artifactId>am-features-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
@@ -21,7 +21,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml b/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>test-artifacts</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/backend-service/monitor-app/pom.xml b/modules/integration/tests-common/backend-service/monitor-app/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>test-artifacts</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/backend-service/pom.xml b/modules/integration/tests-common/backend-service/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>