feat: support shell registry for all server

This commit is contained in:
ReaJason
2025-02-23 02:33:09 +08:00
parent 1980ae7072
commit 3274e8421d
89 changed files with 469 additions and 1180 deletions
@@ -1,7 +1,7 @@
package com.reajason.javaweb.integration;
import com.reajason.javaweb.memshell.ShellType;
import com.reajason.javaweb.memshell.GeneratorMain;
import com.reajason.javaweb.memshell.MemShellGenerator;
import com.reajason.javaweb.antsword.AntSwordManager;
import com.reajason.javaweb.behinder.BehinderManager;
import com.reajason.javaweb.godzilla.GodzillaManager;
@@ -210,7 +210,7 @@ public class ShellAssertionTool {
log.info("generated {} antSword with pass: {}, headerValue: {}", shellType, antPassword, uniqueName);
break;
}
return GeneratorMain.generate(shellConfig, injectorConfig, shellToolConfig);
return MemShellGenerator.generate(shellConfig, injectorConfig, shellToolConfig);
}
public static void assertInjectIsOk(String url, String shellType, ShellTool shellTool, String content, Packers packer, GenericContainer<?> container) {
@@ -1,9 +1,9 @@
package com.reajason.javaweb.integration.xxljob;
import com.reajason.javaweb.memshell.server.XxlJobShell;
import com.reajason.javaweb.memshell.Packers;
import com.reajason.javaweb.memshell.Server;
import com.reajason.javaweb.memshell.ShellTool;
import com.reajason.javaweb.memshell.Packers;
import com.reajason.javaweb.memshell.ShellType;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.jar.asm.Opcodes;
import org.junit.jupiter.api.AfterAll;
@@ -39,8 +39,8 @@ public class XxlJob220ContainerTest {
static Stream<Arguments> casesProvider() {
return Stream.of(
arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Command, Packers.XxlJob),
arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Godzilla, Packers.XxlJob)
arguments(imageName, ShellType.NETTY_HANDLER, ShellTool.Command, Packers.XxlJob),
arguments(imageName, ShellType.NETTY_HANDLER, ShellTool.Godzilla, Packers.XxlJob)
);
}
@@ -1,5 +1,6 @@
package com.reajason.javaweb.integration.xxljob;
import com.reajason.javaweb.memshell.ShellType;
import com.reajason.javaweb.memshell.server.XxlJobShell;
import com.reajason.javaweb.memshell.Server;
import com.reajason.javaweb.memshell.ShellTool;
@@ -39,8 +40,8 @@ public class XxlJob230ContainerTest {
static Stream<Arguments> casesProvider() {
return Stream.of(
arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Command, Packers.XxlJob),
arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Godzilla, Packers.XxlJob)
arguments(imageName, ShellType.NETTY_HANDLER, ShellTool.Command, Packers.XxlJob),
arguments(imageName, ShellType.NETTY_HANDLER, ShellTool.Godzilla, Packers.XxlJob)
);
}