diff --git a/README.md b/README.md index 54ce3d73..983c676d 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,10 @@ MemShellParty 是一款专注于主流 Web 中间件的内存马快速生成工具，致力于简化安全研究人员和红队成员的工作流程，提升攻防效率。

- normal_memshell - agent_memshell - dnslog_probe - about_page + normal_memshell + agent_memshell + dnslog_probe + about_page

## 主要特性 diff --git a/asserts/about_page.png b/assets/about_page.png similarity index 100% rename from asserts/about_page.png rename to assets/about_page.png diff --git a/asserts/agent/jattach-linux b/assets/agent/jattach-linux similarity index 100% rename from asserts/agent/jattach-linux rename to assets/agent/jattach-linux diff --git a/asserts/agent_memshell.png b/assets/agent_memshell.png similarity index 100% rename from asserts/agent_memshell.png rename to assets/agent_memshell.png diff --git a/asserts/dnslog_probe.png b/assets/dnslog_probe.png similarity index 100% rename from asserts/dnslog_probe.png rename to assets/dnslog_probe.png diff --git a/asserts/http_post_server.py b/assets/http_post_server.py similarity index 100% rename from asserts/http_post_server.py rename to assets/http_post_server.py diff --git a/asserts/k6test.js b/assets/k6test.js similarity index 100% rename from asserts/k6test.js rename to assets/k6test.js diff --git a/asserts/neoreg/Dockerfile b/assets/neoreg/Dockerfile similarity index 100% rename from asserts/neoreg/Dockerfile rename to assets/neoreg/Dockerfile diff --git a/asserts/neoreg/neoreg.py b/assets/neoreg/neoreg.py similarity index 100% rename from asserts/neoreg/neoreg.py rename to assets/neoreg/neoreg.py diff --git a/asserts/normal_memshell.png b/assets/normal_memshell.png similarity index 100% rename from asserts/normal_memshell.png rename to assets/normal_memshell.png diff --git a/asserts/suo5/suo5-darwin-arm64 b/assets/suo5/suo5-darwin-arm64 similarity index 100% rename from asserts/suo5/suo5-darwin-arm64 rename to assets/suo5/suo5-darwin-arm64 diff --git a/asserts/suo5/suo5-linux-amd64 b/assets/suo5/suo5-linux-amd64 similarity index 100% rename from asserts/suo5/suo5-linux-amd64 rename to assets/suo5/suo5-linux-amd64 diff --git a/asserts/suo5/suo5v2-darwin-arm64 b/assets/suo5/suo5v2-darwin-arm64 similarity index 100% rename from asserts/suo5/suo5v2-darwin-arm64 rename to assets/suo5/suo5v2-darwin-arm64 diff --git a/asserts/suo5/suo5v2-linux-amd64 b/assets/suo5/suo5v2-linux-amd64 similarity index 100% rename from asserts/suo5/suo5v2-linux-amd64 rename to assets/suo5/suo5v2-linux-amd64 diff --git a/docs/README.en.md b/docs/README.en.md index 9a170bbe..ae379670 100644 --- a/docs/README.en.md +++ b/docs/README.en.md @@ -36,9 +36,9 @@ What you can learn or try from this project: 4. Try using [Byte Buddy](https://bytebuddy.net/) to generate classes and write Agents. 5. Try using Gradle to build Java projects (using platform for dependency version management, toolchain to compile JDK 6 source code even in a JDK 17 environment within the root project). -![normal_generator](../asserts/normal_generator.png) +![normal_generator](../assets/normal_generator.png) -![agent_generator](../asserts/agent_generator.png) +![agent_generator](../assets/agent_generator.png) ## Key Features diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java index ce2a63d1..f99124d1 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java @@ -18,7 +18,7 @@ public class ContainerTool { public static final MountableFile warFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp", "build", "libs", "vul-webapp.war").toAbsolutePath(), 0666); public static final MountableFile struct2WarFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-struct2", "build", "libs", "vul-struct2.war").toAbsolutePath()); public static final MountableFile springBoot2WarFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-springboot2", "build", "libs", "vul-springboot2.war").toAbsolutePath()); - public static final Path neoGeorgDockerfile = Path.of("..", "asserts", "neoreg", "Dockerfile").toAbsolutePath(); + public static final Path neoGeorgDockerfile = Path.of("..", "assets", "neoreg", "Dockerfile").toAbsolutePath(); public static final Path springBoot1Dockerfile = Path.of("..", "vul", "vul-springboot1", "Dockerfile").toAbsolutePath(); public static final Path springBoot2Dockerfile = Path.of("..", "vul", "vul-springboot2", "Dockerfile").toAbsolutePath(); public static final Path springBoot2JettyDockerfile = Path.of("..", "vul", "vul-springboot2-jetty", "Dockerfile").toAbsolutePath(); @@ -27,7 +27,7 @@ public class ContainerTool { 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("..", "assets", "agent", "jattach-linux")); public static final MountableFile tomcatPid = MountableFile.forHostPath(Path.of("script", "tomcat_pid.sh")); public static final MountableFile tongweb8Pid = MountableFile.forHostPath(Path.of("script", "tongweb8_pid.sh")); public static final MountableFile resinPid = MountableFile.forHostPath(Path.of("script", "resin_pid.sh")); diff --git a/tools/suo5/src/main/java/com/reajason/javaweb/suo5/Suo5Manager.java b/tools/suo5/src/main/java/com/reajason/javaweb/suo5/Suo5Manager.java index bf9de578..cd676139 100644 --- a/tools/suo5/src/main/java/com/reajason/javaweb/suo5/Suo5Manager.java +++ b/tools/suo5/src/main/java/com/reajason/javaweb/suo5/Suo5Manager.java @@ -27,8 +27,8 @@ public class Suo5Manager { if (!pwd.endsWith("MemShellParty")) { pwd = pwd.getParent(); } - suo5Command = pwd.resolve(Paths.get("asserts", "suo5", "suo5-" + osType + "-" + osArch)).toAbsolutePath().toString(); - suo5v2Command = pwd.resolve(Paths.get("asserts", "suo5", "suo5v2-" + osType + "-" + osArch)).toAbsolutePath().toString(); + suo5Command = pwd.resolve(Paths.get("assets", "suo5", "suo5-" + osType + "-" + osArch)).toAbsolutePath().toString(); + suo5v2Command = pwd.resolve(Paths.get("assets", "suo5", "suo5v2-" + osType + "-" + osArch)).toAbsolutePath().toString(); } public static void main(String[] args) { diff --git a/web/copy-build.js b/web/copy-build.js index b020ec7d..211152e2 100644 --- a/web/copy-build.js +++ b/web/copy-build.js @@ -7,7 +7,7 @@ const STATIC_DIR = join(BASE_DIR, "static"); const ASSETS_DIR = join(STATIC_DIR, "assets"); const TEMPLATES_DIR = join(BASE_DIR, "templates"); const BUILD_DIR = resolve("build/client"); -const BUILD_ASSERTS_DIR = join(BUILD_DIR, "assets"); +const BUILD_ASSETS_DIR = join(BUILD_DIR, "assets"); function findUiDirectory(baseDir, maxDepth = 5) { function search(currentDir, depth) { @@ -52,7 +52,7 @@ async function main() { try { await cp(join(BUILD_DIR, "favicon.ico"), join(STATIC_DIR, "favicon.ico")); - await cp(BUILD_ASSERTS_DIR, ASSETS_DIR, { recursive: true }); + await cp(BUILD_ASSETS_DIR, ASSETS_DIR, { recursive: true }); } catch (err) { console.error("Error copying assets:", err); process.exit(1);