mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 22:58:20 +00:00
e14eddeb97
This PR changes the way in which the SSL analyzer tracks the direction of connections. So far, the SSL analyzer assumed that the originator of a connection would send the client hello (and other associated client-side events), and that the responder would be the SSL servers. In some circumstances this is not true, and the initiator of a connection is the server, with the responder being the client. So far this confused some of the internal statekeeping logic and could lead to mis-parsing of extensions. This reversal of roles can happen in DTLS, if a connection uses STUN - and potentially in some StartTLS protocols. This PR tracks the direction of a TLS connection using the hello request, client hello and server hello handshake messages. Furthermore, it changes the SSL events from providing is_orig to providing is_client, where is_client is true for the client_side of a connection. Since the argument positioning in the event has not changed, old scripts will continue to work seamlessly - the new semantics are what everyone writing SSL scripts will have expected in any case. There is a new event that is raised when a connection is flipped. A weird is raised if a flip happens repeatedly. Addresses GH-2198.
53 lines
2.2 KiB
Text
53 lines
2.2 KiB
Text
# @TEST-EXEC: echo "tls13draft16-chrome55.0.2879.0-canary-aborted.pcap"
|
|
# @TEST-EXEC: zeek -b -C -r $TRACES/tls/tls13draft16-chrome55.0.2879.0-canary-aborted.pcap %INPUT
|
|
# @TEST-EXEC: cat ssl.log > ssl-out.log
|
|
# @TEST-EXEC: echo "tls13draft16-chrome55.0.2879.0-canary.pcap"
|
|
# @TEST-EXEC: zeek -b -C -r $TRACES/tls/tls13draft16-chrome55.0.2879.0-canary.pcap %INPUT
|
|
# @TEST-EXEC: cat ssl.log >> ssl-out.log
|
|
# @TEST-EXEC: echo "tls13draft16-ff52.a01-aborted.pcap"
|
|
# @TEST-EXEC: zeek -b -C -r $TRACES/tls/tls13draft16-ff52.a01-aborted.pcap %INPUT
|
|
# @TEST-EXEC: cat ssl.log >> ssl-out.log
|
|
# @TEST-EXEC: echo "tls13draft16-ff52.a01.pcap"
|
|
# @TEST-EXEC: zeek -b -C -r $TRACES/tls/tls13draft16-ff52.a01.pcap %INPUT
|
|
# @TEST-EXEC: cat ssl.log >> ssl-out.log
|
|
# @TEST-EXEC: echo "tls13_psk_succesfull.pcap"
|
|
# @TEST-EXEC: zeek -b -C -r $TRACES/tls/tls13_psk_succesfull.pcap %INPUT
|
|
# @TEST-EXEC: cat ssl.log >> ssl-out.log
|
|
# @TEST-EXEC: echo "hrr.pcap"
|
|
# @TEST-EXEC: zeek -b -C -r $TRACES/tls/hrr.pcap %INPUT
|
|
# @TEST-EXEC: cat ssl.log >> ssl-out.log
|
|
# @TEST-EXEC: btest-diff ssl-out.log
|
|
# @TEST-EXEC: btest-diff .stdout
|
|
|
|
@load base/protocols/ssl
|
|
|
|
redef SSL::disable_analyzer_after_detection=F;
|
|
|
|
event ssl_extension_key_share(c: connection, is_client: bool, curves: index_vec)
|
|
{
|
|
print "key_share", c$id, is_client;
|
|
for ( i in curves )
|
|
{
|
|
print SSL::ec_curves[curves[i]];
|
|
}
|
|
}
|
|
|
|
event ssl_established(c: connection)
|
|
{
|
|
print "established", c$id;
|
|
}
|
|
|
|
event ssl_encrypted_data(c: connection, is_client: bool, record_version: count, content_type: count, length: count)
|
|
{
|
|
print "encrypted", c$id, is_client, SSL::version_strings[record_version], content_type;
|
|
}
|
|
|
|
event ssl_client_hello(c: connection, version: count, record_version: count, possible_ts: time, client_random: string, session_id: string, ciphers: index_vec, comp_methods: index_vec) &priority=5
|
|
{
|
|
print "client", SSL::version_strings[record_version], SSL::version_strings[version];
|
|
}
|
|
|
|
event ssl_server_hello(c: connection, version: count, record_version: count, possible_ts: time, server_random: string, session_id: string, cipher: count, comp_method: count) &priority=5
|
|
{
|
|
print "server", SSL::version_strings[record_version], SSL::version_strings[version];
|
|
}
|