From d76bf2b8618b89cf725febea85f93b613c65c527 Mon Sep 17 00:00:00 2001
From: Philippe Antoine <contact@catenacyber.fr>
Date: Tue, 8 Sep 2020 09:21:18 +0200
Subject: [PATCH] http: adds test for connect and protocol change

---
 .../http-connect-fragmented/README.md         |   7 +++++
 .../http-connect-fragmented/input.pcap        | Bin 0 -> 1528 bytes
 .../http-connect-fragmented/input.txt         |   5 ++++
 .../http-connect-fragmented/test.yaml         |  28 ++++++++++++++++++
 .../http-connect-simple/README.md             |   7 +++++
 .../http-connect-simple/input.pcap            | Bin 0 -> 1387 bytes
 .../http-connect-simple/input.txt             |   4 +++
 .../http-connect-simple/test.yaml             |  28 ++++++++++++++++++
 tests/http-connect/http-connect-tls/README.md |   7 +++++
 .../http-connect/http-connect-tls/input.pcap  | Bin 0 -> 1169 bytes
 tests/http-connect/http-connect-tls/input.txt |   3 ++
 tests/http-connect/http-connect-tls/test.yaml |  25 ++++++++++++++++
 12 files changed, 114 insertions(+)
 create mode 100644 tests/http-connect/http-connect-fragmented/README.md
 create mode 100644 tests/http-connect/http-connect-fragmented/input.pcap
 create mode 100644 tests/http-connect/http-connect-fragmented/input.txt
 create mode 100644 tests/http-connect/http-connect-fragmented/test.yaml
 create mode 100644 tests/http-connect/http-connect-simple/README.md
 create mode 100644 tests/http-connect/http-connect-simple/input.pcap
 create mode 100644 tests/http-connect/http-connect-simple/input.txt
 create mode 100644 tests/http-connect/http-connect-simple/test.yaml
 create mode 100644 tests/http-connect/http-connect-tls/README.md
 create mode 100644 tests/http-connect/http-connect-tls/input.pcap
 create mode 100644 tests/http-connect/http-connect-tls/input.txt
 create mode 100644 tests/http-connect/http-connect-tls/test.yaml

diff --git a/tests/http-connect/http-connect-fragmented/README.md b/tests/http-connect/http-connect-fragmented/README.md
new file mode 100644
index 000000000..fd9a3e1de
--- /dev/null
+++ b/tests/http-connect/http-connect-fragmented/README.md
@@ -0,0 +1,7 @@
+# Description
+
+Test HTTP CONNECT followed by HTTP
+
+# PCAP
+
+The pcap comes from running txt2pcap.py with input.txt
diff --git a/tests/http-connect/http-connect-fragmented/input.pcap b/tests/http-connect/http-connect-fragmented/input.pcap
new file mode 100644
index 0000000000000000000000000000000000000000..c102a813ba79d1c5e48791525697482bd1a4e5e5
GIT binary patch
literal 1528
zc-p&ic+)~A1{MYcfUq4^!{g2W^D(#p*&xgW#I6hs4j|;f#=ua|z`zK?Z(QUZ9g|-*
zfb?u&`v3o*2~aJI{S8KDW>!W<4z8|z=ciy(nILBFBEn30$2Ts@_Z80p&28KugxyRK
zhM9R0Xr=|wEDMC0COF*L2sHP6gMi`ne;PnRB(p%~ydc6HsN2qi%)(`kGaElc4p4s%
z!ki4e?vVhR69YHr8OR)Ge?LE0=MaU&q+}}-6JrIBkdOd<Lp?)YuF&GtB3;My)VvZa
zg|N)zlKdi|xB)L0FBiz}QlQ-=_+cy14_A@=0J8fT$ed_)euh+_{#1lHiFnPC0Gbnu
zY7WfJ3PuJ73jW@_T*0YDWvN9lXG3_%j_+jWCpIFt0xkZ7%kiQd{0vq={Z<Hb%<!56
za=aF*Iqt3?lR`L%4$eP7)3)PsQ6tct1fc!|ggG%dT(lkTq5xELLKO6gP6jJUbN79q
zyRTq#Hy<a_$pB)G1kfBxlYs#z(aGSx@_i*uT#jGMNo*h}X@VUuh~1o5q`5~6mwQ6F
bNi+x5J<nn0OyVZmUs^!39-z4gWX^K{FCS|-

literal 0
Hc-jL100001

diff --git a/tests/http-connect/http-connect-fragmented/input.txt b/tests/http-connect/http-connect-fragmented/input.txt
new file mode 100644
index 000000000..de079e153
--- /dev/null
+++ b/tests/http-connect/http-connect-fragmented/input.txt
@@ -0,0 +1,5 @@
+c2s CONNECT abc:443 HTTP/1.1\r\nUser-Agent: Victor/1.0\r\n\r\n
+s2c HTTP/1.1 200 OK\r\nServer: VictorServer/1.0\r\n\r\n
+c2s GE
+c2s T / HTTP/1.1\r\nUser-Agent: Victor/1.0\r\n\r\n
+s2c HTTP/1.1 200 OK\r\nServer: VictorServer/1.0\r\n\r\n
diff --git a/tests/http-connect/http-connect-fragmented/test.yaml b/tests/http-connect/http-connect-fragmented/test.yaml
new file mode 100644
index 000000000..d33f4398b
--- /dev/null
+++ b/tests/http-connect/http-connect-fragmented/test.yaml
@@ -0,0 +1,28 @@
+requires:
+  features:
+    - HAVE_LIBJANSSON
+
+# disables checksum verification
+args:
+  - -k none
+
+checks:
+
+  # Check that there is one file event with content range.
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        tx_id: 0
+        http.http_method: CONNECT
+        http.protocol: HTTP/1.1
+        http.status: 200
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        # new transaction id as we reset after CONNECT
+        tx_id: 0
+        http.http_method: GET
+        http.protocol: HTTP/1.1
+        http.status: 200
diff --git a/tests/http-connect/http-connect-simple/README.md b/tests/http-connect/http-connect-simple/README.md
new file mode 100644
index 000000000..fd9a3e1de
--- /dev/null
+++ b/tests/http-connect/http-connect-simple/README.md
@@ -0,0 +1,7 @@
+# Description
+
+Test HTTP CONNECT followed by HTTP
+
+# PCAP
+
+The pcap comes from running txt2pcap.py with input.txt
diff --git a/tests/http-connect/http-connect-simple/input.pcap b/tests/http-connect/http-connect-simple/input.pcap
new file mode 100644
index 0000000000000000000000000000000000000000..a5b7981eb20b6d1ce405c8a54380d69875d92708
GIT binary patch
literal 1387
zc-p&ic+)~A1{MYcfUvt1!{hB4xENf3Y!GGwVpj$R2M}^#V_>LfU|<B{HwN-f2Au7j
zAUzwH{{R1H0#wUle}j>knU#@|gR3jyNGRA;CWx6=i7->%>5ah$#bw$+bGbGMVK)<m
zVP<{<nrQ(v%K~Ah2@ZF10nOEE5HP&{PXj23WERLA5k|u1K;5PTG7FbEi`cmsa)J7D
z5$0s#b&mwloLIOy;UIII{r&u0okJ87laj4WOpFygLP7%c4fPCpxk8Imi*y~+Q}ar!
z6v8r-OY)0=;s(52yj)x$%TKeD<OzGAC$1uSA{>l?=1k?_Vn_q(PeYiKgx4GipgCcv
z=D-}SU}RvR;P1`L6`WdBmRbaJH-v}c`hy%qN2NW`<|tgQ_v7SZNCxUpMwk<i*Bp@R
zgHg?KcMVa{CqCe-IEfDUD4?}jK&M~9=JeA*b5eo&QxWDQ;x$JCXig{v0S~hDB`4A0
wo&~hH9hc)Bxrh#gcCh0Gv71xMMUs0uaJlCLspjBtj{!H){^|glm5t3k00@CK*8l(j

literal 0
Hc-jL100001

diff --git a/tests/http-connect/http-connect-simple/input.txt b/tests/http-connect/http-connect-simple/input.txt
new file mode 100644
index 000000000..bae5ed5d1
--- /dev/null
+++ b/tests/http-connect/http-connect-simple/input.txt
@@ -0,0 +1,4 @@
+c2s CONNECT abc:443 HTTP/1.1\r\nUser-Agent: Victor/1.0\r\n\r\n
+s2c HTTP/1.1 200 OK\r\nServer: VictorServer/1.0\r\n\r\n
+c2s GET / HTTP/1.1\r\nUser-Agent: Victor/1.0\r\n\r\n
+s2c HTTP/1.1 200 OK\r\nServer: VictorServer/1.0\r\n\r\n
\ No newline at end of file
diff --git a/tests/http-connect/http-connect-simple/test.yaml b/tests/http-connect/http-connect-simple/test.yaml
new file mode 100644
index 000000000..d33f4398b
--- /dev/null
+++ b/tests/http-connect/http-connect-simple/test.yaml
@@ -0,0 +1,28 @@
+requires:
+  features:
+    - HAVE_LIBJANSSON
+
+# disables checksum verification
+args:
+  - -k none
+
+checks:
+
+  # Check that there is one file event with content range.
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        tx_id: 0
+        http.http_method: CONNECT
+        http.protocol: HTTP/1.1
+        http.status: 200
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        # new transaction id as we reset after CONNECT
+        tx_id: 0
+        http.http_method: GET
+        http.protocol: HTTP/1.1
+        http.status: 200
diff --git a/tests/http-connect/http-connect-tls/README.md b/tests/http-connect/http-connect-tls/README.md
new file mode 100644
index 000000000..fd9a3e1de
--- /dev/null
+++ b/tests/http-connect/http-connect-tls/README.md
@@ -0,0 +1,7 @@
+# Description
+
+Test HTTP CONNECT followed by HTTP
+
+# PCAP
+
+The pcap comes from running txt2pcap.py with input.txt
diff --git a/tests/http-connect/http-connect-tls/input.pcap b/tests/http-connect/http-connect-tls/input.pcap
new file mode 100644
index 0000000000000000000000000000000000000000..0e78004bcf6e20c062cddb5e1ab175f8891e208c
GIT binary patch
literal 1169
zc-p&ic+)~A1{MYcfUw^vhsR&hU}kUuvO$;$h+P>N96-o{je((_fq@Z(-&n{y_1uY7
z1L@ho^#A`q6QEia`x}hR%&d%z99&&leEYzrGC|C2&?Ic8ywe+tl(?KCpt<TBgs__l
z!Z0&e0L`=jnq`47(*%b*)q&;~HwYMB|EB>IL^2Cx&M6|yfx4|2WEL)S78)=!<O22Q
zBFxFe>mCW9Ik9ka4uH&Y_V@F1bq-NTOiH#gF)>!~2nh+$H`Fua<q9oMEz)&NPt7Z_
zQV7dTF3B$fiW~59@p5s2EWc_%k|$z-p16wS36SLnK;|SFGBczB^`{}sNy2N61kju?
zRC8dCRxmO!Q1JKW<qA$MDoZVbxf{Ymas7NlqN6efX!Al`uD3K|W^e=QcSD%tgx4I9
z>&;Nj5o1Qm72t%HY(#X}E(DsKh0Ap}jfnPT7T9%y*v<JxntQTwxyRg?M00SsC*PQ8
Me`N#BT7=C#0BvCjq5uE@

literal 0
Hc-jL100001

diff --git a/tests/http-connect/http-connect-tls/input.txt b/tests/http-connect/http-connect-tls/input.txt
new file mode 100644
index 000000000..273a81b89
--- /dev/null
+++ b/tests/http-connect/http-connect-tls/input.txt
@@ -0,0 +1,3 @@
+c2s CONNECT abc:443 HTTP/1.1\r\nUser-Agent: Victor/1.0\r\n\r\n
+s2c HTTP/1.1 200 OK\r\nServer: VictorServer/1.0\r\n\r\n
+c2s \x16\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
\ No newline at end of file
diff --git a/tests/http-connect/http-connect-tls/test.yaml b/tests/http-connect/http-connect-tls/test.yaml
new file mode 100644
index 000000000..b577aed13
--- /dev/null
+++ b/tests/http-connect/http-connect-tls/test.yaml
@@ -0,0 +1,25 @@
+requires:
+  features:
+    - HAVE_LIBJANSSON
+
+# disables checksum verification
+args:
+  - -k none
+
+checks:
+
+  # Check that there is one file event with content range.
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        tx_id: 0
+        http.http_method: CONNECT
+        http.protocol: HTTP/1.1
+        http.status: 200
+  - filter:
+      count: 1
+      match:
+        event_type: flow
+        app_proto: tls
+        app_proto_orig: http
-- 
2.47.2