From ec8011a6e4d34f6c109c3c1649f5b1c5b7a0699f Mon Sep 17 00:00:00 2001 From: Pierre Lalet Date: Mon, 13 Dec 2021 19:30:40 +0100 Subject: [PATCH 1/2] Tests: add p0f logs --- test/test_masscanned.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/test_masscanned.py b/test/test_masscanned.py index 11c75dd..13a8f18 100755 --- a/test/test_masscanned.py +++ b/test/test_masscanned.py @@ -54,6 +54,7 @@ if HAS_IVRE: ZEEK_PASSIVERECON = bool(os.environ.get("USE_ZEEK")) else: ZEEK_PASSIVERECON = False +P0F = bool(os.environ.get("USE_P0F")) conf.verb = 0 # prepare configuration file for masscanned @@ -98,6 +99,12 @@ if ZEEK_PASSIVERECON: stdout=open("test/res/zeek_passiverecon.stdout", "w"), stderr=open("test/res/zeek_passiverecon.stderr", "w"), ) +if P0F: + p0f = subprocess.Popen( + ["p0f", "-i", IFACE, "-o", "test/res/p0f_log.txt"], + stdout=open("test/res/p0f.stdout", "w"), + stderr=open("test/res/p0f.stderr", "w"), + ) # run masscanned masscanned = subprocess.Popen( [ @@ -133,4 +140,7 @@ if TCPDUMP: if ZEEK_PASSIVERECON: zeek.kill() zeek.wait() +if P0F: + p0f.kill() + p0f.wait() sys.exit(result) From e65ce63e70f6f99143bb7ae9ae8bf23eccc3f1df Mon Sep 17 00:00:00 2001 From: Pierre Lalet Date: Mon, 13 Dec 2021 19:32:48 +0100 Subject: [PATCH 2/2] Tests: use OUTDIR config value --- test/test_masscanned.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/test_masscanned.py b/test/test_masscanned.py index 13a8f18..2697e46 100755 --- a/test/test_masscanned.py +++ b/test/test_masscanned.py @@ -96,14 +96,14 @@ if ZEEK_PASSIVERECON: "redef tcp_content_deliver_all_orig = T; " f"redef PassiveRecon::HONEYPOTS += {{ {IPV4_ADDR}, [{IPV6_ADDR}] }}", ], - stdout=open("test/res/zeek_passiverecon.stdout", "w"), - stderr=open("test/res/zeek_passiverecon.stderr", "w"), + stdout=open(os.path.join(OUTDIR, "zeek_passiverecon.stdout"), "w"), + stderr=open(os.path.join(OUTDIR, "zeek_passiverecon.stderr"), "w"), ) if P0F: p0f = subprocess.Popen( - ["p0f", "-i", IFACE, "-o", "test/res/p0f_log.txt"], - stdout=open("test/res/p0f.stdout", "w"), - stderr=open("test/res/p0f.stderr", "w"), + ["p0f", "-i", IFACE, "-o", os.path.join(OUTDIR, "p0f_log.txt")], + stdout=open(os.path.join(OUTDIR, "p0f.stdout"), "w"), + stderr=open(os.path.join(OUTDIR, "p0f.stderr"), "w"), ) # run masscanned masscanned = subprocess.Popen( @@ -120,8 +120,8 @@ masscanned = subprocess.Popen( # if args in CLI, they are passed to masscanned + sys.argv[1:], env=dict(os.environ, RUST_BACKTRACE="1"), - stdout=open("test/res/masscanned.stdout", "w"), - stderr=open("test/res/masscanned.stderr", "w"), + stdout=open(os.path.join(OUTDIR, "masscanned.stdout"), "w"), + stderr=open(os.path.join(OUTDIR, "masscanned.stderr"), "w"), ) sleep(1)