Merge pull request HXSecurity#316 from Nizernizer/main

fix: log upload

Author: Nizernizer

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

@@ -220,7 +220,7 @@ private String getDebugFlag() {
 
  public String getLogPort() {
  if (logPort == null) {
- logPort = System.getProperty("dongtai.log.port", "30909");
+ logPort = System.getProperty("dongtai.log.port");
  }
  return logPort;
  }

dongtai-agent/src/main/java/io/dongtai/iast/agent/util/FileUtils.java

@@ -68,7 +68,19 @@ public static void confReplace(String path) {
  temp = temp.replace("${OPENAPI}", logAddress);
  }
  }else if (temp.contains("${LOG_PORT}")){
- temp = temp.replace("${LOG_PORT}",IastProperties.getInstance().getLogPort());
+ String logPort = IastProperties.getInstance().getLogPort();
+ if (null == logPort){
+ String s = IastProperties.getInstance().getBaseUrl();
+ s = s.substring(s.indexOf("://") + 3, s.indexOf("/openapi"));
+ if(s.contains(":")){
+ s = s.substring(s.indexOf(":")+1);
+ temp = temp.replace("${LOG_PORT}", s);
+ }else {
+ temp = temp.replace("${LOG_PORT}", "80");
+ }
+ }else {
+ temp = temp.replace("${LOG_PORT}", logPort);
+ }
  }else if (temp.contains("${LOG_PATH}")){
  temp = temp.replace("${LOG_PATH}", System.getProperty("java.io.tmpdir.dongtai")+File.separator+"dongtaiJavaAgentLogs"+File.separator+"dongtai_javaagent.log");
  }

dongtai-agent/src/main/resources/bin/fluent.conf

@@ -1,7 +1,7 @@
 [SERVICE]
  Flush 5
  Daemon OFF
- Log_Level info
+ Log_Level error
  HTTP_Server Off
 [INPUT]
  Name tail
@@ -18,8 +18,11 @@
  Record hostname ${HOSTNAME}
  Record agent ${AGENT_ID}
 [OUTPUT]
- Name tcp
+ Name http
  Match *
  Host ${OPENAPI}
  Port ${LOG_PORT}
+ URI /log/
+ HTTP_User sjkadfkjdsahfkds
+ HTTP_Passwd dsjkfkjsadfhkjsadhfksdsjdafjkdsagfjhsadgfjsdfg12312!
  Format json_lines