Merge pull request #258 from p-l-/update-upload-artifact

chore(deps): bump {down,up}load-artifact from v2 to v4
This commit is contained in:
Pierre 2024-10-14 23:35:50 +02:00 committed by GitHub
commit bb8c5fa184
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 12 deletions

View file

@ -54,7 +54,7 @@ jobs:
run: tar cf masscanned.tar target/debug/masscanned run: tar cf masscanned.tar target/debug/masscanned
- name: Upload binary - name: Upload binary
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4
with: with:
name: masscanned.tar name: masscanned.tar
path: masscanned.tar path: masscanned.tar
@ -68,7 +68,7 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Get binary - name: Get binary
uses: actions/download-artifact@v2 uses: actions/download-artifact@v4
with: with:
name: masscanned.tar name: masscanned.tar

View file

@ -44,8 +44,12 @@ def test_ipv4_udp_dns_in_a():
check_ip_checksum(resp) check_ip_checksum(resp)
assert UDP in resp, "no UDP layer found" assert UDP in resp, "no UDP layer found"
udp = resp[UDP] udp = resp[UDP]
assert udp.sport == dport, "unexpected UDP sport: {}".format(udp.sport) assert (
assert udp.dport == sport, "unexpected UDP dport: {}".format(udp.dport) 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: if DNS not in udp:
try: try:
dns_rep = DNS(udp.load) dns_rep = DNS(udp.load)
@ -53,7 +57,9 @@ def test_ipv4_udp_dns_in_a():
raise AssertionError("no DNS layer found") raise AssertionError("no DNS layer found")
else: else:
dns_rep = udp[DNS] 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.qr, "unexpected qr value"
assert dns_rep.opcode == 0, "unexpected opcode value" assert dns_rep.opcode == 0, "unexpected opcode value"
assert dns_rep.aa, "unexpected aa 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 not dns_rep.ra, "unexpected ra value"
assert dns_rep.z == 0, "unexpected z value" assert dns_rep.z == 0, "unexpected z value"
assert dns_rep.rcode == 0, "unexpected rcode 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.ancount == 1, "unexpected ancount value"
assert dns_rep.nscount == 0, "unexpected nscount value" assert dns_rep.nscount == 0, "unexpected nscount value"
assert dns_rep.arcount == 0, "unexpected arcount value" assert dns_rep.arcount == 0, "unexpected arcount value"
@ -90,11 +98,11 @@ def test_ipv4_udp_dns_in_a_multiple_queries():
dports = [53, 5353, 80, 161, 24732] dports = [53, 5353, 80, 161, 24732]
for sport in sports: for sport in sports:
for dport in dports: for dport in dports:
qd = ( qd = [
DNSQR(qname="www.example1.com", qtype="A", qclass="IN") DNSQR(qname="www.example1.com", qtype="A", qclass="IN"),
/ DNSQR(qname="www.example2.com", qtype="A", qclass="IN") DNSQR(qname="www.example2.com", qtype="A", qclass="IN"),
/ DNSQR(qname="www.example3.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) dns_req = DNS(id=1234, rd=False, opcode=0, qd=qd)
req = ( req = (
Ether(dst=MAC_ADDR) Ether(dst=MAC_ADDR)
@ -125,7 +133,9 @@ def test_ipv4_udp_dns_in_a_multiple_queries():
assert not dns_rep.ra, "unexpected ra value" assert not dns_rep.ra, "unexpected ra value"
assert dns_rep.z == 0, "unexpected z value" assert dns_rep.z == 0, "unexpected z value"
assert dns_rep.rcode == 0, "unexpected rcode 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.ancount == 3, "unexpected ancount value"
assert dns_rep.nscount == 0, "unexpected nscount value" assert dns_rep.nscount == 0, "unexpected nscount value"
assert dns_rep.arcount == 0, "unexpected arcount value" assert dns_rep.arcount == 0, "unexpected arcount value"