From 3309fde889475f92cd5d9bf54874f3d466712be0 Mon Sep 17 00:00:00 2001
From: cn-kali-team <kali-team@qq.com>
Date: Sat, 20 Jul 2024 20:42:20 +0800
Subject: [PATCH] update

---
 CHANGELOG.md                | 8 ++++++++
 Cargo.lock                  | 8 ++++----
 engine/Cargo.toml           | 2 +-
 observer_ward/src/cli.rs    | 2 +-
 observer_ward/src/lib.rs    | 4 +++-
 observer_ward/src/output.rs | 2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25eae6b4..cc1367bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Change Log
 
 <!-- next-header -->
+## [2024.7.20] - 2024.7.20
+
+### Fixes
+
+- 修复部分没有端口的探针
+- tcp添加超时计时器
+- 更新依赖
+- 替换输出换行符
 
 ## [Unreleased] - ReleaseDate
 
diff --git a/Cargo.lock b/Cargo.lock
index 1be15ea5..fac1625d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -406,9 +406,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 
 [[package]]
 name = "bytestring"
@@ -1562,9 +1562,9 @@ dependencies = [
 
 [[package]]
 name = "slinger"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8ca1e0103b41c686ed38de51be68bb359673c189a018f55ae34e15da17d0a4d"
+checksum = "fba180bd361f9440fd1cd84ee9c6404762dd83541a914befc318bcb3c81564f9"
 dependencies = [
  "base64",
  "bytes",
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index faa8e3f8..ea5e9e86 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -17,7 +17,7 @@ fancy-regex = { version = "0.13.0", default-features = false, features = [
 jsonpath-rust = "0.6.1"
 serde_json = "1"
 #git = "https://github.com/emo-crab/slinger",
-slinger = { version = "0.1.3", features = [
+slinger = { version = "0.1.4", features = [
   "serde",
   "cookie",
   "tls",
diff --git a/observer_ward/src/cli.rs b/observer_ward/src/cli.rs
index 543aa1de..061dac11 100644
--- a/observer_ward/src/cli.rs
+++ b/observer_ward/src/cli.rs
@@ -284,7 +284,7 @@ impl ObserverWardConfig {
   pub fn http_client_builder(&self) -> ClientBuilder {
     let mut client_builder = ClientBuilder::new();
     client_builder = client_builder.redirect(Policy::Custom(only_same_host));
-    client_builder = client_builder.timeout(Duration::from_secs(self.timeout));
+    client_builder = client_builder.timeout(Some(Duration::from_secs(self.timeout)));
     if let Ok(ua) = HeaderValue::from_str(&self.ua) {
       client_builder = client_builder.user_agent(ua);
     }
diff --git a/observer_ward/src/lib.rs b/observer_ward/src/lib.rs
index 3b59c8e2..963e428b 100644
--- a/observer_ward/src/lib.rs
+++ b/observer_ward/src/lib.rs
@@ -204,6 +204,7 @@ impl ClusterExecuteRunner {
     }
   }
 }
+
 // 处理http的探针
 impl ClusterExecuteRunner {
   fn http(
@@ -215,7 +216,6 @@ impl ClusterExecuteRunner {
     // 可能会有多个http，一般只有一个，多个会有flow控制
     for http in cluster.requests.http.iter() {
       let mut client_builder = http.http_option.builder_client();
-      client_builder = client_builder.timeout(Duration::from_secs(config.timeout));
       client_builder = client_builder.redirect(Policy::Custom(only_same_host));
       if let Ok(ua) = HeaderValue::from_str(&config.ua) {
         client_builder = client_builder.user_agent(ua);
@@ -250,6 +250,7 @@ impl ClusterExecuteRunner {
     Ok(())
   }
 }
+
 // 处理tcp的探针
 impl ClusterExecuteRunner {
   // 单个tcp
@@ -320,6 +321,7 @@ impl ClusterExecuteRunner {
     Ok(flag)
   }
 }
+
 // yaml字符串转字节
 fn input_to_byte(payload: &str) -> Vec<u8> {
   let mut buf = Vec::new();
diff --git a/observer_ward/src/output.rs b/observer_ward/src/output.rs
index 9ef41d5c..50c33969 100644
--- a/observer_ward/src/output.rs
+++ b/observer_ward/src/output.rs
@@ -16,7 +16,7 @@ pub struct Output {
 fn set_to_string(set: &HashSet<String>) -> String {
   set
     .iter()
-    .map(|x| x.trim().to_string())
+    .map(|x| x.trim().to_string().replace("\r\n", " ").replace('\t', ""))
     .collect::<HashSet<_>>()
     .iter()
     .cloned()