mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Fixing productive connections with missing SYN still considered partial after flipping direction.
In https://github.com/zeek/zeek/pull/2191, we added endpoint flipping for cases where a connection starts with a SYN/ACK followed by ACK or data. The goal was to treat the connection as productive and go ahead and parse it. But the TCP analyzer could continue to consider it partial after flipping, meaning that app layers would bail out. #2426 shows such a case: HTTP gets correctly activated after flipping through content inspection, but it won't process anything because `IsPartial()` returns true. As the is-partial state reflects whether we saw the first packets each in direction, this patch now overrides that state for the originally missing SYN after flipping. We actually had the same problem at a couple of other locations already as well. One of that only happened to work because of the originally inconsistent state flipping that was fixed in the previous commit. The corresponding unit test now broke after that change. This commit updates that logic as well to override the state. This fix is a bit of a hack, but the best solution I could think of without introducing larger changes. Closes #2426.
This commit is contained in:
parent
0ef709ae7c
commit
6fbebc5e94
6 changed files with 27 additions and 1 deletions
|
@ -275,9 +275,11 @@ bool TCP_Endpoint::CheckHistory(uint32_t mask, char code)
|
||||||
// since if those elicit anything, it should be a RST.
|
// since if those elicit anything, it should be a RST.
|
||||||
//
|
//
|
||||||
// Thus, at this stage we go ahead and flip the connection.
|
// Thus, at this stage we go ahead and flip the connection.
|
||||||
// We then fix up the history (which will initially be "H^").
|
// We then fix up the history (which will initially be "H^") and
|
||||||
|
// pretend we have actually seen that missing first packet.
|
||||||
conn->FlipRoles();
|
conn->FlipRoles();
|
||||||
conn->ReplaceHistory("^h");
|
conn->ReplaceHistory("^h");
|
||||||
|
tcp_analyzer->SetFirstPacketSeen(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! IsOrig() )
|
if ( ! IsOrig() )
|
||||||
|
|
|
@ -787,6 +787,11 @@ void TCPSessionAdapter::SetPartialStatus(analyzer::tcp::TCP_Flags flags, bool is
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TCPSessionAdapter::SetFirstPacketSeen(bool is_orig)
|
||||||
|
{
|
||||||
|
first_packet_seen |= (is_orig ? ORIG : RESP);
|
||||||
|
}
|
||||||
|
|
||||||
void TCPSessionAdapter::UpdateInactiveState(double t, analyzer::tcp::TCP_Endpoint* endpoint,
|
void TCPSessionAdapter::UpdateInactiveState(double t, analyzer::tcp::TCP_Endpoint* endpoint,
|
||||||
analyzer::tcp::TCP_Endpoint* peer, uint32_t base_seq,
|
analyzer::tcp::TCP_Endpoint* peer, uint32_t base_seq,
|
||||||
uint32_t ack_seq, int len, bool is_orig,
|
uint32_t ack_seq, int len, bool is_orig,
|
||||||
|
@ -829,6 +834,7 @@ void TCPSessionAdapter::UpdateInactiveState(double t, analyzer::tcp::TCP_Endpoin
|
||||||
is_partial = 0;
|
is_partial = 0;
|
||||||
Conn()->FlipRoles();
|
Conn()->FlipRoles();
|
||||||
peer->SetState(analyzer::tcp::TCP_ENDPOINT_ESTABLISHED);
|
peer->SetState(analyzer::tcp::TCP_ENDPOINT_ESTABLISHED);
|
||||||
|
SetFirstPacketSeen(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
|
@ -913,6 +919,7 @@ void TCPSessionAdapter::UpdateInactiveState(double t, analyzer::tcp::TCP_Endpoin
|
||||||
// as partial and instead establish the connection.
|
// as partial and instead establish the connection.
|
||||||
endpoint->SetState(analyzer::tcp::TCP_ENDPOINT_ESTABLISHED);
|
endpoint->SetState(analyzer::tcp::TCP_ENDPOINT_ESTABLISHED);
|
||||||
is_partial = 0;
|
is_partial = 0;
|
||||||
|
SetFirstPacketSeen(is_orig);
|
||||||
}
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
|
@ -80,6 +80,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
friend class analyzer::tcp::TCP_ApplicationAnalyzer;
|
friend class analyzer::tcp::TCP_ApplicationAnalyzer;
|
||||||
|
friend class analyzer::tcp::TCP_Endpoint;
|
||||||
friend class analyzer::tcp::TCP_Reassembler;
|
friend class analyzer::tcp::TCP_Reassembler;
|
||||||
friend class analyzer::pia::PIA_TCP;
|
friend class analyzer::pia::PIA_TCP;
|
||||||
friend class packet_analysis::TCP::TCPAnalyzer;
|
friend class packet_analysis::TCP::TCPAnalyzer;
|
||||||
|
@ -95,6 +96,7 @@ protected:
|
||||||
bool IsReuse(double t, const u_char* pkt) override;
|
bool IsReuse(double t, const u_char* pkt) override;
|
||||||
|
|
||||||
void SetPartialStatus(analyzer::tcp::TCP_Flags flags, bool is_orig);
|
void SetPartialStatus(analyzer::tcp::TCP_Flags flags, bool is_orig);
|
||||||
|
void SetFirstPacketSeen(bool is_orig);
|
||||||
|
|
||||||
// Update the state machine of the TCPs based on the activity. This
|
// Update the state machine of the TCPs based on the activity. This
|
||||||
// includes our pseudo-states such as TCP_ENDPOINT_PARTIAL.
|
// includes our pseudo-states such as TCP_ENDPOINT_PARTIAL.
|
||||||
|
|
11
testing/btest/Baseline/core.tcp.flip-without-syn/conn.log
Normal file
11
testing/btest/Baseline/core.tcp.flip-without-syn/conn.log
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
||||||
|
#separator \x09
|
||||||
|
#set_separator ,
|
||||||
|
#empty_field (empty)
|
||||||
|
#unset_field -
|
||||||
|
#path conn
|
||||||
|
#open XXXX-XX-XX-XX-XX-XX
|
||||||
|
#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]
|
||||||
|
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 141.142.228.5 6669 192.150.187.43 80 tcp http 0.141744 136 5007 SF - - 0 ^hADadFf 6 456 7 5371 -
|
||||||
|
#close XXXX-XX-XX-XX-XX-XX
|
BIN
testing/btest/Traces/tcp/http-on-irc-port-missing-syn.pcap
Normal file
BIN
testing/btest/Traces/tcp/http-on-irc-port-missing-syn.pcap
Normal file
Binary file not shown.
4
testing/btest/core/tcp/flip-without-syn.zeek
Normal file
4
testing/btest/core/tcp/flip-without-syn.zeek
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
# @TEST-EXEC: zeek -r $TRACES/tcp/http-on-irc-port-missing-syn.pcap %INPUT
|
||||||
|
# @TEST-EXEC: btest-diff conn.log
|
||||||
|
|
||||||
|
# @TEST-DOC: Regression test for #2191: missing SYN and misleading well-known port. Zeek flips, and DPD still figures out the protocol ok.
|
Loading…
Add table
Add a link
Reference in a new issue