@@ -24,7 +24,7 @@ filter channel in ("System", "Application","Directory Service") or provider_name
24
24
event_fwlink = event_data->["FWLink"],
25
25
execution_name = event_data -> ["Execution Name"],
26
26
SubjectKeyIdentifier = event_data -> SubjectKeyIdentifier,
27
- event_name = arrayindex(regextract(message, "([^\. ]+)\. "), 0),
27
+ event_name = arrayindex(regextract(message, "^ ([^:.( ]+)"), 0),
28
28
TicketEncryptionType = to_string(event_data -> TicketEncryptionType),
29
29
IpPort = coalesce(event_data -> IpPort, event_data -> SourcePort),
30
30
IpAddress = coalesce(event_data -> IpAddress, event_data -> SourceAddress),
@@ -59,7 +59,7 @@ filter channel in ("System", "Application","Directory Service") or provider_name
59
59
threat_id = if(provider_name = "Microsoft-Windows-Windows Defender" and ((event_id_num >= 1006 and event_id_num <= 1012) or event_id_num = 1015 or (event_id_num >= 1116 and event_id_num <= 1119)), arrayindex(regextract(message, "ID:\s*(\w+)\s+\w+:"), 0)),
60
60
threat_category = if(provider_name = "Microsoft-Windows-Windows Defender" and ((event_id_num >= 1006 and event_id_num <= 1012) or event_id_num = 1015 or (event_id_num >= 1116 and event_id_num <= 1119)), arrayindex(regextract(message, "Category:\s*(.+?)\s+\w+:"), 0)),
61
61
threat_name = if(provider_name = "Microsoft-Windows-Windows Defender" and ((event_id_num >= 1006 and event_id_num <= 1012) or event_id_num = 1015 or (event_id_num >= 1116 and event_id_num <= 1119)), arrayindex(regextract(message, "Name:\s*(.+?)\s+ID:"), 0)),
62
- user_domain = coalesce(user -> domain, event_data -> Domain, event_data -> SubjectDomainName, user_data - > SubjectDomainName, arrayindex(regextract(message , "User:\s*([^\\]+) "), 0 )),
62
+ user_domain = coalesce(user -> domain, event_data -> Domain, if( event_data -> SubjectDomainName in ("-", " - "), null, event_data - > SubjectDomainName), if(user_data -> SubjectDomainName in ("-" , " - "), null, user_data -> SubjectDomainName )),
63
63
user_name = coalesce(user -> name, event_data -> User, event_data -> SubjectUserName, user_data -> SubjectUserName, arrayindex(regextract(message, "User:\s*(?:[^\\]+\\)*(\S+)"), 0), arrayindex(regextract(message, "User \"([^\"]+)\""), 0), if(channel="Application" and event_data -> param3 contains "*\\*", event_data -> param3),event_data -> ["Detection User"],event_data -> ["Requester"]),
64
64
user_sid = coalesce(event_data -> SID, event_data -> SubjectUserSid, user -> identifier, user -> SubjectUserSid, event_data -> UserSid, if(provider_name = "Microsoft-Windows-Windows Firewall With Advanced Security", arrayindex(regextract(message, "Modifying\s*User\:\s+(.*)\b\s+Modifying\s+Application:"), 0))),
65
65
user_type = user -> type
0 commit comments