From: Philippe Antoine <contact@catenacyber.fr>
Date: Tue, 8 Dec 2020 11:46:24 +0000 (+0100)
Subject: http2: http.uri keyword now works for HTTP2
X-Git-Tag: suricata-7.0.0-beta1~1791
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a98d0fe6edcd6bd5af460c067caca3021f543587;p=thirdparty%2Fsuricata.git

http2: http.uri keyword now works for HTTP2

cf #4067
---

diff --git a/rust/src/http2/detect.rs b/rust/src/http2/detect.rs
index 5918026323..7d339f2b1c 100644
--- a/rust/src/http2/detect.rs
+++ b/rust/src/http2/detect.rs
@@ -478,6 +478,56 @@ pub unsafe extern "C" fn rs_http2_tx_get_header_name(
     return 0;
 }
 
+fn http2_blocks_get_header_value<'a>(
+    blocks: &'a Vec<parser::HTTP2FrameHeaderBlock>, name: &str,
+) -> Result<&'a [u8], ()> {
+    for j in 0..blocks.len() {
+        if blocks[j].name == name.as_bytes().to_vec() {
+            return Ok(&blocks[j].value);
+        }
+    }
+    return Err(());
+}
+
+fn http2_frames_get_header_value<'a>(
+    frames: &'a Vec<HTTP2Frame>, name: &str,
+) -> Result<&'a [u8], ()> {
+    for i in 0..frames.len() {
+        match &frames[i].data {
+            HTTP2FrameTypeData::HEADERS(hd) => {
+                if let Ok(value) = http2_blocks_get_header_value(&hd.blocks, name) {
+                    return Ok(value);
+                }
+            }
+            HTTP2FrameTypeData::PUSHPROMISE(hd) => {
+                if let Ok(value) = http2_blocks_get_header_value(&hd.blocks, name) {
+                    return Ok(value);
+                }
+            }
+            HTTP2FrameTypeData::CONTINUATION(hd) => {
+                if let Ok(value) = http2_blocks_get_header_value(&hd.blocks, name) {
+                    return Ok(value);
+                }
+            }
+            _ => {}
+        }
+    }
+
+    return Err(());
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn rs_http2_tx_get_uri(
+    tx: &mut HTTP2Transaction, buffer: *mut *const u8, buffer_len: *mut u32,
+) -> u8 {
+    if let Ok(value) = http2_frames_get_header_value(&tx.frames_ts, ":path") {
+        *buffer = value.as_ptr(); //unsafe
+        *buffer_len = value.len() as u32;
+        return 1;
+    }
+    return 0;
+}
+
 fn http2_escape_header(hd: &parser::HTTP2FrameHeaders, i: u32) -> Vec<u8> {
     //minimum size + 2 for escapes
     let normalsize = hd.blocks[i as usize].value.len() + 2 + hd.blocks[i as usize].name.len() + 2;
diff --git a/src/detect-http-uri.c b/src/detect-http-uri.c
index ba621678fd..da9fa11665 100644
--- a/src/detect-http-uri.c
+++ b/src/detect-http-uri.c
@@ -68,6 +68,9 @@ static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
         const DetectEngineTransforms *transforms,
         Flow *_f, const uint8_t _flow_flags,
         void *txv, const int list_id);
+static InspectionBuffer *GetData2(DetectEngineThreadCtx *det_ctx,
+        const DetectEngineTransforms *transforms, Flow *_f, const uint8_t _flow_flags, void *txv,
+        const int list_id);
 static int DetectHttpUriSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str);
 static int DetectHttpRawUriSetup(DetectEngineCtx *, Signature *, const char *);
 static void DetectHttpRawUriSetupCallback(const DetectEngineCtx *de_ctx,
@@ -112,6 +115,12 @@ void DetectHttpUriRegister (void)
     DetectAppLayerMpmRegister2("http_uri", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
             GetData, ALPROTO_HTTP1, HTP_REQUEST_LINE);
 
+    DetectAppLayerInspectEngineRegister2("http_uri", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
+            HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
+
+    DetectAppLayerMpmRegister2("http_uri", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
+            GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
+
     DetectBufferTypeSetDescriptionByName("http_uri",
             "http request uri");
 
@@ -198,7 +207,7 @@ static int DetectHttpUriSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const
 {
     if (DetectBufferSetActiveList(s, g_http_uri_buffer_id) < 0)
         return -1;
-    if (DetectSignatureSetAppProto(s, ALPROTO_HTTP1) < 0)
+    if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;
     return 0;
 }
@@ -229,6 +238,29 @@ static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
     return buffer;
 }
 
+static InspectionBuffer *GetData2(DetectEngineThreadCtx *det_ctx,
+        const DetectEngineTransforms *transforms, Flow *_f, const uint8_t _flow_flags, void *txv,
+        const int list_id)
+{
+    SCEnter();
+
+    InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
+    if (buffer->inspect == NULL) {
+        uint32_t b_len = 0;
+        const uint8_t *b = NULL;
+
+        if (rs_http2_tx_get_uri(txv, &b, &b_len) != 1)
+            return NULL;
+        if (b == NULL || b_len == 0)
+            return NULL;
+
+        InspectionBufferSetup(det_ctx, list_id, buffer, b, b_len);
+        InspectionBufferApplyTransforms(buffer, transforms);
+    }
+
+    return buffer;
+}
+
 /**
  * \brief Sets up the http_raw_uri modifier keyword.
  *