Skip to content

Commit d010f67

Browse files
cursoragentscript3r
andcommitted
Refactor: Improve code formatting and readability
Co-authored-by: script3r <script3r@gmail.com>
1 parent 09a80b0 commit d010f67

4 files changed

Lines changed: 43 additions & 25 deletions

File tree

crates/cli/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ struct Args {
2222
#[arg(long, value_name = "FILE")]
2323
sarif: Option<PathBuf>,
2424

25-
2625
/// Number of threads
2726
#[arg(long, value_name = "N")]
2827
threads: Option<usize>,

crates/cli/tests/anchors.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ fn write_file(dir: &Path, rel: &str, contents: &str) {
1414

1515
fn tmp_dir(prefix: &str) -> PathBuf {
1616
let mut base = std::env::temp_dir();
17-
let ts = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos();
17+
let ts = SystemTime::now()
18+
.duration_since(UNIX_EPOCH)
19+
.unwrap()
20+
.as_nanos();
1821
let pid = std::process::id();
1922
base.push(format!("cipherscope_test_{}_{}_{}", prefix, pid, ts));
2023
fs::create_dir_all(&base).unwrap();
@@ -48,9 +51,7 @@ public class ImportOnly {
4851
);
4952
let findings = scanner.run(std::slice::from_ref(&dir_import_only)).unwrap();
5053
assert!(
51-
!findings
52-
.iter()
53-
.any(|f| f.library == "Google Tink (Java)"),
54+
!findings.iter().any(|f| f.library == "Google Tink (Java)"),
5455
"Tink should not be reported with import only"
5556
);
5657

@@ -71,9 +72,7 @@ public class ApiOnly {
7172
);
7273
let findings = scanner.run(std::slice::from_ref(&dir_api_only)).unwrap();
7374
assert!(
74-
!findings
75-
.iter()
76-
.any(|f| f.library == "Google Tink (Java)"),
75+
!findings.iter().any(|f| f.library == "Google Tink (Java)"),
7776
"Tink should not be reported with API mentions only"
7877
);
7978

@@ -95,10 +94,7 @@ public class Both {
9594
);
9695
let findings = scanner.run(std::slice::from_ref(&dir_both)).unwrap();
9796
assert!(
98-
findings
99-
.iter()
100-
.any(|f| f.library == "Google Tink (Java)"),
97+
findings.iter().any(|f| f.library == "Google Tink (Java)"),
10198
"Tink should be reported when import and API are present"
10299
);
103100
}
104-

crates/cli/tests/filtering.rs

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ fn write_file(dir: &Path, rel: &str, contents: &str) {
1414

1515
fn tmp_dir(prefix: &str) -> PathBuf {
1616
let mut base = std::env::temp_dir();
17-
let ts = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos();
17+
let ts = SystemTime::now()
18+
.duration_since(UNIX_EPOCH)
19+
.unwrap()
20+
.as_nanos();
1821
let pid = std::process::id();
1922
base.push(format!("cipherscope_test_{}_{}_{}", prefix, pid, ts));
2023
fs::create_dir_all(&base).unwrap();
@@ -54,9 +57,7 @@ public class Main {
5457
);
5558
let findings = scanner.run(std::slice::from_ref(&dir)).unwrap();
5659
assert!(
57-
!findings
58-
.iter()
59-
.any(|f| f.library == "Java JCA/JCE"),
60+
!findings.iter().any(|f| f.library == "Java JCA/JCE"),
6061
"JCA/JCE should not be reported when import is commented"
6162
);
6263
}
@@ -93,8 +94,16 @@ echo $ciphertext;
9394
fn include_glob_filters_file_types() {
9495
let reg = load_registry();
9596
let dets_java: Vec<Box<dyn Detector>> = vec![
96-
Box::new(PatternDetector::new("detector-java", &[Language::Java], reg.clone())),
97-
Box::new(PatternDetector::new("detector-php", &[Language::Php], reg.clone())),
97+
Box::new(PatternDetector::new(
98+
"detector-java",
99+
&[Language::Java],
100+
reg.clone(),
101+
)),
102+
Box::new(PatternDetector::new(
103+
"detector-php",
104+
&[Language::Php],
105+
reg.clone(),
106+
)),
98107
];
99108

100109
let dir = tmp_dir("include_glob_filters");
@@ -139,8 +148,16 @@ echo openssl_encrypt("data", "aes-256-cbc", "key", 0, "1234567890123456");
139148
..Default::default()
140149
};
141150
let dets_php: Vec<Box<dyn Detector>> = vec![
142-
Box::new(PatternDetector::new("detector-java", &[Language::Java], reg.clone())),
143-
Box::new(PatternDetector::new("detector-php", &[Language::Php], reg.clone())),
151+
Box::new(PatternDetector::new(
152+
"detector-java",
153+
&[Language::Java],
154+
reg.clone(),
155+
)),
156+
Box::new(PatternDetector::new(
157+
"detector-php",
158+
&[Language::Php],
159+
reg.clone(),
160+
)),
144161
];
145162
let scanner_php = Scanner::new(&reg, dets_php, cfg_php_only);
146163
let findings_php = scanner_php.run(std::slice::from_ref(&dir)).unwrap();
@@ -177,6 +194,8 @@ fn max_file_size_skips_large_files() {
177194
};
178195
let scanner = Scanner::new(&reg, dets, cfg_small_limit);
179196
let findings = scanner.run(std::slice::from_ref(&dir)).unwrap();
180-
assert!(findings.is_empty(), "Large file should be skipped by max_file_size");
197+
assert!(
198+
findings.is_empty(),
199+
"Large file should be skipped by max_file_size"
200+
);
181201
}
182-

crates/scanner-core/src/lib.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ pub struct Span {
7272
pub column: usize,
7373
}
7474

75-
7675
#[derive(Debug, Clone, Serialize, Deserialize)]
7776
pub struct Finding {
7877
pub language: Language,
@@ -1024,8 +1023,13 @@ impl PatternDetector {
10241023
}
10251024
}
10261025
// Require anchor only if patterns define any; always require at least one API hit
1027-
let has_anchor_patterns = !lib.include.is_empty() || !lib.import.is_empty() || !lib.namespace.is_empty();
1028-
let anchor_satisfied = if has_anchor_patterns { matched_import } else { true };
1026+
let has_anchor_patterns =
1027+
!lib.include.is_empty() || !lib.import.is_empty() || !lib.namespace.is_empty();
1028+
let anchor_satisfied = if has_anchor_patterns {
1029+
matched_import
1030+
} else {
1031+
true
1032+
};
10291033
let should_report = anchor_satisfied && api_hits > 0;
10301034
if should_report {
10311035
let finding = Finding {

0 commit comments

Comments
 (0)