Merge pull request #292 from Nizernizer/main

log print and agent stats tag

Author: Nizernizer

.gitignore

@@ -30,4 +30,9 @@ release
 # for jenv
 .java-version
 
+dongtai-api.jar
+dongtai-core.jar
+dongtai-grpc.jar
+dongtai-spy.jar
+
 logs

README.md

@@ -77,7 +77,7 @@ Please refer to the [Quick Start](https://doc.dongtai.io).
 
 ### Supported Java versions and middleware
 
-- Java 1.6+
+- Java 1.8+
 - Tomcat, Jetty, WebLogic, WebSphere, SpringBoot and Mainstream software and middleware.
 
 <img src="https://static.scarf.sh/a.png?x-pxid=0c73ae79-fd43-46b9-a449-b8fcc259db85" />

README_CN.md

@@ -81,7 +81,7 @@ DongTai-agent-java 由`agent.jar`、`dongtai-core.jar `、`dongtai-inject.jar`
 
 #### 支持的Java版本及中间件
 
-- Java 1.6+
+- Java 1.8+
 - Tomcat、Jetty、WebLogic、WebSphere、SpringBoot等主流软件和中间件
 
 **notice:** `jdk 1.6`开发的Agent需要使用`Maven 3.2.5`进行构建

dongtai-agent/src/main/java/io/dongtai/iast/agent/AgentLauncher.java

@@ -31,7 +31,21 @@ public class AgentLauncher {
          * fix bug: java.lang.ClassCastException: weblogic.net.http.SOAPHttpsURLConnection cannot be cast to javax.net.ssl.HttpsURLConnection
          */
         System.setProperty("UseSunHttpHandler", "true");
-        System.setProperty("java.io.tmpdir.dongtai", System.getProperty("java.io.tmpdir")+ File.separator +UUID.randomUUID().toString().replaceAll("-","")+"/");
+        if (System.getProperty("java.io.tmpdir.dongtai") == null) {
+            String tmpdir = System.getProperty("java.io.tmpdir");
+            String appName = System.getProperty("dongtai.app.name");
+            String appVersion = System.getProperty("dongtai.app.version");
+            if (tmpdir == null) {
+                tmpdir = File.separator + "tmp";
+            }
+            if (appName == null) {
+                appName = "DemoProject";
+            }
+            if (appVersion == null) {
+                appVersion = "v1.0.0";
+            }
+            System.setProperty("java.io.tmpdir.dongtai", tmpdir + File.separator + appName + "-" + appVersion + "-" + UUID.randomUUID().toString().replaceAll("-", "") + "/");
+        }
     }
 
     /**

dongtai-agent/src/main/java/io/dongtai/iast/agent/IastProperties.java

@@ -45,7 +45,7 @@ private IastProperties() {
         try {
             init();
         } catch (ClassNotFoundException e) {
-            DongTaiLog.debug(e);
+            DongTaiLog.error(e);
         }
     }
 

dongtai-agent/src/main/java/io/dongtai/iast/agent/manager/EngineManager.java

@@ -37,6 +37,7 @@ public class EngineManager {
 
     private final Instrumentation inst;
     private int runningStatus;
+    private static boolean isCoreStop;
     private final IastProperties properties;
     private final String launchMode;
     private Class<?> classOfEngine;
@@ -298,6 +299,8 @@ public boolean install() {
                     String.class)
                     .invoke(null, launchMode, this.properties.getPropertiesFilePath(),
                             AgentRegisterReport.getAgentFlag(), inst, agentPath);
+            setRunningStatus(0);
+            setCoreStop(false);
             return true;
         } catch (IOException e) {
             DongTaiLog.error("DongTai engine start failed, Reason: dongtai-spy.jar or dongtai-core.jar open failed. path: \n\tdongtai-core.jar: " + corePackage + "\n\tdongtai-spy.jar: " + spyPackage);
@@ -321,6 +324,8 @@ public boolean start() {
             if (classOfEngine != null) {
                 classOfEngine.getMethod("start").invoke(null);
                 DongTaiLog.info("DongTai engine start successfully.");
+                setRunningStatus(0);
+                setCoreStop(false);
                 return true;
             }
             return false;
@@ -351,6 +356,8 @@ public boolean stop() {
             if (classOfEngine != null) {
                 classOfEngine.getMethod("stop").invoke(null);
                 DongTaiLog.info("DongTai engine stop successfully.");
+                setRunningStatus(1);
+                setCoreStop(true);
                 return true;
             }
             return false;
@@ -379,6 +386,8 @@ public boolean stop() {
      */
     public synchronized boolean uninstall() {
         if (null == IAST_CLASS_LOADER) {
+            setRunningStatus(1);
+            setCoreStop(true);
             return true;
         }
 
@@ -399,6 +408,8 @@ public synchronized boolean uninstall() {
         classOfEngine = null;
         IAST_CLASS_LOADER.closeIfPossible();
         IAST_CLASS_LOADER = null;
+        setRunningStatus(1);
+        setCoreStop(true);
         return true;
     }
 
@@ -409,4 +420,12 @@ public static String getPID() {
         }
         return PID;
     }
+
+    public static boolean isCoreStop() {
+        return isCoreStop;
+    }
+
+    public static void setCoreStop(boolean coreStop) {
+        isCoreStop = coreStop;
+    }
 }

dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/dubbo/DubboService.java

@@ -12,13 +12,13 @@ public boolean isMatch(RuntimeMXBean paramRuntimeMXBean, ClassLoader loader) {
             loader.loadClass("org.apache.dubbo.monitor.support.MonitorFilter");
             return true;
         } catch (Exception e) {
-            DongTaiLog.debug(e);
+            DongTaiLog.error(e);
         }
         try {
             loader.loadClass("com.alibaba.dubbo.monitor.support.MonitorFilter");
             return true;
         } catch (Exception e) {
-            DongTaiLog.debug(e);
+            DongTaiLog.error(e);
         }
         return false;
     }

dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/servlet/ServletService.java

@@ -12,13 +12,13 @@ public boolean isMatch(RuntimeMXBean paramRuntimeMXBean, ClassLoader loader) {
             loader.loadClass("javax.servlet.ServletRequest");
             return true;
         } catch (Exception e) {
-            DongTaiLog.debug(e);
+            DongTaiLog.error(e);
         }
         try {
             loader.loadClass("jakarta.servlet.ServletRequest");
             return true;
         } catch (Exception e) {
-            DongTaiLog.debug(e);
+            DongTaiLog.error(e);
         }
         return false;
     }

dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/weblogic/WebLogic.java

@@ -14,6 +14,7 @@ public class WebLogic implements IServer {
     public boolean isMatch(RuntimeMXBean paramRuntimeMXBean, ClassLoader loader) {
         File runFile = new File(".", "bin/startWebLogic.sh");
         File configFile = new File(".", "init-info/domain-info.xml");
+        System.setProperty("UseSunHttpHandler", "true");
         return runFile.exists() && configFile.exists();
     }
 

dongtai-agent/src/main/java/io/dongtai/iast/agent/monitor/MonitorDaemonThread.java

@@ -32,7 +32,7 @@ public MonitorDaemonThread(EngineManager engineManager) {
         this.engineManager = engineManager;
         try {
             delayTime = Integer.parseInt(System.getProperty("iast.engine.delay.time", "0"));
-            DongTaiLog.info("engine delay time is " + delayTime + " s");
+            DongTaiLog.info("dongtai engine delay time is " + delayTime + " s");
             delayTime = delayTime * 1000;
         } catch (Exception e) {
             DongTaiLog.error("engine delay time must be int,eg: 10、20");