feature: allow data report

Author: ‘niuerzhuang’

dongtai-agent/src/main/java/io/dongtai/iast/agent/monitor/impl/AgentStateMonitor.java

@@ -50,33 +50,26 @@ public void check() {
                 return;
             }
 
-            Map<String, String> stringStringMap = checkExpectState();
+            Map<String, Object> stringStringMap = checkExpectState();
             // 默认值
             String expectState = "other";
-            String allowReport = "1";
+            boolean allowReport = true;
 
             if (stringStringMap != null) {
-                expectState = stringStringMap.get("exceptRunningStatus");
-                allowReport = stringStringMap.get("isAllowDateReport");
-                if ("null".equals(allowReport)){
-                    allowReport = "1";
+                expectState = stringStringMap.get("exceptRunningStatus").toString();
+                if (null != stringStringMap.get("isAllowDateReport")) {
+                    allowReport = (boolean) stringStringMap.get("isAllowDateReport");
                 }
             }
 
-            if (!agentState.isAllowReport(allowReport)) {
-                if (null == agentState.getAllowReport()) {
-                    DongTaiLog.info("engine is not allowed to report data");
-                    agentState.setAllowReport(allowReport);
-                }
-                if (!allowReport.equals(agentState.getAllowReport())) {
-                    DongTaiLog.info("engine is not allowed to report data");
-                    agentState.setAllowReport(allowReport);
-                    engineManager.stop();
-                }
-            } else if (agentState.isAllowReport(allowReport) && !allowReport.equals(agentState.getAllowReport())) {
+            if (allowReport && !agentState.isAllowReport()) {
                 DongTaiLog.info("engine is allowed to report data");
                 agentState.setAllowReport(allowReport);
                 engineManager.start();
+            } else if (!allowReport && agentState.isAllowReport()) {
+                DongTaiLog.info("engine is not allowed to report data");
+                agentState.setAllowReport(allowReport);
+                engineManager.stop();
             }
 
             if (!agentState.isFallback() && !agentState.isException() && agentState.isAllowReport() && agentState.isAllowReport()) {
@@ -97,15 +90,15 @@ public void check() {
         }
     }
 
-    private Map<String, String> checkExpectState() {
+    private Map<String, Object> checkExpectState() {
         try {
             Map<String, String> parameters = new HashMap<String, String>();
             parameters.put("agentId", String.valueOf(AgentRegisterReport.getAgentId()));
             String respRaw = HttpClientUtils.sendGet(ApiPath.EXCEPT_ACTION, parameters).toString();
             if (!respRaw.isEmpty()) {
                 JSONObject resp = JSON.parseObject(respRaw);
                 JSONObject data = (JSONObject) resp.get("data");
-                Map<String, String> objectObjectHashMap = new HashMap<>(2);
+                Map<String, Object> objectObjectHashMap = new HashMap<>(2);
                 String s = data.toJSONString();
                 objectObjectHashMap = JSON.parseObject(s, Map.class);
                 return objectObjectHashMap;

dongtai-common/src/main/java/io/dongtai/iast/common/state/AgentState.java

@@ -5,7 +5,7 @@ public class AgentState {
     private State pendingState;
     private StateCause cause;
     private boolean fallback;
-    private Integer allowReport;
+    private boolean allowReport = true;
     private static AgentState INSTANCE;
 
     public static AgentState getInstance() {
@@ -97,23 +97,11 @@ public boolean isFallback() {
         return this.fallback;
     }
 
-    public Boolean isAllowReport(String allowReport) {
-        if (null == allowReport) {
-            return true;
-        } else {
-            return Integer.valueOf(allowReport).equals(1);
-        }
-    }
-
-    public Boolean isAllowReport() {
-        return 1 == this.allowReport;
-    }
-
-    public void setAllowReport(String allowReport) {
-        this.allowReport = Integer.valueOf(allowReport);
+    public boolean isAllowReport() {
+        return this.allowReport;
     }
 
-    public String getAllowReport() {
-        return String.valueOf(allowReport);
+    public void setAllowReport(boolean allowReport) {
+        this.allowReport = allowReport;
     }
 }