From f5d40dd1a8305cce0590262894617090d9a9f0a4 Mon Sep 17 00:00:00 2001 From: Pierre Lalet Date: Mon, 14 Oct 2024 02:03:39 +0200 Subject: [PATCH 1/4] chore(deps): bump {down,up}load-artifact from v2 to v4 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87e3b23..62cf039 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,7 @@ jobs: run: tar cf masscanned.tar target/debug/masscanned - name: Upload binary - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: masscanned.tar path: masscanned.tar @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v2 - name: Get binary - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: masscanned.tar From c8526809309c27f103551be73e4c4d1124c3f7a9 Mon Sep 17 00:00:00 2001 From: Pierre Lalet Date: Mon, 14 Oct 2024 02:15:23 +0200 Subject: [PATCH 2/4] Tests: add values to assert messages --- test/src/tests/dns.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/test/src/tests/dns.py b/test/src/tests/dns.py index 9261bbb..d360650 100644 --- a/test/src/tests/dns.py +++ b/test/src/tests/dns.py @@ -44,8 +44,12 @@ def test_ipv4_udp_dns_in_a(): check_ip_checksum(resp) assert UDP in resp, "no UDP layer found" udp = resp[UDP] - assert udp.sport == dport, "unexpected UDP sport: {}".format(udp.sport) - assert udp.dport == sport, "unexpected UDP dport: {}".format(udp.dport) + assert ( + udp.sport == dport + ), f"unexpected UDP sport: {udp.sport!r} ({domain})" + assert ( + udp.dport == sport + ), f"unexpected UDP dport: {udp.dport!r} ({domain})" if DNS not in udp: try: dns_rep = DNS(udp.load) @@ -53,7 +57,9 @@ def test_ipv4_udp_dns_in_a(): raise AssertionError("no DNS layer found") else: dns_rep = udp[DNS] - assert dns_rep.id == 1234, f"unexpected id value: {dns_rep.id}" + assert ( + dns_rep.id == 1234 + ), f"unexpected id value: {dns_rep.id!r} ({domain})" assert dns_rep.qr, "unexpected qr value" assert dns_rep.opcode == 0, "unexpected opcode value" assert dns_rep.aa, "unexpected aa value" @@ -62,7 +68,9 @@ def test_ipv4_udp_dns_in_a(): assert not dns_rep.ra, "unexpected ra value" assert dns_rep.z == 0, "unexpected z value" assert dns_rep.rcode == 0, "unexpected rcode value" - assert dns_rep.qdcount == 1, "unexpected qdcount value" + assert ( + dns_rep.qdcount == 1 + ), f"unexpected qdcount value: {dns_rep.qdcount!r} vs 1 ({domain})" assert dns_rep.ancount == 1, "unexpected ancount value" assert dns_rep.nscount == 0, "unexpected nscount value" assert dns_rep.arcount == 0, "unexpected arcount value" @@ -125,7 +133,9 @@ def test_ipv4_udp_dns_in_a_multiple_queries(): assert not dns_rep.ra, "unexpected ra value" assert dns_rep.z == 0, "unexpected z value" assert dns_rep.rcode == 0, "unexpected rcode value" - assert dns_rep.qdcount == 3, "unexpected qdcount value" + assert ( + dns_rep.qdcount == 3 + ), f"unexpected qdcount value: {dns_rep.qdcount} vs 3" assert dns_rep.ancount == 3, "unexpected ancount value" assert dns_rep.nscount == 0, "unexpected nscount value" assert dns_rep.arcount == 0, "unexpected arcount value" From fe0312b066477780c728ded54e868a106230e180 Mon Sep 17 00:00:00 2001 From: Pierre Lalet Date: Mon, 14 Oct 2024 03:06:56 +0200 Subject: [PATCH 3/4] Tests: lock Scapy version to 2.5.0 --- test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/requirements.txt b/test/requirements.txt index fd8f3e8..2774d67 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,3 +1,3 @@ ivre -scapy +scapy==2.5.0 requests From 64698a66258dc7b25859a4eb7deebcdc94e9bae6 Mon Sep 17 00:00:00 2001 From: Pierre Lalet Date: Mon, 14 Oct 2024 18:38:31 +0200 Subject: [PATCH 4/4] Tests: update Scapy to current stable --- test/requirements.txt | 2 +- test/src/tests/dns.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/requirements.txt b/test/requirements.txt index 2774d67..fd8f3e8 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,3 +1,3 @@ ivre -scapy==2.5.0 +scapy requests diff --git a/test/src/tests/dns.py b/test/src/tests/dns.py index d360650..93ab1ac 100644 --- a/test/src/tests/dns.py +++ b/test/src/tests/dns.py @@ -98,11 +98,11 @@ def test_ipv4_udp_dns_in_a_multiple_queries(): dports = [53, 5353, 80, 161, 24732] for sport in sports: for dport in dports: - qd = ( - DNSQR(qname="www.example1.com", qtype="A", qclass="IN") - / DNSQR(qname="www.example2.com", qtype="A", qclass="IN") - / DNSQR(qname="www.example3.com", qtype="A", qclass="IN") - ) + qd = [ + DNSQR(qname="www.example1.com", qtype="A", qclass="IN"), + DNSQR(qname="www.example2.com", qtype="A", qclass="IN"), + DNSQR(qname="www.example3.com", qtype="A", qclass="IN"), + ] dns_req = DNS(id=1234, rd=False, opcode=0, qd=qd) req = ( Ether(dst=MAC_ADDR)