Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "corgea"
version = "1.7.0"
version = "1.7.1"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
45 changes: 26 additions & 19 deletions src/scanners/parsers/checkmarx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ pub struct CheckmarxCliParser;
impl ScanParser for CheckmarxCliParser {
fn detect(&self, input: &str) -> bool {
if let Ok(data) = serde_json::from_str::<Value>(input) {
data.get("totalCount").is_some()
&& data.get("results").is_some()
data.get("totalCount").is_some()
&& data.get("results").is_some()
&& data.get("scanID").is_some()
} else {
false
}
}

fn parse(&self, input: &str) -> Option<ParseResult> {
debug("Detected checkmarx cli schema");

let data: Value = match serde_json::from_str(input) {
Ok(data) => data,
Err(_) => return None,
};

let mut paths = Vec::new();
if let Some(results) = data.get("results").and_then(|v| v.as_array()) {
for result in results {
Expand All @@ -41,13 +41,13 @@ impl ScanParser for CheckmarxCliParser {
}
}
}

Some(ParseResult {
paths,
scanner: "checkmarx".to_string(),
})
}

fn scanner_name(&self) -> &str {
"checkmarx-cli"
}
Expand All @@ -63,15 +63,15 @@ impl ScanParser for CheckmarxWebParser {
false
}
}

fn parse(&self, input: &str) -> Option<ParseResult> {
debug("Detected checkmarx web schema");

let data: Value = match serde_json::from_str(input) {
Ok(data) => data,
Err(_) => return None,
};

let mut paths = Vec::new();
if let Some(scan_results) = data.get("scanResults") {
if let Some(sast) = scan_results.get("sast") {
Expand All @@ -98,13 +98,13 @@ impl ScanParser for CheckmarxWebParser {
}
}
}

Some(ParseResult {
paths,
scanner: "checkmarx".to_string(),
})
}

fn scanner_name(&self) -> &str {
"checkmarx-web"
}
Expand All @@ -117,9 +117,9 @@ impl CheckmarxXmlParser {
debug("Detected checkmarx xml schema");
let mut paths = Vec::new();
let mut reader = Reader::from_str(input);

let mut buf = Vec::new();

loop {
match reader.read_event_into(&mut buf) {
Ok(Event::Start(ref e)) | Ok(Event::Empty(ref e)) => {
Expand All @@ -136,6 +136,15 @@ impl CheckmarxXmlParser {
}
}
}
} else if e.name().as_ref() == b"FileName" {
if let Ok(Event::Text(text)) = reader.read_event_into(&mut buf) {
if let Ok(file_name) = std::str::from_utf8(text.as_ref()) {
let clean_path = file_name.trim_start_matches('/').trim_start_matches('\\');
if !clean_path.is_empty() {
paths.push(clean_path.to_string());
}
}
}
}
}
Ok(Event::Eof) => break,
Expand All @@ -147,7 +156,7 @@ impl CheckmarxXmlParser {
}
buf.clear();
}

Some(ParseResult {
paths,
scanner: "checkmarx".to_string(),
Expand All @@ -159,14 +168,12 @@ impl ScanParser for CheckmarxXmlParser {
fn detect(&self, input: &str) -> bool {
input.trim().starts_with("<?xml") && input.contains("<CxXMLResults")
}

fn parse(&self, input: &str) -> Option<ParseResult> {
self.parse_xml_content(input)
}

fn scanner_name(&self) -> &str {
"checkmarx-xml"
}
}