Closed
Conversation
So that we can write enip.revision: 0x203 Ticket: 6645
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.
Ticket: 2695
catenacyber
requested review from
a team,
jasonish,
jufajardini and
victorjulien
as code owners
Closed
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #10130 +/- ##
==========================================
- Coverage 82.15% 82.06% -0.09%
==========================================
Files 974 980 +6
Lines 271925 272559 +634
==========================================
+ Hits 223394 223682 +288
- Misses 48531 48877 +346
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
WARNING:
Pipeline 17386 |
jasonish
reviewed
Jan 10, 2024
Comment on lines
+189
to
+197
| // Unclose an object which must not be empty. | ||
| pub fn unclose(&mut self) -> Result<&mut Self, JsonError> { | ||
| match self.buf.pop() { | ||
| Some('}') => {} | ||
| _ => {return Err(JsonError::InvalidState);} | ||
| } | ||
| self.push_state(State::ObjectNth)?; | ||
| Ok(self) | ||
| } |
Member
There was a problem hiding this comment.
Its quite confusing to me why this is even required? Wouldn't refactoring the calling code a little get rid of this need?
Contributor
Author
There was a problem hiding this comment.
answering in the next comment as they are both about the same thing...
jasonish
reviewed
Jan 10, 2024
Comment on lines
+317
to
+326
| if (proto == ALPROTO_WEBSOCKET) { | ||
| if (option_flags & | ||
| (LOG_JSON_WEBSOCKET_PAYLOAD | LOG_JSON_WEBSOCKET_PAYLOAD_BASE64)) { | ||
| bool pp = (option_flags & LOG_JSON_WEBSOCKET_PAYLOAD) != 0; | ||
| bool pb64 = (option_flags & LOG_JSON_WEBSOCKET_PAYLOAD_BASE64) != 0; | ||
| if (!SCWebSocketLogDetails(tx, jb, pp, pb64)) { | ||
| jb_restore_mark(jb, &mark); | ||
| } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
I guess here we've already opened, logged and closed the app-layer TX. It does feel like a hack. I think I would rather see:
- the opening and closing of the object here, then LogTx just fills in the open object but doesn't make the choice about closing it, somewhat undoes some previous work you did though.
- or passing in extra flags to LogTx
Contributor
Author
There was a problem hiding this comment.
First, I had the flags to the logging function, but it did not feel right.
I will switch back to that in the next version so that we can talk about it
Closed
Contributor
Author
|
Replaced by #10163 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/2695
Describe changes:
OISF/suricata-verify#1571
#10121 with last commit to optionally log websocket payload in alerts. cc @jasonish for the jsonbuilder hack
I think this is good enough for a first version even if there may be improvements (that should happen in later tickets) :
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 (or other websocket ones). That means a HTTP2 transactions will own a Websocket State + some streaming buffer as TCP...
#9870 should likely precede this