dev

.github/scripts/parse_changelog_of_version.py

@@ -9,7 +9,7 @@
     args = parser.parse_args()
     version = args.version
 
-    with open("../../CHANGELOG.md") as f:
+    with open("../../web/content/docs/changelog.mdx") as f:
         lines = f.readlines()
         for line in lines:
             if line.startswith(f"## [{version}]"):

.github/workflows/dev-deploy.yaml

@@ -25,6 +25,11 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: 22
+
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
         with:

.github/workflows/memshell-integration-test.yml

@@ -27,7 +27,7 @@ jobs:
           - middleware: "jbossas"
             depend_tasks: ":vul:vul-webapp:war"
           - middleware: "jbosseap"
-            depend_tasks: ":vul:vul-webapp:war"
+            depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
           - middleware: "wildfly"
             depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
           - middleware: "glassfish"

.github/workflows/probe-integration-test.yml

@@ -25,7 +25,7 @@ jobs:
           - middleware: "jbossas"
             depend_tasks: ":vul:vul-webapp:war"
           - middleware: "jbosseap"
-            depend_tasks: ":vul:vul-webapp:war"
+            depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
           - middleware: "wildfly"
             depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
           - middleware: "glassfish"

README.md

@@ -78,23 +78,6 @@ docker run --pull=always --rm -it -d -p 8080:8080 --name memshell-party ghcr.io/
 docker run --pull=always --rm -it -d -p 8080:8080 --name memshell-party ghcr.nju.edu.cn/reajason/memshell-party:latest
 ```
 
-镜像是无状态的，在需要更新最新镜像时，直接移除新建就好了
-
-```bash
-# 移除之前部署的
-docker rm -f memshell-party
-
-# 使用之前的部署命令重新部署（会自动拉取最新的镜像部署）
-docker run --pull=always --rm -it -d -p 8080:8080 --name memshell-party reajason/memshell-party:latest
-```
-
-## User Guide
-
-1. [适配情况](./docs/Compatibility.md)
-2. [本地构建](./docs/BuildOnLocal.md)
-3. [SDK 集成](./examples/memshell-party-maven-example)
-4. [代码贡献](./CONTRIBUTING.md)
-
 ## Special Thanks
 
 - [vulhub/java-chains](https://github.com/vulhub/java-chains)

boot/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
         exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
     }
     implementation(libs.commons.lang3)
-    implementation("org.springframework.boot:spring-boot-starter-jetty")
+    implementation("org.springframework.boot:spring-boot-starter-undertow")
     compileOnly("org.projectlombok:lombok")
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")

boot/src/main/java/com/reajason/javaweb/boot/controller/ClassNameParseController.java

@@ -17,7 +17,7 @@
 @CrossOrigin("*")
 public class ClassNameParseController {
 
-    @PostMapping("/className")
+    @PostMapping("/api/className")
     public String className(@RequestBody String classBase64) {
         return ClassNameReader.getClassName(new ClassReader(Base64.getDecoder().decode(classBase64)));
     }

boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java

@@ -17,7 +17,7 @@
  * @since 2024/12/13
  */
 @RestController
-@RequestMapping("/config")
+@RequestMapping("/api/config")
 @CrossOrigin("*")
 public class ConfigController {
 

boot/src/main/java/com/reajason/javaweb/boot/controller/MemShellGeneratorController.java

@@ -19,7 +19,7 @@
  * @since 2024/12/18
  */
 @RestController
-@RequestMapping("/memshell/generate")
+@RequestMapping("/api/memshell/generate")
 @CrossOrigin("*")
 public class MemShellGeneratorController {
     @PostMapping

boot/src/main/java/com/reajason/javaweb/boot/controller/ProbeShellGeneratorController.java

@@ -15,7 +15,7 @@
  * @since 2025/8/10
  */
 @RestController
-@RequestMapping("/probe/generate")
+@RequestMapping("/api/probe/generate")
 @CrossOrigin("*")
 public class ProbeShellGeneratorController {
     @PostMapping

boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java

@@ -22,7 +22,7 @@
  */
 @RestController
 @CrossOrigin("*")
-@RequestMapping("/version")
+@RequestMapping("/api/version")
 public class VersionController {
 
     @Value("${spring.application.version}")

boot/src/main/java/com/reajason/javaweb/boot/controller/ViewController.java

@@ -1,16 +1,76 @@
 package com.reajason.javaweb.boot.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.FileCopyUtils;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 
 /**
  * @author ReaJason
  * @since 2024/12/19
  */
 @Controller
+@Slf4j
 public class ViewController {
     @GetMapping("/")
     public String index(){
-        return "index";
+        return "redirect:/ui";
+    }
+
+    @GetMapping({"/api/search", "/api/search.data"})
+    @ResponseBody
+    public String handleSearch(HttpServletRequest request, HttpServletResponse response) {
+        String fullPath = request.getRequestURI().replace(request.getContextPath(), "");
+        String relativePath = fullPath.substring(1);
+        return renderFileData(relativePath, response);
+    }
+
+    @GetMapping({"/ui/docs/*.data", "/ui/*.data"})
+    @ResponseBody
+    public String handleDataFile(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        String fullPath = request.getRequestURI().replace(request.getContextPath(), "");
+        String relativePath = fullPath.substring(4);
+        return renderFileData(relativePath, response);
+    }
+
+
+    @GetMapping("/ui/**")
+    public String handleHtmlView(HttpServletRequest request) {
+        String fullPath = request.getRequestURI().replace(request.getContextPath(), "");
+        if ("/ui".equals(fullPath) || "/ui/".equals(fullPath)) {
+            return "index";
+        }
+        String viewPath = fullPath.substring(4);
+        return viewPath + "/index";
+    }
+
+    private String renderFileData(String relativePath, HttpServletResponse response) {
+        try {
+            String templatePath = "templates/" + relativePath;
+            ClassPathResource resource = new ClassPathResource(templatePath);
+            if (!resource.exists()) {
+                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                return "File not found: " + relativePath;
+            }
+            response.setContentType(MediaType.TEXT_PLAIN_VALUE);
+            response.setCharacterEncoding("UTF-8");
+            InputStreamReader reader = new InputStreamReader(
+                    resource.getInputStream(),
+                    StandardCharsets.UTF_8
+            );
+            return FileCopyUtils.copyToString(reader);
+        } catch (IOException e) {
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            return "Error reading file: " + e.getMessage();
+        }
     }
 }

boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateRequest.java

@@ -23,6 +23,7 @@ public static class ShellToolConfigDTO {
         private String godzillaPass;
         private String godzillaKey;
         private String commandParamName;
+        private String commandTemplate;
         private String behinderPass;
         private String antSwordPass;
         private String headerName;
@@ -50,6 +51,7 @@ public ShellToolConfig parseShellToolConfig() {
             case Command -> CommandConfig.builder()
                     .shellClassName(shellToolConfig.getShellClassName())
                     .paramName(shellToolConfig.getCommandParamName())
+                    .template(shellToolConfig.getCommandTemplate())
                     .encryptor(CommandConfig.Encryptor.fromString(shellToolConfig.getEncryptor()))
                     .implementationClass(CommandConfig.ImplementationClass.fromString(shellToolConfig.getImplementationClass()))
                     .build();

boot/src/main/java/com/reajason/javaweb/boot/dto/ProbeShellGenerateRequest.java

@@ -21,6 +21,7 @@ static class ProbeContentConfigDTO {
         private String server;
         private String sleepServer;
         private String reqParamName;
+        private String commandTemplate;
     }
 
     public ProbeContentConfig parseProbeContentConfig() {
@@ -34,6 +35,7 @@ public ProbeContentConfig parseProbeContentConfig() {
                     .build();
             case ResponseBody -> ResponseBodyConfig.builder()
                     .reqParamName(probeContentConfig.reqParamName)
+                    .commandTemplate(probeContentConfig.commandTemplate)
                     .server(probeContentConfig.server)
                     .build();
             default -> throw new UnsupportedOperationException("unknown probe method: " + probeConfig.getProbeMethod());

boot/src/main/resources/application.yaml

@@ -1,4 +1,7 @@
 spring:
   application:
     name: boot
-    version: ${version}
+    version: ${version}
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher

boot/src/test/java/com/reajason/javaweb/boot/controller/ConfigControllerIntegrationTest.java

@@ -26,21 +26,21 @@ public class ConfigControllerIntegrationTest {
 
     @Test
     public void testConfigEndpoint() {
-        ResponseEntity<Map> response = restTemplate.getForEntity("/config", Map.class);
+        ResponseEntity<Map> response = restTemplate.getForEntity("/api/config", Map.class);
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertNotNull(response.getBody());
     }
 
     @Test
     public void testConfigServersEndpoint() {
-        ResponseEntity<Map> response = restTemplate.getForEntity("/config/servers", Map.class);
+        ResponseEntity<Map> response = restTemplate.getForEntity("/api/config/servers", Map.class);
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertNotNull(response.getBody());
     }
 
     @Test
     public void testConfigPackersEndpoint() {
-        ResponseEntity<List> response = restTemplate.getForEntity("/config/packers", List.class);
+        ResponseEntity<List> response = restTemplate.getForEntity("/api/config/packers", List.class);
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertNotNull(response.getBody());
     }

boot/src/test/java/com/reajason/javaweb/boot/controller/MemShellGeneratorControllerTest.java

@@ -51,7 +51,7 @@ void generateShell() {
         shellToolConfigDTO.setHeaderValue("hello");
         request.setShellToolConfig(shellToolConfigDTO);
         ResponseEntity<MemShellGenerateResponse> response = restTemplate.postForEntity(
-                "/memshell/generate", request, MemShellGenerateResponse.class);
+                "/api/memshell/generate", request, MemShellGenerateResponse.class);
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertNotNull(response.getBody());
     }

build.gradle.kts

@@ -9,7 +9,7 @@ idea {
     }
 }
 
-version = "2.2.0"
+version = "2.3.0-SNAPSHOT"
 
 tasks.register("publishAllToMavenCentral") {
     dependsOn(":memshell-party-common:publishToMavenCentral")

generator/src/main/java/com/reajason/javaweb/memshell/MemShellGenerator.java

@@ -6,7 +6,13 @@
 import com.reajason.javaweb.memshell.config.ShellToolConfig;
 import com.reajason.javaweb.memshell.generator.InjectorGenerator;
 import com.reajason.javaweb.memshell.server.AbstractServer;
+import com.reajason.javaweb.probe.ProbeContent;
+import com.reajason.javaweb.probe.ProbeMethod;
+import com.reajason.javaweb.probe.config.ProbeConfig;
+import com.reajason.javaweb.probe.config.ResponseBodyConfig;
+import com.reajason.javaweb.probe.generator.response.ResponseBodyGenerator;
 import com.reajason.javaweb.utils.CommonUtil;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -46,6 +52,11 @@ public static MemShellResult generate(ShellConfig shellConfig, InjectorConfig in
             injectorConfig.setInjectorClassName(CommonUtil.generateInjectorClassName());
         }
 
+        if (shellConfig.isLambdaSuffix()) {
+            shellToolConfig.setShellClassName(CommonUtil.appendLambdaSuffix(shellToolConfig.getShellClassName()));
+            injectorConfig.setInjectorClassName(CommonUtil.appendLambdaSuffix(injectorConfig.getInjectorClassName()));
+        }
+
         byte[] shellBytes = ShellToolFactory.generateBytes(shellConfig, shellToolConfig);
 
         injectorConfig.setInjectorClass(injectorClass);
@@ -54,6 +65,25 @@ public static MemShellResult generate(ShellConfig shellConfig, InjectorConfig in
 
         InjectorGenerator injectorGenerator = new InjectorGenerator(shellConfig, injectorConfig);
         byte[] injectorBytes = injectorGenerator.generate();
+        if (shellConfig.isProbe() && !shellConfig.getShellType().startsWith(ShellType.AGENT)) {
+            ProbeConfig probeConfig = ProbeConfig.builder()
+                    .shellClassName(injectorConfig.getInjectorClassName() + "1")
+                    .probeMethod(ProbeMethod.ResponseBody)
+                    .probeContent(ProbeContent.Bytecode)
+                    .targetJreVersion(shellConfig.getTargetJreVersion())
+                    .byPassJavaModule(shellConfig.isByPassJavaModule())
+                    .shrink(shellConfig.isShrink())
+                    .debug(shellConfig.isDebug())
+                    .staticInitialize(injectorConfig.isStaticInitialize())
+                    .build();
+            ResponseBodyConfig responseBodyConfig = ResponseBodyConfig.builder()
+                    .server(serverName)
+                    .base64Bytes(Base64.encodeBase64String(CommonUtil.gzipCompress(injectorBytes)))
+                    .build();
+            injectorBytes = new ResponseBodyGenerator(probeConfig, responseBodyConfig).getBytes();
+            injectorConfig.setInjectorClassName(probeConfig.getShellClassName());
+        }
+
         Map<String, byte[]> innerClassBytes = injectorGenerator.getInnerClassBytes();
 
         return MemShellResult.builder()

generator/src/main/java/com/reajason/javaweb/memshell/ServerFactory.java

@@ -69,7 +69,10 @@ public class ServerFactory {
                 .addShellClass(NETTY_HANDLER, GodzillaNettyHandler.class)
                 .addShellClass(AGENT_FILTER_CHAIN, Godzilla.class)
                 .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, Godzilla.class)
-                .addShellClass(JETTY_AGENT_HANDLER, GodzillaJettyHandler.class)
+                .addShellClass(HANDLER, GodzillaJettyHandler.class)
+                .addShellClass(JAKARTA_HANDLER, GodzillaJettyHandler.class)
+                .addShellClass(CUSTOMIZER, GodzillaJettyCustomizer.class)
+                .addShellClass(JETTY_AGENT_HANDLER, GodzillaJettyAgentHandler.class)
                 .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, GodzillaUndertowServletHandler.class)
                 .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, Godzilla.class)
                 .addShellClass(WAS_AGENT_FILTER_MANAGER, Godzilla.class)
@@ -129,6 +132,7 @@ public class ServerFactory {
                 .addShellClass(JAKARTA_PROXY_VALVE, Command.class)
                 .addShellClass(WEBSOCKET, CommandWebSocket.class)
                 .addShellClass(JAKARTA_WEBSOCKET, CommandWebSocket.class)
+                .addShellClass(UPGRADE, CommandUpgrade.class)
                 .addShellClass(SPRING_WEBMVC_INTERCEPTOR, CommandInterceptor.class)
                 .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, CommandInterceptor.class)
                 .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, CommandControllerHandler.class)
@@ -140,7 +144,10 @@ public class ServerFactory {
                 .addShellClass(NETTY_HANDLER, CommandNettyHandler.class)
                 .addShellClass(AGENT_FILTER_CHAIN, Command.class)
                 .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, Command.class)
-                .addShellClass(JETTY_AGENT_HANDLER, CommandJettyHandler.class)
+                .addShellClass(JETTY_AGENT_HANDLER, CommandJettyAgentHandler.class)
+                .addShellClass(HANDLER, CommandJettyHandler.class)
+                .addShellClass(CUSTOMIZER, CommandJettyCustomizer.class)
+                .addShellClass(JAKARTA_HANDLER, CommandJettyHandler.class)
                 .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, CommandUndertowServletHandler.class)
                 .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, Command.class)
                 .addShellClass(WAS_AGENT_FILTER_MANAGER, Command.class)

generator/src/main/java/com/reajason/javaweb/memshell/ShellType.java

@@ -15,17 +15,22 @@ public class ShellType {
     public static final String JAKARTA_LISTENER = JAKARTA + LISTENER;
 
     public static final String VALVE = "Valve";
+    public static final String UPGRADE = "Upgrade";
     public static final String JAKARTA_VALVE = JAKARTA + VALVE;
     public static final String PROXY_VALVE = "Proxy" + VALVE;
     public static final String JAKARTA_PROXY_VALVE = JAKARTA + PROXY_VALVE;
 
+    public static final String HANDLER = "Handler";
+    public static final String JAKARTA_HANDLER = JAKARTA + HANDLER;
+    public static final String CUSTOMIZER = "Customizer";
+
     public static final String NETTY_HANDLER = "NettyHandler";
 
     public static final String AGENT = "Agent";
 
     public static final String AGENT_FILTER_CHAIN = AGENT + "FilterChain";
     public static final String CATALINA_AGENT_CONTEXT_VALVE = AGENT + "ContextValve";
-    public static final String JETTY_AGENT_HANDLER = AGENT + "Handler";
+    public static final String JETTY_AGENT_HANDLER = AGENT + HANDLER;
     public static final String UNDERTOW_AGENT_SERVLET_HANDLER = AGENT + "ServletHandler";
     public static final String WAS_AGENT_FILTER_MANAGER = AGENT + "FilterManager";
     public static final String WEBLOGIC_AGENT_SERVLET_CONTEXT = AGENT + "ServletContext";