mirror of
https://github.com/EFForg/rayhunter.git
synced 2026-04-26 23:49:59 -07:00
fix(lib/util): use better names for runtime metadata
- document RuntimeMetadata fields - rename RayhunterMetadata to RuntimeMetadata - rename RuntimeMetadata.os to RuntimeMetadata.system_os - remove unpopulated hardware field - remove unnecessary duplication of datastructure in analyzer harness
This commit is contained in:
committed by
Will Greenberg
parent
188e9f436b
commit
0b3c0de481
@@ -3,6 +3,7 @@ use chrono::{DateTime, FixedOffset};
|
||||
use serde::Serialize;
|
||||
|
||||
use crate::{diag::MessagesContainer, gsmtap_parser};
|
||||
use crate::util::RuntimeMetadata;
|
||||
|
||||
use super::{
|
||||
imsi_requested::ImsiRequestedAnalyzer,
|
||||
@@ -70,18 +71,10 @@ pub struct AnalyzerMetadata {
|
||||
pub description: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Debug)]
|
||||
pub struct RayhunterMetadata {
|
||||
pub version: String,
|
||||
pub os: String,
|
||||
pub arch: String,
|
||||
pub hardware: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Debug)]
|
||||
pub struct ReportMetadata {
|
||||
pub analyzers: Vec<AnalyzerMetadata>,
|
||||
pub rayhunter: RayhunterMetadata,
|
||||
pub rayhunter: RuntimeMetadata,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Debug, Clone)]
|
||||
@@ -214,14 +207,7 @@ impl Harness {
|
||||
});
|
||||
}
|
||||
|
||||
let metadata = crate::util::RayhunterMetadata::new();
|
||||
|
||||
let rayhunter = RayhunterMetadata {
|
||||
version: metadata.version,
|
||||
os: metadata.os,
|
||||
arch: metadata.arch,
|
||||
hardware: metadata.hardware,
|
||||
};
|
||||
let rayhunter = RuntimeMetadata::new();
|
||||
|
||||
ReportMetadata {
|
||||
analyzers,
|
||||
|
||||
Reference in New Issue
Block a user