From 28dbab369d5a6790b4657ddf012c9a73526a8789 Mon Sep 17 00:00:00 2001
From: Joey Salazar <jgsal@protonmail.com>
Date: Thu, 11 Feb 2021 19:05:14 -0600
Subject: [PATCH] git: Add test cases

Add git dissection test cases to existing testing suite for: finding git
packets, finding the Git Protocol version, finding the right amount of
Flush and Delimiter packets, not finding Malformed packets.

Part of #17093
---
 epan/dissectors/packet-git.c  |   3 +++
 test/captures/gitOverTCP.pcap | Bin 0 -> 582 bytes
 test/suite_dissection.py      |  25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 test/captures/gitOverTCP.pcap

diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c
index eb685d2989..3b216a3cb6 100644
--- a/epan/dissectors/packet-git.c
+++ b/epan/dissectors/packet-git.c
@@ -9,6 +9,9 @@
  * Copied from packet-pop.c
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Current testing suite 'case_dissect_git' can be found at
+ * test/suite_dissection.py
  */
 
 #include "config.h"
diff --git a/test/captures/gitOverTCP.pcap b/test/captures/gitOverTCP.pcap
new file mode 100644
index 0000000000000000000000000000000000000000..e2c33f46644fbe1a68da46b21059bc0602c5cbad
GIT binary patch
literal 582
zcmca|c+)~A1{MYw`2U}Qff2~zJ#{`_go%;C1;_?r4hD6}%vnJp3__+%91N}u3}!Pg
zFfcf<u?tW3wrb^KVB%LfbwH(|e-+a@=2cw*694~8onT-vFfd3hOD!tS%+FIW;sTj@
z`8pHBG@yAPjA3TS%!?p1*$$wYDF8Ebia5wjL(|0c)Vvbg^vn`{BRwNaJtHolMaenE
zx<#pJ#Xz>9QCezAa)xbjMq*A*emPjAIJF4q65afQ5};#1BIfx?S*gh-x@q}Exrrqp
zwT2*L3_z}oy1~TY1#}?@!~6{LKiKCst$q$bSKjUe`5NTX11c(~KrRIOz92y2SJN$C
zuq#cH^K)|(^HOYK4g;ASc$10Y6wp)<#xQwLt3TLeUNn>E!A<T3n{0vRe*?XuWFw%L
z%rLzK^pGJCTNb3I=77AHTwIw83nddEL$?4(WL7A6xH`IkLL~`F45Us!BQ-IlSRW*n
Oh%Qx<m=2aPFaQ9td8@Sm

literal 0
HcmV?d00001

diff --git a/test/suite_dissection.py b/test/suite_dissection.py
index f0405943e1..ba02c68be9 100644
--- a/test/suite_dissection.py
+++ b/test/suite_dissection.py
@@ -364,6 +364,31 @@ class case_dissect_tcp(subprocesstest.SubprocessTestCase):
             '-Ytls', '-Tfields', '-eframe.number', '-etls.record.length', '-2'))
         self.assertEqual(proc.stdout_str, '2\t16\n')
 
+@fixtures.mark_usefixtures('test_env')
+@fixtures.uses_fixtures
+class case_dissect_git(subprocesstest.SubprocessTestCase):
+    def test_git_prot(self, cmd_tshark, capture_file, features):
+        '''
+        Check for Git protocol version 2, flush and delimiter packets.
+        Ensure there are no malformed packets.
+        '''
+        proc = self.assertRun((cmd_tshark,
+                '-r', capture_file('gitOverTCP.pcap'),
+                '-Ygit', '-Tfields', '-egit.version', '-egit.packet_type',
+                '-zexpert', '-e_ws.expert',
+            ))
+        # `epan/dissectors/packet-git.c` parses the Git Protocol version
+        # from ASCII '1' or '2' to integers 49 or 50 in grep output.
+        # 0x0000 are flush packets.
+        # 0x0001 are delimiter packets.
+        # Pre-existing git Malformed Packets in this pcap were addressed
+        # with the parsing of the delimiter packets. This test ensures
+        # pcap gitOverTCP's delim packets are parsed and that there are no
+        # malformed packets with "Expert Info/Errors" in the same pcap.
+        # Additional test cases for other scenarios, i.e actually malformed
+        # git packets, might be required.
+        self.assertEqual(proc.stdout_str, '50\t\t\n\t0\t\n\t\t\n\t1,0\t\n')
+
 @fixtures.mark_usefixtures('test_env')
 @fixtures.uses_fixtures
 class case_dissect_tls(subprocesstest.SubprocessTestCase):