-
Notifications
You must be signed in to change notification settings - Fork 621
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add: result collector Collects results from redis and return a structure with a list of results and the amount of dead host and total amount of alive hosts * Add: host status Collects host and scan status from redis and return a structure with necessary information for progress calculation. * Add: pop method via a pipeline to get results and status revert the pop result to maintain the order, since items are lpush()'ed
- Loading branch information
Showing
7 changed files
with
387 additions
and
1 deletion.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,3 +7,4 @@ pub mod ctl; | |
pub mod error; | ||
pub mod openvas_redis; | ||
pub mod pref_handler; | ||
pub mod result_collector; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,318 @@ | ||
// SPDX-FileCopyrightText: 2024 Greenbone AG | ||
// | ||
// SPDX-License-Identifier: GPL-2.0-or-later | ||
|
||
/// This file contains structs and methods for retrieve scan information from redis | ||
/// and store it into the given storage to be collected later for the clients. | ||
use std::{ | ||
collections::HashMap, | ||
str::FromStr, | ||
sync::{Arc, Mutex}, | ||
}; | ||
|
||
use crate::openvas_redis::{KbAccess, VtHelper}; | ||
use osp::{ScanResult, StringF32}; | ||
use redis_storage::dberror::RedisStorageResult; | ||
|
||
/// Structure to hold the results retrieve from redis main kb | ||
#[derive(Default, Debug)] | ||
pub struct Results { | ||
/// The list of results retrieve | ||
results: Vec<ScanResult>, | ||
/// The number of new dead hosts found during this retrieve. New dead hosts can be found | ||
/// during the scan | ||
new_dead: i64, | ||
/// Total amount of alive hosts found. This is sent once for scan, as it is the | ||
/// the alive host found by Boreas at the start of the scan. | ||
count_total: i64, | ||
/// Total amount of excluded hosts. | ||
count_excluded: i64, | ||
} | ||
|
||
pub struct ResultHelper<H> { | ||
pub redis_connector: H, | ||
pub results: Arc<Mutex<Results>>, | ||
pub status: Arc<Mutex<HashMap<String, i32>>>, | ||
} | ||
|
||
impl<H> ResultHelper<H> | ||
where | ||
H: KbAccess + VtHelper, | ||
{ | ||
pub fn init(redis_connector: H) -> Self { | ||
Self { | ||
redis_connector, | ||
results: Arc::new(Mutex::new(Results::default())), | ||
status: Arc::new(Mutex::new(HashMap::new())), | ||
} | ||
} | ||
|
||
fn process_results(&self, results: Vec<String>) -> RedisStorageResult<Results> { | ||
let mut new_dead = 0; | ||
let mut count_total = 0; | ||
let mut count_excluded = 0; | ||
|
||
let mut scan_results: Vec<ScanResult> = Vec::new(); | ||
for result in results.iter() { | ||
//result_type|||host ip|||hostname|||port|||OID|||value[|||uri] | ||
let res_fields: Vec<&str> = result.split("|||").collect(); | ||
|
||
let result_type = res_fields[0].trim().to_owned(); | ||
let host_ip = res_fields[1].trim().to_owned(); | ||
let host_name = res_fields[2].trim().to_owned(); | ||
let port = res_fields[3].trim().to_owned(); | ||
let oid = res_fields[4].trim().to_owned(); | ||
let value = res_fields[5].trim().to_owned(); | ||
let uri = { | ||
if res_fields.len() > 6 { | ||
Some(res_fields[6].trim().to_owned()) | ||
} else { | ||
None | ||
} | ||
}; | ||
|
||
let roid = oid.trim(); | ||
|
||
let current_host = if !host_ip.is_empty() { | ||
host_ip | ||
} else { | ||
String::new() | ||
}; | ||
|
||
let host_is_dead = value.contains("Host dead") || result_type == "DEADHOST"; | ||
let host_deny = value.contains("Host access denied"); | ||
let start_end_msg = result_type == "HOST_START" || result_type == "HOST_END"; | ||
let host_count = result_type == "HOST_COUNT"; | ||
let error_msg = result_type == "ERRMSG"; | ||
let excluded_hosts = result_type == "HOSTS_EXCLUDED"; | ||
|
||
// TODO: do we need the URI? | ||
let _uri = if let Some(uri) = uri { | ||
uri | ||
} else { | ||
"".to_string() | ||
}; | ||
|
||
let mut rname = String::new(); | ||
if !host_is_dead && !host_deny && !start_end_msg && !host_count && !excluded_hosts { | ||
if roid.is_empty() && !error_msg { | ||
tracing::warn!("Missing VT oid for a result"); | ||
}; | ||
|
||
let vt_aux = self.redis_connector.get_vt(roid)?; | ||
match vt_aux { | ||
None => tracing::warn!("Invalid oid"), | ||
Some(vt) => { | ||
rname = vt.name; | ||
} | ||
}; | ||
} | ||
|
||
if error_msg { | ||
scan_results.push(ScanResult { | ||
result_type: osp::ResultType::Error, | ||
host: current_host, | ||
hostname: host_name, | ||
port, | ||
test_id: roid.to_string(), | ||
description: value, | ||
severity: StringF32::from(0.0), | ||
name: rname, | ||
}); | ||
} else if start_end_msg || result_type == "LOG" { | ||
scan_results.push(ScanResult { | ||
result_type: osp::ResultType::Log, | ||
host: current_host, | ||
hostname: host_name, | ||
port, | ||
test_id: roid.to_string(), | ||
description: value, | ||
severity: StringF32::from(0.0), | ||
name: rname, | ||
}); | ||
} else if result_type == "ALARM" { | ||
scan_results.push(ScanResult { | ||
result_type: osp::ResultType::Alarm, | ||
host: current_host, | ||
hostname: host_name, | ||
port, | ||
test_id: roid.to_string(), | ||
description: value, | ||
severity: StringF32::from(0.0), | ||
name: rname, | ||
}); | ||
} else if result_type == "DEADHOST" { | ||
new_dead += i64::from_str(&value).expect("Valid amount of dead hosts"); | ||
} else if host_count { | ||
count_total = i64::from_str(&value).expect("Valid amount of dead hosts"); | ||
} else if excluded_hosts { | ||
count_excluded = i64::from_str(&value).expect("Valid amount of excluded hosts"); | ||
} | ||
} | ||
|
||
Ok(Results { | ||
results: scan_results, | ||
new_dead, | ||
count_total, | ||
count_excluded, | ||
}) | ||
} | ||
|
||
pub async fn results(&mut self) -> RedisStorageResult<()> { | ||
if let Ok(results) = self.redis_connector.results() { | ||
if let Ok(mut res) = Arc::as_ref(&self.results).lock() { | ||
if let Ok(res_updates) = self.process_results(results) { | ||
res.count_total = res_updates.count_total; | ||
res.new_dead = res_updates.new_dead; | ||
res.count_excluded = res_updates.count_excluded; | ||
res.results.extend(res_updates.results); | ||
} | ||
} | ||
} | ||
Ok(()) | ||
} | ||
|
||
fn process_status(&self, status: Vec<String>) -> RedisStorageResult<HashMap<String, i32>> { | ||
enum ScanProgress { | ||
DeadHost = -1, | ||
} | ||
|
||
let mut all_hosts: HashMap<String, i32> = HashMap::new(); | ||
for res in status { | ||
let mut fields = res.splitn(3, '/'); | ||
let current_host = fields.next().expect("Valid status value"); | ||
let launched = fields.next().expect("Valid status value"); | ||
let total = fields.next().expect("Valid status value"); | ||
|
||
let host_progress: i32 = match i32::from_str(total) { | ||
// No plugins | ||
Ok(0) => { | ||
continue; | ||
} | ||
// Host Dead | ||
Ok(-1) => ScanProgress::DeadHost as i32, | ||
Ok(n) => ((f32::from_str(launched).expect("Integer") / n as f32) * 100.0) as i32, | ||
_ => { | ||
continue; | ||
} | ||
}; | ||
|
||
all_hosts.insert(current_host.to_string(), host_progress); | ||
tracing::debug!("Host {} has progress: {}", current_host, host_progress); | ||
} | ||
|
||
Ok(all_hosts) | ||
} | ||
pub async fn status(&mut self) -> RedisStorageResult<()> { | ||
if let Ok(status) = self.redis_connector.status() { | ||
if let Ok(mut stat) = Arc::as_ref(&self.status).lock() { | ||
if let Ok(res_updates) = self.process_status(status) { | ||
stat.extend(res_updates); | ||
} | ||
} | ||
} | ||
Ok(()) | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
|
||
use crate::openvas_redis::FakeRedis; | ||
use models::Result; | ||
use std::collections::HashMap; | ||
|
||
use super::ResultHelper; | ||
#[test] | ||
fn test_results() { | ||
let results = vec![ | ||
"LOG|||127.0.0.1||| localhost ||||||||| HOST_START".to_string(), | ||
"ERRMSG|||127.0.0.1||| localhost ||||||1.2.3.4.5.6||| NVT timeout".to_string(), | ||
"ALARM|||127.0.0.1||| example.com |||22/tcp|||12.11.10.9.8.7||| Something wrong|||/var/lib/lib1.jar".to_string(), | ||
"DEADHOST||| ||| ||| ||| |||3".to_string(), | ||
"HOST_COUNT||| ||| ||| ||| |||12".to_string(), | ||
"DEADHOST||| ||| ||| ||| |||1".to_string(), | ||
]; | ||
|
||
let rc = FakeRedis { | ||
data: HashMap::new(), | ||
}; | ||
|
||
let resh = ResultHelper::init(rc); | ||
|
||
let res_updates = resh.process_results(results).unwrap(); | ||
|
||
let single_r = Result { | ||
id: 0, | ||
r_type: models::ResultType::Log, | ||
ip_address: Some("127.0.0.1".to_string()), | ||
hostname: Some("localhost".to_string()), | ||
oid: Some("".to_string()), | ||
port: None, | ||
protocol: None, | ||
message: Some("HOST_START".to_string()), | ||
detail: None, | ||
}; | ||
|
||
let b = res_updates.results.get(0).unwrap(); | ||
assert_eq!(models::Result::from(b), single_r); | ||
|
||
let single_r = Result { | ||
id: 0, | ||
r_type: models::ResultType::Error, | ||
ip_address: Some("127.0.0.1".to_string()), | ||
hostname: Some("localhost".to_string()), | ||
oid: Some("1.2.3.4.5.6".to_string()), | ||
port: None, | ||
protocol: None, | ||
message: Some("NVT timeout".to_string()), | ||
detail: None, | ||
}; | ||
|
||
let b = res_updates.results.get(1).unwrap(); | ||
assert_eq!(models::Result::from(b), single_r); | ||
|
||
let single_r = Result { | ||
id: 0, | ||
r_type: models::ResultType::Alarm, | ||
ip_address: Some("127.0.0.1".to_string()), | ||
hostname: Some("example.com".to_string()), | ||
oid: Some("12.11.10.9.8.7".to_string()), | ||
port: Some(i16::from(22i16)), | ||
protocol: Some(models::Protocol::TCP), | ||
message: Some("Something wrong".to_string()), | ||
detail: None, | ||
}; | ||
|
||
let b = res_updates.results.get(2).unwrap(); | ||
assert_eq!(models::Result::from(b), single_r); | ||
|
||
assert_eq!(res_updates.new_dead, 4); | ||
assert_eq!(res_updates.count_total, 12); | ||
} | ||
|
||
#[test] | ||
fn test_status() { | ||
let status = vec![ | ||
"127.0.0.2/0/-1".to_string(), | ||
"127.0.0.1/188/1000".to_string(), | ||
"127.0.0.3/750/1000".to_string(), | ||
"127.0.0.2/15/1000".to_string(), | ||
"127.0.0.1/0/1000".to_string(), | ||
]; | ||
|
||
let rc = FakeRedis { | ||
data: HashMap::new(), | ||
}; | ||
|
||
let resh = ResultHelper::init(rc); | ||
|
||
let mut r = HashMap::new(); | ||
r.insert("127.0.0.1".to_string(), 0); | ||
r.insert("127.0.0.2".to_string(), 1); | ||
r.insert("127.0.0.3".to_string(), 75); | ||
|
||
let res_updates = resh.process_status(status).unwrap(); | ||
assert_eq!(res_updates, r) | ||
} | ||
} |
Oops, something went wrong.