refactor: use commonUtil for packageName

Author: ReaJason

generator/src/main/java/com/reajason/javaweb/utils/CommonUtil.java

@@ -111,38 +111,35 @@ public static String appendLambdaSuffix(String className) {
         return className + "$Proxy0$$Lambda$1";
     }
 
-    public static String generateShellClassName(String server, String shellType) {
-        String packageName;
+    public static String getWebPackageNameForServer(String server) {
         switch (server) {
             case Jetty:
-                packageName = "org.eclipse.jetty.servlet.handlers";
-                break;
+                return "org.eclipse.jetty.servlet.handlers";
             case Undertow:
-                packageName = "io.undertow.servlet.handlers";
-                break;
+                return "io.undertow.servlet.handlers";
             case SpringWebMvc:
-                packageName = "org.springframework.boot.mvc.handlers";
-                break;
+                return "org.springframework.boot.mvc.handlers";
             case SpringWebFlux:
-                packageName = "org.springframework.boot.webflux.handlers";
-                break;
+                return "org.springframework.boot.webflux.handlers";
             case WebSphere:
-                packageName = "com.ibm.ws.webcontainer.handlers";
-                break;
+                return "com.ibm.ws.webcontainer.handlers";
             case WebLogic:
-                packageName = "weblogic.servlet.internal.handlers";
-                break;
+                return "weblogic.servlet.internal.handlers";
             case Resin:
-                packageName = "com.caucho.server.dispatch.handlers";
-                break;
+                return "com.caucho.server.dispatch.handlers";
             case BES:
-                packageName = "com.bes.enterprise.webtier.web.handlers";
-                break;
+                return "com.bes.enterprise.webtier.web.handlers";
+            case Apusic:
+                return "com.apusic.web.handlers";
+            case InforSuite:
+                return "com.cvicse.inforsuite.web.handlers";
             default:
-                packageName = "org.apache.http.web.handlers";
-                break;
+                return "org.apache.http.web.handlers";
         }
-        return packageName
+    }
+
+    public static String generateShellClassName(String server, String shellType) {
+        return getWebPackageNameForServer(server)
                 + "." + getRandomString(5)
                 + "." + MIDDLEWARE_NAMES[new Random().nextInt(MIDDLEWARE_NAMES.length)] + shellType;
     }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/glassfish/GlassFish3ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.AfterAll;
@@ -107,6 +108,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getGlassFishFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/glassfish/GlassFish4ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.AfterAll;
@@ -20,7 +21,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.time.Duration;
 import java.util.List;
 
 import static com.reajason.javaweb.integration.ContainerTool.getUrl;
@@ -108,6 +108,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getGlassFishFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/glassfish/GlassFish501ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeAll;
@@ -100,6 +101,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getGlassFishFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/glassfish/GlassFish510ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeAll;
@@ -101,6 +102,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getGlassFishFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/glassfish/GlassFish6ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeAll;
@@ -101,6 +102,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getGlassFishFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/glassfish/GlassFish7ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.AfterAll;
@@ -107,6 +108,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getGlassFishFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/jbossas/Jboss423ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
@@ -96,6 +97,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getTomcatFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/jbossas/Jboss510ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
@@ -94,6 +95,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getTomcatFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/jbossas/Jboss610ContainerTest.java

@@ -7,6 +7,7 @@
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
@@ -94,6 +95,6 @@ void testFilterFirstInject() {
         String data = VulTool.post(url + "/b64", DetectionTool.getTomcatFilterProbe());
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("org.apache.http.web.handlers")));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.GlassFish))));
     }
 }