Merge pull request #624 from bytedance/fix-jattach-notfound

Fix jattach notfound
bytedance · May 24, 2024 · ac4b48c · ac4b48c
2 parents 42f16f9 + caa63bf
commit ac4b48c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java b/rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java
@@ -244,8 +244,9 @@ public String call() throws Exception {
                             SmithAgentLogger.logger.warning(proberPath + " loading fail!");
                         }
                         else {
-                            System.setProperty("smith.rasp", probeVersion+"-"+checksumStr);
                             System.setProperty("smith.status", "attach");
+                            System.setProperty("smith.rasp", probeVersion+"-"+checksumStr);
+
                             System.setProperty("rasp.probe", "smith");
                         }
                     }

diff --git a/rasp/librasp/src/jvm.rs b/rasp/librasp/src/jvm.rs
@@ -4,7 +4,8 @@ use log::*;
 use regex::Regex;
 use std::process::Command;
 use std::fs;
-
+use std::thread;
+use std::time::Duration;
 use crate::async_command::run_async_process;
 use crate::process::ProcessInfo;
 use crate::runtime::{ProbeCopy, ProbeState, ProbeStateInspect};
@@ -71,7 +72,7 @@ pub fn java_attach(pid: i32) -> Result<bool> {
             if err.len() != 0 {
                 info!("{}", &err);
             }
-            //thread::sleep(Duration::from_millis(100));
+            std::thread::sleep(Duration::from_millis(500));
             match check_result(pid, "attach") {
                 Ok(_) => {
                     return Ok(true);

diff --git a/rasp/librasp/src/manager.rs b/rasp/librasp/src/manager.rs
@@ -352,8 +352,9 @@ impl RASPManager {
                             diff_ns = value;
                             if diff_ns {
                                 let to = format!("{}{}",root_dir.clone(), settings::RASP_JAVA_AGENT_BIN());
+                                self.copy_file_from_to_dest(settings::RASP_JAVA_JATTACH_BIN(), root_dir.clone());
                                 self.copy_file_from_to_dest(settings::RASP_JAVA_AGENT_BIN(), root_dir.clone());
-                                info!("copy from SmithAgent.jar to {}", to.clone());
+                                info!("copy from jattach/SmithAgent.jar to {}", to.clone());
                             }
                         }
                         Err(e) => {