From: Philippe Antoine Date: Tue, 15 Apr 2025 10:34:37 +0000 (+0200) Subject: http2: forbid data on stream 0 X-Git-Tag: suricata-8.0.0~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d6d331752e933c46aca0ae7a9679b27462246e3;p=thirdparty%2Fsuricata.git http2: forbid data on stream 0 Ticket: 7658 Suricata will not handle well if we open a file for this tx, do not close it, but set the transaction state to completed. RFC 9113 section 6.1 states: If a DATA frame is received whose Stream Identifier field is 0x00, the recipient MUST respond with a connection error (Section 5.4.1) of type PROTOCOL_ERROR. --- diff --git a/rules/http2-events.rules b/rules/http2-events.rules index 7509eb0ea6..019e3feff1 100644 --- a/rules/http2-events.rules +++ b/rules/http2-events.rules @@ -23,3 +23,4 @@ alert http2 any any -> any any (msg:"SURICATA HTTP2 user info in uri"; flow:esta alert http2 any any -> any any (msg:"SURICATA HTTP2 reassembly limit reached"; flow:established; app-layer-event:http2.reassembly_limit_reached; classtype:protocol-command-decode; sid:2290015; rev:1;) alert http2 any any -> any any (msg:"SURICATA HTTP2 dns request too long"; flow:established,to_server; app-layer-event:http2.dns_request_too_long; classtype:protocol-command-decode; sid:2290016; rev:1;) alert http2 any any -> any any (msg:"SURICATA HTTP2 dns response too long"; flow:established,to_client; app-layer-event:http2.dns_response_too_long; classtype:protocol-command-decode; sid:2290017; rev:1;) +alert http2 any any -> any any (msg:"SURICATA HTTP2 data on stream zero"; flow:established; app-layer-event:http2.data_stream_zero; classtype:protocol-command-decode; sid:2290018; rev:1;) diff --git a/rust/src/http2/http2.rs b/rust/src/http2/http2.rs index 5b77975513..7f178d18bd 100644 --- a/rust/src/http2/http2.rs +++ b/rust/src/http2/http2.rs @@ -528,6 +528,7 @@ pub enum HTTP2Event { ReassemblyLimitReached, DnsRequestTooLong, DnsResponseTooLong, + DataStreamZero, } pub struct HTTP2DynTable { @@ -1248,7 +1249,9 @@ impl HTTP2State { data: txdata, }); } - if ftype == parser::HTTP2FrameType::Data as u8 { + if ftype == parser::HTTP2FrameType::Data as u8 && sid == 0 { + tx.tx_data.set_event(HTTP2Event::DataStreamZero as u8); + } else if ftype == parser::HTTP2FrameType::Data as u8 && sid > 0 { match unsafe { SURICATA_HTTP2_FILE_CONFIG } { Some(sfcm) => { //borrow checker forbids to reuse directly tx