forked from elastic/beats
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add fields to Zeek SSL log (elastic#21696)
Rename `ja3s` to `tls.server.ja3s` if present (requires zeek/salesforce/ja3 package package). Rename `ja3` to `tls.client.ja3` if present (requires zeek/salesforce/ja3 package package). Rename `subject` to `tls.server.subject` (instead of deleting it after parsing). Rename `not_valid_before` to `tls.server.not_before` if present. Rename `not_valid_after` to `tls.server.not_after` if present. Fix dashboard reference for `zeek.ssl.server.name` that was using `zeek.ssl.server_name`. Add links to Zeek scripts in docs. (cherry picked from commit 61f7acd)
- Loading branch information
1 parent
3160b7e
commit dcf7544
Showing
9 changed files
with
127 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
x-pack/filebeat/module/zeek/ssl/test/ssl-with-ja3-and-custom-fields-json.log
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {"ts":1602179457.352156,"uid":"CK17Dl2SB8bZOVonSl","id.orig_h":"10.0.0.1","id.orig_p":49228,"id.resp_h":"192.168.50.1","id.resp_p":443,"version":"TLSv12","cipher":"TLS_RSA_WITH_AES_128_CBC_SHA256","resumed":false,"established":true,"cert_chain_fuids":["FOLwYQ6rs70bIMSf9"],"client_cert_chain_fuids":[],"subject":"CN=foo,OU=foo@bar,O=org,L=locality,C=LO","issuer":"CN=CA,[email protected],O=Example Corp,L=foo,C=HI","validation_status":"self signed certificate","ja3":"74927e242d6c3febf8cb9cab10a7f889","ja3s":"80b3a14bccc8598a1f3bbe83e71f735f","resp_certificate_sha1":"5dad8b55621b6b9c30679d9d61248dd132a83c94","not_valid_before":1562022421,"not_valid_after":1577748224} |
78 changes: 78 additions & 0 deletions
78
x-pack/filebeat/module/zeek/ssl/test/ssl-with-ja3-and-custom-fields-json.log-expected.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| [ | ||
| { | ||
| "@timestamp": "2020-10-08T17:50:57.352Z", | ||
| "client.address": "10.0.0.1", | ||
| "destination.address": "192.168.50.1", | ||
| "destination.ip": "192.168.50.1", | ||
| "destination.port": 443, | ||
| "event.category": [ | ||
| "network" | ||
| ], | ||
| "event.dataset": "zeek.ssl", | ||
| "event.id": "CK17Dl2SB8bZOVonSl", | ||
| "event.kind": "event", | ||
| "event.module": "zeek", | ||
| "event.type": [ | ||
| "connection", | ||
| "protocol" | ||
| ], | ||
| "fileset.name": "ssl", | ||
| "input.type": "log", | ||
| "log.offset": 0, | ||
| "network.community_id": "1:qNHgoGHFvyhhK2jU7LlS3537ODc=", | ||
| "network.transport": "tcp", | ||
| "related.ip": [ | ||
| "10.0.0.1", | ||
| "192.168.50.1" | ||
| ], | ||
| "server.address": "192.168.50.1", | ||
| "service.type": "zeek", | ||
| "source.address": "10.0.0.1", | ||
| "source.ip": "10.0.0.1", | ||
| "source.port": 49228, | ||
| "tags": [ | ||
| "zeek.ssl" | ||
| ], | ||
| "tls.cipher": "TLS_RSA_WITH_AES_128_CBC_SHA256", | ||
| "tls.client.ja3": "74927e242d6c3febf8cb9cab10a7f889", | ||
| "tls.established": true, | ||
| "tls.resumed": false, | ||
| "tls.server.hash.sha1": "5dad8b55621b6b9c30679d9d61248dd132a83c94", | ||
| "tls.server.issuer": "CN=CA,[email protected],O=Example Corp,L=foo,C=HI", | ||
| "tls.server.ja3s": "80b3a14bccc8598a1f3bbe83e71f735f", | ||
| "tls.server.not_after": "2019-12-30T23:23:44.000Z", | ||
| "tls.server.not_before": "2019-07-01T23:07:01.000Z", | ||
| "tls.server.subject": "CN=foo,OU=foo@bar,O=org,L=locality,C=LO", | ||
| "tls.server.x509.issuer.common_name": "CA", | ||
| "tls.server.x509.issuer.country": "HI", | ||
| "tls.server.x509.issuer.locality": "foo", | ||
| "tls.server.x509.issuer.organization": "Example Corp", | ||
| "tls.server.x509.issuer.organizational_unit": "[email protected]", | ||
| "tls.server.x509.subject.common_name": "foo", | ||
| "tls.server.x509.subject.country": "LO", | ||
| "tls.server.x509.subject.locality": "locality", | ||
| "tls.server.x509.subject.organization": "org", | ||
| "tls.server.x509.subject.organizational_unit": "foo@bar", | ||
| "tls.version": "1.2", | ||
| "tls.version_protocol": "tls", | ||
| "zeek.session_id": "CK17Dl2SB8bZOVonSl", | ||
| "zeek.ssl.cipher": "TLS_RSA_WITH_AES_128_CBC_SHA256", | ||
| "zeek.ssl.established": true, | ||
| "zeek.ssl.resumed": false, | ||
| "zeek.ssl.server.cert_chain_fuids": [ | ||
| "FOLwYQ6rs70bIMSf9" | ||
| ], | ||
| "zeek.ssl.server.issuer.common_name": "CA", | ||
| "zeek.ssl.server.issuer.country": "HI", | ||
| "zeek.ssl.server.issuer.locality": "foo", | ||
| "zeek.ssl.server.issuer.organization": "Example Corp", | ||
| "zeek.ssl.server.issuer.organizational_unit": "[email protected]", | ||
| "zeek.ssl.server.subject.common_name": "foo", | ||
| "zeek.ssl.server.subject.country": "LO", | ||
| "zeek.ssl.server.subject.locality": "locality", | ||
| "zeek.ssl.server.subject.organization": "org", | ||
| "zeek.ssl.server.subject.organizational_unit": "foo@bar", | ||
| "zeek.ssl.validation.status": "self signed certificate", | ||
| "zeek.ssl.version": "TLSv12" | ||
| } | ||
| ] |