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

Websockets 2695 v11 #10121

Closed
wants to merge 11 commits into from
Closed

Conversation

catenacyber
Copy link
Contributor

Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/2695
https://redmine.openinfosecfoundation.org/issues/6647
https://redmine.openinfosecfoundation.org/issues/6645
https://redmine.openinfosecfoundation.org/issues/6648

Describe changes:

SV_BRANCH=pr/1571

OISF/suricata-verify#1571

#10104 with rebase to get green CI

I think this is good enough for a first version even if there may be improvements (that can happen in later tickets) :

  • payload logging : waiting for feedback wether this is only for alerts, or also for websocket event
  • using latest HTTP/1 transaction in a single rule, instead of splitting rule and using flowbits
  • support websockets over HTTP/2 : need pcap
    This is a big one as websockets over HTTP/2 only use a single HTTP/2 stream and not the whole TCP connection which keeps having newer regular HTTP/2 streams

#9870 should likely precede this

catenacyber and others added 2 commits January 5, 2024 09:23
So that we can write enip.revision: 0x203

Ticket: 6645
@catenacyber catenacyber marked this pull request as draft January 5, 2024 08:54
@catenacyber catenacyber mentioned this pull request Jan 5, 2024
Ticket: 6647

Allows keywords using integers to use strings in signature
parsing based on a rust enumeration with a derive.
Ticket: 6648

Like &0x40=0x40 to test for a specific bit set
Ticket: 6628

Document the generic detection capabilities for integer keywords.
and make every integer keyword pointing to this section.
if no config option is found,
as is done for udp

Ticket: 6304
Including the one for websocket over HTTP/2
port is used in AppLayerProtoDetectProbingParserPort
and not in AppLayerProtoDetectProbingParserElement
As for WebSocket which is detected only by protocol change.
When there is a protocol change, and a specific protocol is
expected, like WebSeocket, always run it, no matter the port.
Copy link

codecov bot commented Jan 5, 2024

Codecov Report

Attention: 79 lines in your changes are missing coverage. Please review.

Comparison is base (a37fa62) 82.15% compared to head (1b1fc8b) 82.08%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10121      +/-   ##
==========================================
- Coverage   82.15%   82.08%   -0.08%     
==========================================
  Files         974      980       +6     
  Lines      271925   272529     +604     
==========================================
+ Hits       223394   223698     +304     
- Misses      48531    48831     +300     
Flag Coverage Δ
fuzzcorpus 62.72% <52.80%> (-0.18%) ⬇️
suricata-verify 61.51% <78.08%> (+0.06%) ⬆️
unittests 62.77% <31.19%> (-0.08%) ⬇️

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

@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.tcp.pseudo 2810 3014 107.26%

Pipeline 17377

@catenacyber catenacyber mentioned this pull request Jan 7, 2024
@catenacyber
Copy link
Contributor Author

Replaced by #10130

@catenacyber catenacyber closed this Jan 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants