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.

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

Cherry-pick #21696 to 7.x: Add ja3 fields to Zeek SSL log #22358

Merged
merged 2 commits into from
Nov 4, 2020

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented Nov 2, 2020

Cherry-pick of PR #21696 to 7.x branch. Original message:

What does this PR do?

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.

Why is it important?

Improves the Zeek SSL dataset's ability to populate the TLS tab in the Security app.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • Generate sample zeek.ssl logs with the zeek/salesforce/ja3 plugin installed and create test case.
  • Add changelog.
  • Update documentation to recommend the zeek/salesforce/ja3 plugin.
  • Get sample scripts for adding the tls.server.not_after and tls.server.hash.sha1 to the zeek.ssl log and update the pipeline for those fields.

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)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 2, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 2, 2020
@elasticmachine
Copy link
Collaborator

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 4457
Skipped 567
Total 5024

@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 2, 2020

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22358 updated]

  • Start Time: 2020-11-03T21:34:46.782+0000

  • Duration: 50 min 23 sec

Test stats 🧪

Test Results
Failed 0
Passed 4457
Skipped 567
Total 5024

Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewkroh andrewkroh merged commit 1f3038b into elastic:7.x Nov 4, 2020
@zube zube bot removed the [zube]: Done label Feb 3, 2021
@andrewkroh andrewkroh deleted the backport_21696_7.x branch January 14, 2022 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants