From 2bdf5184b67b1369650ea9932c419ed7d36dc4ae Mon Sep 17 00:00:00 2001
From: GDLMadushanka <gdlmadushanka@gmail.com>
Date: Wed, 16 Aug 2023 19:12:02 +0530
Subject: [PATCH] Introduce strict service path validation

Strictly check the service URL to starts with service path.
parameterize the enable/disable property
Fixes wso2/micro-integrator/issues/2935
---
 distribution/src/resources/config-tool/default.json            | 1 +
 .../resources/config-tool/templates/conf/axis2/axis2.xml.j2    | 3 +++
 pom.xml                                                        | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/distribution/src/resources/config-tool/default.json b/distribution/src/resources/config-tool/default.json
index 44b4780af6..19c11ee385 100644
--- a/distribution/src/resources/config-tool/default.json
+++ b/distribution/src/resources/config-tool/default.json
@@ -14,6 +14,7 @@
   "server.disable_rest": false,
   "server.sandesha2_storage_manager": "inmemory",
   "server.service_path": "services",
+  "server.strict_service_path_validation": false,
   "server.services_directory": "axis2services",
   "server.modules_directory": "axis2modules",
   "server.send_stacktrace_details_with_faults": false,
diff --git a/distribution/src/resources/config-tool/templates/conf/axis2/axis2.xml.j2 b/distribution/src/resources/config-tool/templates/conf/axis2/axis2.xml.j2
index b25accba9a..d065054851 100644
--- a/distribution/src/resources/config-tool/templates/conf/axis2/axis2.xml.j2
+++ b/distribution/src/resources/config-tool/templates/conf/axis2/axis2.xml.j2
@@ -50,6 +50,9 @@
     <!-- settings of your servlet container to map this context path to proper Axis2 servlets -->
     <parameter name="servicePath" locked="false">{{server.service_path}}</parameter>
 
+    <!-- This property will enable strict service URL validation -->
+    <parameter name="strictServicePathValidation" locked="false">{{server.strict_service_path_validation}}</parameter>
+
     <!--the directory in which .aar services are deployed inside axis2 repository-->
     <parameter name="ServicesDirectory">{{server.services_directory}}</parameter>
 
diff --git a/pom.xml b/pom.xml
index 4632ad9953..8205d4ae72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1568,7 +1568,7 @@
         <org.objenesis.version>2.1</org.objenesis.version>
 
         <!-- Apache Axis2 -->
-        <axis2.wso2.version>1.6.1-wso2v91</axis2.wso2.version>
+        <axis2.wso2.version>1.6.1-wso2v94</axis2.wso2.version>
         <!-- Please unify axis2 versions in future -->
         <axis2.wso2.integration.test.version>1.6.1-wso2v64</axis2.wso2.integration.test.version>
         <imp.pkg.version.axis2>[1.6.1, 1.7.0)</imp.pkg.version.axis2>