Merge pull request #672 from bytedance/fix-netty

fix netty lib
bytedance · Aug 8, 2024 · 968251c · 968251c
2 parents 6956642 + b4c5396
commit 968251c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/rasp/jvm/JVMAgent/build.gradle b/rasp/jvm/JVMAgent/build.gradle
@@ -33,7 +33,8 @@ jar {
 }
 
 shadowJar {
-    relocate 'org.apache.commons', 'rasp.org.apache.commons'
+    relocate 'io.netty', 'agent.io.netty'
+    relocate 'org.apache.commons', 'agent.org.apache.commons'
     relocate 'META-INF/native/libnetty', 'META-INF/native/librasp_netty'
 }
 
diff --git a/rasp/jvm/JVMAgent/src/main/java/com/security/smith/FileDescriptorProcessor.java b/rasp/jvm/JVMAgent/src/main/java/com/security/smith/FileDescriptorProcessor.java
@@ -10,7 +10,7 @@ public static Object transform(Object object) {
 
         try {
             return FieldUtils.readField(object, "fd", true);
-        } catch (IllegalAccessException e) {
+        } catch (Throwable e) {
             SmithAgentLogger.exception(e);
         }
 

diff --git a/rasp/jvm/JVMAgent/src/main/java/com/security/smith/ProcessProcessor.java b/rasp/jvm/JVMAgent/src/main/java/com/security/smith/ProcessProcessor.java
@@ -10,7 +10,7 @@ public static Object transform(Object object) {
 
         try {
             return FieldUtils.readField(object, "pid", true);
-        } catch (IllegalAccessException e) {
+        } catch (Throwable e) {
             SmithAgentLogger.exception(e);
         }