将nuclei标签过滤表达式改为or

emo-crab · Oct 9, 2024 · 568dd5f · 568dd5f
1 parent 888f423
commit 568dd5f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 
 <!-- next-header -->
+
+## [2024.10.9] - 2024.10.9
+
+### Fixes
+
+- 将nuclei标签过滤表达式改为or
+
 ## [2024.8.16] - 2024.8.16
 
 ### Fixes

diff --git a/observer_ward/src/lib.rs b/observer_ward/src/lib.rs
@@ -125,7 +125,7 @@ impl MatchedResult {
             } else {
               args
                 .condition
-                .push(gen_nuclei_tags(&vpf.product, &matcher_result.info.tags));
+                .extend(gen_nuclei_tags(&vpf.product, &matcher_result.info.tags));
             }
             nuclei_map.insert(matcher_result.template.clone(), args);
           }

diff --git a/observer_ward/src/nuclei.rs b/observer_ward/src/nuclei.rs
@@ -100,7 +100,7 @@ impl NucleiRunner {
 }
 
 // 生成nuclei的标签过滤表达式
-pub fn gen_nuclei_tags(product: &str, tags: &[String]) -> String {
+pub fn gen_nuclei_tags(product: &str, tags: &[String]) -> Vec<String> {
   let mut or_condition = Vec::new();
   let finger_tags = ["detect", "tech"];
   let tags: Vec<String> = tags
@@ -112,15 +112,8 @@ pub fn gen_nuclei_tags(product: &str, tags: &[String]) -> String {
     or_condition.push(format!("contains(tags,'{}')", product));
   }
   // 只留单个的tags，防止误报
-  if tags.len() == 1 {
-    or_condition.push(format!("contains(tags,'{}')", tags[0]));
-  } else {
-    let mut and_condition = Vec::new();
-    for tag in tags {
-      and_condition.push(format!("contains(tags,'{}')", tag));
-    }
-    or_condition.push(format!("({})", and_condition.join("&&")));
+  for tag in tags {
+    or_condition.push(format!("contains(tags,'{}')", tag));
   }
-
-  or_condition.join("||")
+  or_condition
 }