Suricata pcap-aware target (#5528)

* Adds structure-aware target for suricata

* Remove rustc wrapper for suricata

now that https://github.com/rust-lang/rust/issues/82144
got fixed

* Remove suricata rust workarounds for coverage

Now that https://github.com/rust-lang/rust/issues/82144
got fixed

3 files changed, 22 insertions, 41 deletions

diff --git a/projects/suricata/Dockerfile b/projects/suricata/Dockerfile
index 99ecd41c8..257e7fb04 100644
--- a/projects/suricata/Dockerfile
+++ b/projects/suricata/Dockerfile
@@ -15,13 +15,14 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-RUN apt-get update && apt-get install -y build-essential autoconf automake libtool make pkg-config  python flex bison zlib1g-dev libpcre3-dev libpcre2-dev
+RUN apt-get update && apt-get install -y build-essential autoconf automake libtool make pkg-config  python flex bison zlib1g-dev libpcre3-dev libpcre2-dev cmake tshark
 
 #TODO libmagic, liblzma, pcre and other optional libraries
 ADD https://www.tcpdump.org/release/libpcap-1.9.1.tar.gz libpcap-1.9.1.tar.gz
 ADD http://www.digip.org/jansson/releases/jansson-2.12.tar.gz jansson-2.12.tar.gz
 RUN git clone --depth=1 https://github.com/yaml/libyaml
 ADD https://github.com/lz4/lz4/archive/v1.9.2.tar.gz lz4-1.9.2.tar.gz
+RUN git clone --depth=1 https://github.com/catenacyber/fuzzpcap
 
 ADD https://rules.emergingthreats.net/open/suricata/emerging.rules.zip emerging.rules.zip
 
@@ -32,4 +33,3 @@ RUN git clone --depth 1 https://github.com/OISF/libhtp.git libhtp
 RUN git clone --depth 1 https://github.com/OISF/suricata-verify suricata-verify
 WORKDIR $SRC
 COPY build.sh $SRC/
-COPY rustc.py $SRC/
diff --git a/projects/suricata/build.sh b/projects/suricata/build.sh
index 6fab70345..18f228047 100755
--- a/projects/suricata/build.sh
+++ b/projects/suricata/build.sh
@@ -37,6 +37,13 @@ make -j$(nproc)
 make install
 cd ..
 
+cd fuzzpcap
+mkdir build
+cd build
+cmake ..
+make install
+cd ../..
+
 cd libyaml
 ./bootstrap
 ./configure --disable-shared
@@ -52,19 +59,11 @@ mv libhtp suricata/
 cd suricata
 sh autogen.sh
 #run configure with right options
-if [ "$SANITIZER" = "coverage" ]
+if [ "$SANITIZER" = "address" ]
 then
-    export RUSTFLAGS="$RUSTFLAGS -C debug-assertions=no"
-    chmod +x $SRC/rustc.py
-    export RUSTC="$SRC/rustc.py"
-    ./configure --disable-shared --enable-fuzztargets --enable-debug
-else
-    if [ "$SANITIZER" = "address" ]
-    then
-        export RUSTFLAGS="$RUSTFLAGS -Cpasses=sancov -Cllvm-args=-sanitizer-coverage-level=4 -Cllvm-args=-sanitizer-coverage-trace-compares -Cllvm-args=-sanitizer-coverage-inline-8bit-counters -Cllvm-args=-sanitizer-coverage-trace-geps -Cllvm-args=-sanitizer-coverage-prune-blocks=0 -Cllvm-args=-sanitizer-coverage-pc-table -Clink-dead-code -Cllvm-args=-sanitizer-coverage-stack-depth"
-    fi
-    ./src/tests/fuzz/oss-fuzz-configure.sh
+    export RUSTFLAGS="$RUSTFLAGS -Cpasses=sancov -Cllvm-args=-sanitizer-coverage-level=4 -Cllvm-args=-sanitizer-coverage-trace-compares -Cllvm-args=-sanitizer-coverage-inline-8bit-counters -Cllvm-args=-sanitizer-coverage-trace-geps -Cllvm-args=-sanitizer-coverage-prune-blocks=0 -Cllvm-args=-sanitizer-coverage-pc-table -Clink-dead-code -Cllvm-args=-sanitizer-coverage-stack-depth"
 fi
+./src/tests/fuzz/oss-fuzz-configure.sh
 make -j$(nproc)
 
 cp src/fuzz_* $OUT/
@@ -102,3 +101,13 @@ cat $t/*.rules > corpus/$i || true; echo -ne '\0' >> corpus/$i; cat $t/*.pcap >>
 done
 set -x
 zip -q -r $OUT/fuzz_sigpcap_seed_corpus.zip corpus
+rm -Rf corpus
+mkdir corpus
+set +x
+ls | grep -v corpus | while read t; do
+cat $t/*.rules > corpus/$i || true; echo -ne '\0' >> corpus/$i; fpc_bin $t/*.pcap >> corpus/$i || rm corpus/$i; i=$((i+1));
+echo -ne '\0' >> corpus/$i; python3 $SRC/fuzzpcap/tcptofpc.py $t/*.pcap >> corpus/$i || rm corpus/$i; i=$((i+1));
+done
+set -x
+zip -q -r $OUT/fuzz_sigpcap_aware_seed_corpus.zip corpus
+echo "\"FPC0\"" > $OUT/fuzz_sigpcap_aware.dict
diff --git a/projects/suricata/rustc.py b/projects/suricata/rustc.py
deleted file mode 100644
index 00f26df63..000000000
--- a/projects/suricata/rustc.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-import subprocess
-
-#disable coverage for crate brotli_decompressor
-sys.argv[0] = "rustc"
-if "brotli_decompressor" in sys.argv:
-    try:
-        sys.argv.remove("-Zinstrument-coverage")
-    except:
-        pass
-    print(sys.argv)
-subprocess.call(sys.argv)