Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 05:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/2684-remove-vxlan-violations'

Browse source 
* origin/topic/timw/2684-remove-vxlan-violations:
  GH-2684: Stop violating VXLAN for forwarding failures
This commit is contained in:
Tim Wojtulewicz 2023-01-25 11:12:15 -07:00
commit 8d815feb34
6 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5.2.0-dev.519 | 2023-01-25 11:12:15 -0700
* GH-2684: Stop violating VXLAN for forwarding failures (Tim Wojtulewicz, Corelight)
5.2.0-dev.515 | 2023-01-25 08:19:02 -0700
* Fix CI benchmark script to properly urlencode arguments (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.515
5.2.0-dev.519

2
src/packet_analysis/protocol/vxlan/VXLAN.cc
View file

@ -58,8 +58,6 @@ bool VXLAN_Analyzer::AnalyzePacket(size_t len, const uint8_t* data, Packet* pack
ec->ip_hdr->ToPktHdrVal(), val_mgr->Count(vni));
}
}
else
AnalyzerViolation("VXLAN invalid inner packet", packet->session);
return fwd_ret_val;
}

12
testing/btest/Baseline/core.tunnels.vxlan-unknown-internal-packet/conn.log Normal file
View file

@ -0,0 +1,12 @@
#separator \x09
#set_separator ,
#empty_field (empty)
#unset_field -
#path conn
#open 2023-01-25-16-21-59
#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto service duration orig_bytes resp_bytes conn_state local_orig local_resp missed_bytes history orig_pkts orig_ip_bytes resp_pkts resp_ip_bytes tunnel_parents
#types time string addr port addr port enum string interval count count string bool bool count string count count count count set[string]
1673538029.809899 CHhAvVGS1DHFjwGM9 172.30.0.1 48036 172.30.0.2 4789 udp - - - - OTH - - 0 C 0 0 0 0 -
1673538054.797831 ClEkJM2Vm5giqnMf4h 172.30.0.1 45303 172.30.0.2 4789 udp - - - - OTH - - 0 C 0 0 0 0 -
1673538167.375490 C4J4Th3PJpwUYZZ6gc 172.30.0.1 36030 172.30.0.2 4789 udp - - - - OTH - - 0 C 0 0 0 0 -
#close 2023-01-25-16-21-59

BIN
testing/btest/Traces/tunnels/vxlan-encapsulated-igmp-v2.pcap Normal file
View file

Binary file not shown.

10
testing/btest/core/tunnels/vxlan-unknown-internal-packet.zeek Normal file
View file

@ -0,0 +1,10 @@
# This test validates that we can read VXLAN traffic without throwing analyzer violations
# when the internal packets are something we can't process. In this case, the internal
# packets are IGMP, which we don't have an analyzer for.
# @TEST-EXEC: zeek -r $TRACES/tunnels/vxlan-encapsulated-igmp-v2.pcap %INPUT
# @TEST-EXEC: btest-diff conn.log
# @TEST-EXEC: ! test -f analyzer.log
@load base/frameworks/tunnels
@load base/protocols/conn