Skip to content

sophos: fix handling of date parsing #6676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
efd6 merged 1 commit into from
Jun 23, 2023
Merged

sophos: fix handling of date parsing #6676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/sophos/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# newer versions go on top
- version: "2.11.0"
changes:
- description: Allow user configuration of timezone offset in XG data stream.
type: enhancement
link: https://github.com/elastic/integrations/pull/6676
- description: Fix handling of sophos.xg.eventtime when it contains an invalid timezone.
type: bugfix
link: https://github.com/elastic/integrations/pull/6676
- version: "2.10.0"
changes:
- description: Ensure event.kind is correctly set for pipeline errors.
Expand Down
47 changes: 33 additions & 14 deletions ...ges/sophos/data_stream/xg/_dev/test/pipeline/test-sophos-18-5-anti-spam.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"quarantine_reason": "Spam",
"spamaction": "DROP",
"src_country_code": "R1",
"timezone": "IST",
"user_name": "gaurav"
}
},
Expand Down Expand Up @@ -194,7 +195,8 @@
"priority": "Warning",
"quarantine_reason": "Spam",
"spamaction": "WARN",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -297,6 +299,7 @@
"quarantine_reason": "Other",
"spamaction": "Accept",
"src_country_code": "R1",
"timezone": "IST",
"user_name": "gaurav"
}
},
Expand Down Expand Up @@ -402,7 +405,8 @@
"priority": "Warning",
"quarantine_reason": "RBL",
"spamaction": "DROP",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -507,6 +511,7 @@
"quarantine_reason": "Spam",
"spamaction": "Accept",
"src_country_code": "R1",
"timezone": "IST",
"user_name": "gaurav"
}
},
Expand Down Expand Up @@ -612,7 +617,8 @@
"priority": "Warning",
"quarantine_reason": "Spam",
"spamaction": "Drop",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -717,7 +723,8 @@
"priority": "Information",
"quarantine_reason": "DLP",
"spamaction": "DROP",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -820,7 +827,8 @@
"priority": "Information",
"quarantine_reason": "Other",
"spamaction": "Accept",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -919,7 +927,8 @@
"priority": "Information",
"quarantine_reason": "Other",
"spamaction": "REJECT",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -1005,7 +1014,8 @@
"priority": "Warning",
"quarantine_reason": "Other",
"spamaction": "TMPREJECT",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -1105,6 +1115,7 @@
"quarantine_reason": "Other",
"spamaction": "SANDSTORM ALLOW",
"src_country_code": "R1",
"timezone": "IST",
"user_name": "gaurav"
}
},
Expand Down Expand Up @@ -1209,7 +1220,8 @@
"mailsize": "419835",
"priority": "Warning",
"spamaction": "DROP",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -1315,6 +1327,7 @@
"quarantine_reason": "Other",
"spamaction": "Accept",
"src_country_code": "R1",
"timezone": "IST",
"user_name": "gaurav"
}
},
Expand Down Expand Up @@ -1418,7 +1431,8 @@
"mailsize": "0",
"priority": "Warning",
"quarantine_reason": "Other",
"spamaction": "Change Subject"
"spamaction": "Change Subject",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -1519,7 +1533,8 @@
"mailsize": "0",
"priority": "Information",
"quarantine_reason": "Other",
"spamaction": "Accept"
"spamaction": "Accept",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -1622,7 +1637,8 @@
"mailsize": "0",
"priority": "Warning",
"quarantine_reason": "Other",
"spamaction": "Accept"
"spamaction": "Accept",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -1725,7 +1741,8 @@
"mailsize": "0",
"priority": "Warning",
"quarantine_reason": "Other",
"spamaction": "Accept"
"spamaction": "Accept",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -1826,7 +1843,8 @@
"mailsize": "0",
"priority": "Information",
"quarantine_reason": "Other",
"spamaction": "Accept"
"spamaction": "Accept",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -1929,7 +1947,8 @@
"priority": "Information",
"quarantine_reason": "Other",
"spamaction": "DELIVERED",
"src_country_code": "R1"
"src_country_code": "R1",
"timezone": "IST"
}
},
"source": {
Expand Down
4 changes: 3 additions & 1 deletion ...ophos/data_stream/xg/_dev/test/pipeline/test-sophos-18-5-anti-virus-ftp.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"log_type": "Anti-Virus",
"priority": "Critical",
"src_country_code": "R1",
"timezone": "CEST",
"virus": "EICAR-AV-Test"
}
},
Expand Down Expand Up @@ -161,7 +162,8 @@
"log_id": "031001609002",
"log_subtype": "Allowed",
"log_type": "Anti-Virus",
"priority": "Information"
"priority": "Information",
"timezone": "CEST"
}
},
"source": {
Expand Down
3 changes: 3 additions & 0 deletions ...phos/data_stream/xg/_dev/test/pipeline/test-sophos-18-5-anti-virus-smtp.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
"quarantine_reason": " Infected",
"src_country_code": "R1",
"subject": "virus infected message",
"timezone": "IST",
"virus": "EICAR-AV-Test"
}
},
Expand Down Expand Up @@ -196,6 +197,7 @@
"quarantine_reason": "Other",
"src_country_code": "R1",
"subject": "EICAR",
"timezone": "IST",
"virus": "EICAR-AV-Test"
}
},
Expand Down Expand Up @@ -302,6 +304,7 @@
"quarantine_reason": "Other",
"src_country_code": "R1",
"subject": "EICAR test email",
"timezone": "IST",
"virus": "EICAR-AV- Test"
}
},
Expand Down
4 changes: 4 additions & 0 deletions ...ophos/data_stream/xg/_dev/test/pipeline/test-sophos-18-5-anti-virus-web.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"original": "device=\"SFW\" date=2016-12-02 time=18:48:18 timezone=\"GMT\" device_name=\"SFVUNL\" device_id=C01001K234RXPA1 log_id=034806208001 log_type=\"Anti-Virus\" log_component=\"HTTPS\" log_subtype=\"Virus\" priority=Critical fw_rule_id=2 user_name=\"rich\" iap=13 virus=\"EICAR-AV-Test\" url=\"https://secure.eicar.org/eicar.com\" domainname=\"secure.eicar.org\" src_ip=192.168.73.220 src_country_code=R1 dst_ip=216.160.83.61 dst_country_code=DEU protocol=\"TCP\" src_port=51499 dst_port=443 sent_bytes=0 recv_bytes=353",
"outcome": "success",
"severity": 2,
"timezone": "GMT",
"type": [
"info",
"denied",
Expand Down Expand Up @@ -88,6 +89,7 @@
"log_type": "Anti-Virus",
"priority": "Critical",
"src_country_code": "R1",
"timezone": "GMT",
"virus": "EICAR-AV-Test"
}
},
Expand Down Expand Up @@ -132,6 +134,7 @@
"original": "device=\"SFW\" date=2016-12-02 time=18:57:57 timezone=\"GMT\" device_name=\"SFVUNL\" device_id=C01001K234RXPA1 log_id=030906208001 log_type=\"Anti-Virus\" log_component=\"HTTP\" log_subtype=\"Virus\" priority=Critical fw_rule_id=0 user_name=\"rich\" iap=13 virus=\"Sandstorm\" url=\"http://floater.baldrys.ca/badb.exe\" domainname=\"floater.baldrys.ca\" src_ip=192.168.73.220 src_country_code=R1 dst_ip=192.168.73.220 dst_country_code=R1 protocol=\"TCP\" src_port=54110 dst_port=80 sent_bytes=0 recv_bytes=1594715",
"outcome": "success",
"severity": 2,
"timezone": "GMT",
"type": [
"info",
"denied",
Expand Down Expand Up @@ -183,6 +186,7 @@
"log_type": "Anti-Virus",
"priority": "Critical",
"src_country_code": "R1",
"timezone": "GMT",
"virus": "Sandstorm"
}
},
Expand Down
6 changes: 4 additions & 2 deletions .../sophos/data_stream/xg/_dev/test/pipeline/test-sophos-18-5-atp-firewall.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
"log_subtype": "Alert",
"log_type": "ATP",
"priority": "Notice",
"threatname": "C2/Generic-A"
"threatname": "C2/Generic-A",
"timezone": "BST"
}
},
"source": {
Expand Down Expand Up @@ -162,7 +163,8 @@
"log_subtype": "Drop",
"log_type": "ATP",
"priority": "Warning",
"threatname": "C2 /Generic-A"
"threatname": "C2 /Generic-A",
"timezone": "IST"
}
},
"source": {
Expand Down
9 changes: 6 additions & 3 deletions ...ophos/data_stream/xg/_dev/test/pipeline/test-sophos-18-5-authentication.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
"log_subtype": "Authentication",
"log_type": "Event",
"priority": "Information",
"status": "Successful"
"status": "Successful",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -126,7 +127,8 @@
"log_subtype": "Authentication",
"log_type": "Event",
"priority": "Information",
"status": "Successful"
"status": "Successful",
"timezone": "IST"
}
},
"source": {
Expand Down Expand Up @@ -195,7 +197,8 @@
"log_subtype": "Authentication",
"log_type": "Event",
"priority": "Information",
"status": "Successful"
"status": "Successful",
"timezone": "IST"
}
},
"source": {
Expand Down
Loading