From dc3e5f092c1a30de41257986dbf411d230736415 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 16 Sep 2026 02:47:01 +0200 Subject: [PATCH] fix: classify legacy lowercase events --- tools/analyse.typ | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/tools/analyse.typ b/tools/analyse.typ index 14df875..31be476 100644 --- a/tools/analyse.typ +++ b/tools/analyse.typ @@ -27,10 +27,12 @@ } #let event-signature(provider, id, time, message) = json.encode((provider, text(id), text(time).replace(regex("\\.[0-9]+Z$"), "Z"), text(message).replace(regex("\\s+"), " "))) #let add-event(section, index, event, time-field, provider-field, id-field) = { - let provider = str(get(event, provider-field, default: "Unknown provider")); let id = get(event, id-field, default: "unknown") + let time = get(event, time-field, default: get(event, if time-field == "TimeCreated" { "time_created" } else { "TimeCreated" })) + let provider = str(get(event, provider-field, default: get(event, if provider-field == "ProviderName" { "provider_name" } else { "ProviderName" }, default: "Unknown provider"))) + let id = get(event, id-field, default: get(event, if id-field == "Id" { "id" } else { "Id" }, default: "unknown")) let item = (id: "event-" + slug(section) + "-" + str(index + 1), section: section, source_pointer: pointer(("sections", section, "data", index)), value: event, - _provider: provider, _event_id: id, _signature: event-signature(provider, id, get(event, time-field), get(event, "Message", default: ""))) - if timestamp(get(event, time-field)) { item.insert("observed_at", get(event, time-field)) } + _provider: provider, _event_id: id, _signature: event-signature(provider, id, time, get(event, "Message", default: get(event, "message", default: "")))) + if timestamp(time) { item.insert("observed_at", time) } item } #let watch-matches(matcher) = { @@ -67,7 +69,12 @@ #for name in selected { let section = get(capture.sections, name) if type(section) == dictionary and type(get(section, "data")) == array { - for pair in section.data.enumerate() { if type(pair.last()) == dictionary { observations.push(add-event(name, pair.first(), pair.last(), "TimeCreated", "ProviderName", "Id")) } } + for pair in section.data.enumerate() { + if type(pair.last()) == dictionary { + if version == 1 { observations.push(add-event(name, pair.first(), pair.last(), "time_created", "provider_name", "id")) + } else { observations.push(add-event(name, pair.first(), pair.last(), "TimeCreated", "ProviderName", "Id")) } + } + } } } #let signatures = observations.map(item => item._signature) @@ -110,7 +117,7 @@ let matches = (); for matcher in entry.match { matches += watch-matches(matcher) } let requirements = (); for matcher in get(entry, "requires", default: ()) { requirements.push(watch-matches(matcher)) } let event-gate = get(entry, "events"); let event-evidence = () - if event-gate != none { event-evidence = observations.filter(item => str(get(item.value, "ProviderName", default: "")) == event-gate.provider and event-gate.ids.map(str).contains(str(get(item.value, "Id", default: "")))).map(item => item.id) } + if event-gate != none { event-evidence = observations.filter(item => str(get(item.value, "ProviderName", default: get(item.value, "provider_name", default: ""))) == event-gate.provider and event-gate.ids.map(str).contains(str(get(item.value, "Id", default: get(item.value, "id", default: ""))))).map(item => item.id) } if matches.len() > 0 and requirements.all(group => group.len() > 0) and (event-gate == none or event-evidence.len() >= event-gate.minimum) { let evidence = () for item in matches + requirements.join() { @@ -135,6 +142,20 @@ }) #let system = (host: get(capture, "host", default: (:))) #if type(get(capture, "summary")) == dictionary { system.insert("legacy_summary", capture.summary) } +#let inventory = (:) +#for name in ( + "operating_system", "computer_system", "bios", "cpu", "memory_modules", + "motherboard", "gpus", "storage", "network_adapters", "ip_configuration", + "dns_servers", "power_plan", "battery", "defender", "firewall_profiles", + "problem_devices", "automatic_services_not_running", "component_store", + "system_file_check", +) { + let section = get(capture.sections, name) + if type(section) == dictionary and type(get(section, "data")) == array { + inventory.insert(name, section.data) + } +} +#system.insert("inventory", inventory) #let result = ( schema_version: 1, metadata: (producer: (name: "win-diagnostics", version: sys.inputs.at("producer-version")), collected_at: capture.generated_at,