Skip to content
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

Jump to bottom

Fix dataplane parser failing to parse AS names with pipe characters #2488

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Fix dataplane parser failing to parse AS names with pipe characters #2488

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion intelmq/bots/parsers/dataplane/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ def parse_line(self, line, report):
else:
event = self.new_event(report)

line_contents = line.split('|')
# As mentioned in the feed header: Each field is separated
# by a pipe symbol ('|') and at least two whitespace
# characters on either side.
line_contents = line.split(' | ')
feed_name = line_contents[-1].strip()
file_format = FILE_FORMATS.get(feed_name) or FILE_FORMATS['_default']

Expand Down
5 changes: 3 additions & 2 deletions intelmq/tests/bots/parsers/dataplane/sshpwauth.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
#
NA | NA | 170.239.104.183 | 2016-12-01 04:26:48 | sshpwauth
4134 | CHINANET-BACKBONE No.31,Jin-ro | 117.21.224.121 | 2016-12-06 02:35:38 | sshpwauth
1 | TEST-AS company | With | pipe | 1.2.3.4 | 2024-04-02 12:00:00 | sshpwauth
#
# Statistics
# ASNs: 1
# Addresses: 2
# ASNs: 2
# Addresses: 3
16 changes: 16 additions & 0 deletions intelmq/tests/bots/parsers/dataplane/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,21 @@
'time.source': '2016-12-06T02:35:38+00:00',
'protocol.application': 'ssh',
'classification.type': 'brute-force',
},
{'feed.url': 'https://dataplane.org/sshpwauth.txt',
'feed.name': 'SSH Password Authentication',
'__type': 'Event',
'time.observation': '2016-12-07T06:27:26+00:00',
'raw': 'MSAgICAgICAgICAgIHwgIFRFU1QtQVMgY29tcGFueSB8IFdpdGggfCBwaXBlICAgfCAgMS4yLjMuNCAgICAgICAgICB8ICAyMDI0LTA0LTAyIDEyOjAwOjAwICB8ICBzc2hwd2F1dGg=',
'event_description.text': 'Address has been seen attempting to remotely login to a host using SSH password '
'authentication. The source report lists hosts that are highly suspicious and '
'are likely conducting malicious SSH password authentication attacks.',
'source.asn': 1,
'source.ip': '1.2.3.4',
'source.as_name': 'TEST-AS',
'time.source': '2024-04-02T12:00:00+00:00',
'protocol.application': 'ssh',
'classification.type': 'brute-force',
}]


Expand Down Expand Up @@ -228,6 +243,7 @@ def test_ssh_auth(self):
self.run_bot()
self.assertMessageEqual(0, SSH_AUTH_EVENT[0])
self.assertMessageEqual(1, SSH_AUTH_EVENT[1])
self.assertMessageEqual(2, SSH_AUTH_EVENT[2])


if __name__ == '__main__': # pragma: no cover
Expand Down
Loading