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 optional fields 'session' and 'protocol' in Dovecot decoder #171

Merged
merged 2 commits into from
Aug 21, 2018
Merged

Fix optional fields 'session' and 'protocol' in Dovecot decoder #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
749b64a
Fix optional fields 'session' and 'protocol' in Dovecot decoder
vikman90 Aug 20, 2018
c80f8a4
Update changelog
vikman90 Aug 20, 2018
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change Log
All notable changes to this project will be documented in this file.

## [v3.5.1]

### Fixed

- Fixed login abortion log mismatch in Dovecot decoder when optional parameter didn't appear. ([#171](https://github.com/wazuh/wazuh-ruleset/pull/171))


## [v3.5.0]

### Added
Expand Down
37 changes: 35 additions & 2 deletions decoders/0085-dovecot_decoders.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
- Dec 19 17:30:39 ny dovecot: imap-login: Disconnected: Inactivity (auth failed, 7 attempts in 176 secs): user=<32>, method=PLAIN, rip=109.201.200.201, lip=67.205.141.203,session=<7QTLPAZEXrhtycjJ>
- Dec 19 17:38:54 ny dovecot: pop3-login: Disconnected: Inactivity during authentication (auth failed, 13 attempts in 179 secs): user=<thousands>, method=PLAIN, rip=109.201.200.201, lip=67.205.141.203, session=<feETWgZEzJltycjJ>
- Dec 19 17:20:08 ny dovecot: imap-login: Aborted login (auth failed, 2 attempts in 18 secs): user=<test>, method=PLAIN, rip=109.201.200.201, lip=67.205.141.203, session=<i8uMIAZEDrdtycjJ>
- Dec 19 17:20:08 ny dovecot: imap-login: Aborted login (auth failed, 2 attempts in 18 secs): user=<test>, method=PLAIN, rip=109.201.200.201, lip=67.205.141.203, session=<i8uMIAZEDrdtycjJ>, secured
- Dec 19 17:20:08 ny dovecot: imap-login: Aborted login (auth failed, 2 attempts in 18 secs): user=<test>, method=PLAIN, rip=109.201.200.201, lip=67.205.141.203, secured
- Dec 19 17:20:08 ny dovecot: imap-login: Aborted login (auth failed, 2 attempts in 18 secs): user=<test>, method=PLAIN, rip=109.201.200.201, lip=67.205.141.203
-->

<decoder name="dovecot">
Expand All @@ -43,8 +46,38 @@
<decoder name="dovecot-aborted">
<parent>dovecot</parent>
<prematch offset="after_parent">^\w\w\w\w-login: Aborted login</prematch>
<regex offset="after_prematch">: user=\p(\S+)\p, method=\S+, rip=(\S+), lip=(\S+), (\S*)$</regex>
<order>user, srcip, dstip, protocol</order>
<regex offset="after_prematch">: user=\p(\S+)\p, method=\S+, rip=(\S+), </regex>
<order>user, srcip, dstip</order>
</decoder>

<decoder name="dovecot-aborted">
<parent>dovecot</parent>
<regex offset="after_regex">lip=(\S+),</regex>
<order>dstip</order>
</decoder>

<decoder name="dovecot-aborted">
<parent>dovecot</parent>
<regex offset="after_regex">lip=(\S+)</regex>
<order>dstip</order>
</decoder>

<decoder name="dovecot-aborted">
<parent>dovecot</parent>
<regex offset="after_regex"> session=\p(\S+\S)>,</regex>
<order>session</order>
</decoder>

<decoder name="dovecot-aborted">
<parent>dovecot</parent>
<regex offset="after_regex"> session=\p(\S+\S)></regex>
<order>session</order>
</decoder>

<decoder name="dovecot-aborted">
<parent>dovecot</parent>
<regex offset="after_regex"> (\S*)$</regex>
<order>protocol</order>
</decoder>

<decoder name="dovecot-fail">
Expand Down