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

eve/tls: reimplement basic and extended logging in terms of custom - v1 #11984

Closed
wants to merge 5 commits into from

Conversation

jasonish
Copy link
Member

@jasonish jasonish commented Oct 17, 2024

Commit c79a382 added ALPN logging to extended TLS output but there was no way to add this to custom. To prevent this from happening in the future, implement basic and extended logging in terms of custom.

Ticket: https://redmine.openinfosecfoundation.org/issues/7333

Adds custom fields "client_alpns" and "server_alpns".

Ticket: OISF#7333
During EVE TLS setup, a broken check for Ja3 being enabled led to Ja3
being disabled, but only in custom mode. This check is not needed, if
Ja3 is disabled, it won't be available, and won't be logged.

This is required to implement "extended" in terms of "custom" fields.
Will prevent custom logging options getting out of sync with whats
available in extended.

Ticket: OISF#7333
Copy link

codecov bot commented Oct 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.06%. Comparing base (55b922c) to head (9c84e7e).

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11984      +/-   ##
==========================================
+ Coverage   82.75%   83.06%   +0.30%     
==========================================
  Files         910      910              
  Lines      249016   258153    +9137     
==========================================
+ Hits       206069   214429    +8360     
- Misses      42947    43724     +777     
Flag Coverage Δ
fuzzcorpus 61.02% <97.22%> (+0.20%) ⬆️
livemode 19.39% <11.11%> (+0.68%) ⬆️
pcap 44.47% <97.22%> (+0.34%) ⬆️
suricata-verify 62.73% <100.00%> (+0.44%) ⬆️
unittests 59.29% <0.00%> (+0.28%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Contributor

@jufajardini jufajardini left a comment

Choose a reason for hiding this comment

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

Looks much more neat! :D

We should probably also review docs and suricata.yaml mentions of the available custom fields, to ensure we list all of them (and any dependencies).

Noticed that we may be leaving session_resumed behind, in case of basic logging.

Minor existential dilemma wrt having the main function to be called be the Custom or LogFields one, but I sense this isn't of real importance.

src/output-json-tls.c Show resolved Hide resolved
@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 23131

@jasonish
Copy link
Member Author

Minor existential dilemma wrt having the main function to be called be the Custom or LogFields one, but I sense this isn't of real importance.

Dealt with in next version of PR.

@jasonish
Copy link
Member Author

Replaced by #11991.

@jasonish jasonish closed this Oct 18, 2024
@jasonish jasonish deleted the tls-alpn-custom/v1 branch October 22, 2024 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants