Upgrade vectorscan from v0.0.4 to v0.0.5; add additional `rules check…

…` debug output
praetorian-inc · Dec 9, 2024 · 3e2a837 · 3e2a837
1 parent fb766d9
commit 3e2a837
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/noseyparker-cli/Cargo.toml b/crates/noseyparker-cli/Cargo.toml
@@ -108,7 +108,7 @@ tracing = "0.1"
 tracing-log = "0.2"
 tracing-subscriber = { version = "0.3", features = ["tracing-log", "ansi", "env-filter", "smallvec", "fmt"], default-features = false }
 url = "2.3"
-vectorscan-rs = { version = "0.0.4" }
+vectorscan-rs = { version = "0.0.5" }
 object-pool = "0.6.0"
 parquet = { version = "53.2.0", optional = true }
 arrow-schema = { version = "53.2.0", optional = true }

diff --git a/crates/noseyparker-cli/src/cmd_rules/cmd_rules_check.rs b/crates/noseyparker-cli/src/cmd_rules/cmd_rules_check.rs
@@ -1,7 +1,7 @@
 use anyhow::{bail, Context, Result};
 use regex::Regex;
 use std::collections::HashSet;
-use tracing::{error, error_span, info, warn};
+use tracing::{debug, error, error_span, info, warn};
 use vectorscan_rs::{BlockDatabase, Flag, Pattern, Scan};
 
 use noseyparker::rules_database::RulesDatabase;
@@ -269,12 +269,15 @@ fn check_rule(rule: &Rule, args: &RulesCheckArgs) -> Result<CheckStats> {
         }
     };
 
-    match hs_compile_pattern(&syntax.uncommented_pattern()) {
+    let uncommented_pattern = syntax.uncommented_pattern();
+    match hs_compile_pattern(&uncommented_pattern) {
         Err(e) => {
             error!("Vectorscan: failed to compile pattern: {e}");
             num_errors += 1;
         }
         Ok(db) => {
+            debug!("{} regex bytes -> {} vectorscan bytes", uncommented_pattern.len(), db.size()?);
+
             let mut scanner = vectorscan_rs::BlockScanner::new(&db)?;
 
             let mut num_succeeded = 0;

diff --git a/crates/noseyparker/Cargo.toml b/crates/noseyparker/Cargo.toml
@@ -55,7 +55,7 @@ thiserror = "1"
 tokio = { version = "1.23", optional = true }
 tracing = "0.1"
 url = "2.3"
-vectorscan-rs = { version = "0.0.4" }
+vectorscan-rs = { version = "0.0.5" }
 
 [dev-dependencies]
 pretty_assertions = "1.3"