feat stack report

bytedance · Nov 26, 2024 · 0ada207 · 0ada207
1 parent 9e37d8c
commit 0ada207
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java
@@ -444,7 +444,7 @@ public void start() {
         smithproxyTimer.schedule(
                 smithproxyTimerTask,
                 0,
-                TimeUnit.MINUTES.toMillis(1)
+                TimeUnit.MINUTES.toMillis(10)
         );
         smithProxy.setClient(client);
         smithProxy.setDisruptor(disruptor);
@@ -737,6 +737,22 @@ public void onEvent(Trace trace, long sequence, boolean endOfBatch) {
         client.write(Operate.TRACE, jsonElement);
     }
 
+    public StackTraceElement[] formatCurrentStackTrace() {
+        StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+        if (stackTrace == null) {
+            return new StackTraceElement[0];
+        }
+        int startIndex = 0;
+        for (int i = 0; i < stackTrace.length; i++) {
+            StackTraceElement element = stackTrace[i];
+            if (element.getClassName().startsWith("com.security.smithloader.SmithAgent")) {
+                startIndex = i;
+                break;
+            }
+        }
+        return Arrays.copyOfRange(stackTrace, startIndex + 1, stackTrace.length);
+    }
+
     public void printClassfilter(ClassFilter data) {
         SmithLogger.logger.info("------------------------------------------------------------------------");
         SmithLogger.logger.info("className:" + data.getClassName());
@@ -833,7 +849,7 @@ private void checkClassFilter(ClassLoader loader, String className, byte[] class
 
                 classFilter.setRuleId(rule_id);
                 classFilter.setTransId();
-                classFilter.setStackTrace(Thread.currentThread().getStackTrace());
+                classFilter.setStackTrace(formatCurrentStackTrace());
 
                 Gson gson = new GsonBuilder()
                 .registerTypeAdapter(ClassFilter.class, new ClassFilterSerializer())
@@ -1219,7 +1235,7 @@ public void onScanAllClass() {
                     }
                     classFilter.setTransId();
                     classFilter.setRuleId(rule_id);
-                    classFilter.setStackTrace(Thread.currentThread().getStackTrace());
+                    classFilter.setStackTrace(formatCurrentStackTrace());
 
                     Gson gson = new GsonBuilder()
                     .registerTypeAdapter(ClassFilter.class, new ClassFilterSerializer())

diff --git a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbeProxy.java b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbeProxy.java
@@ -248,7 +248,7 @@ public void trace(int classID, int methodID, Object[] args, Object ret, boolean
             trace.setBlocked(blocked);
             trace.setRet(ret);
             trace.setArgs(args);
-            trace.setStackTrace(Thread.currentThread().getStackTrace());
+            trace.setStackTrace(SmithProbeObj.formatCurrentStackTrace());
             trace.setTypes(SmithProbeObj.getFuncTypes(classID, methodID));
 
             ringBuffer.publish(sequence);
@@ -290,7 +290,7 @@ public void sendMetadataClass(Class<?> cla, int classID, int methodID) {
             classFilter.setClassId(classID);
             classFilter.setMethodId(methodID);
             classFilter.setTypes(SmithProbeObj.getFuncTypes(classID, methodID));
-            classFilter.setStackTrace(Thread.currentThread().getStackTrace());
+            classFilter.setStackTrace(SmithProbeObj.formatCurrentStackTrace());
             if (client != null) {
                 Gson gson = new GsonBuilder()
                 .registerTypeAdapter(ClassFilter.class, new ClassFilterSerializer())

diff --git a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/message/TraceSerializer.java b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/message/TraceSerializer.java
@@ -56,11 +56,10 @@ private String[] convertStackTrace(StackTraceElement[] stackTrace) {
             return ret;
 
         try {
-            StackTraceElement[] elements = Arrays.copyOfRange(stackTrace, 2, stackTrace.length);
-            String[] result = new String[elements.length];
+            String[] result = new String[stackTrace.length];
 
-            for (int i = 0; i < elements.length; i++) {
-                result[i] = elements[i].toString();
+            for (int i = 0; i < stackTrace.length; i++) {
+                result[i] = stackTrace[i].toString();
             } 
 
             return result;