mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00

Add parsing of several more types to SAN extension. Make error messages of x509 file analyzer more useful. Fix file ID generation. You apparently have to be very careful which EndOfFile function of the file analysis framework you call... otherwhise it might try to close another file id. This took me quite a while to find. addresses BIT-953, BIT-760, BIT-1150
152 lines
4.1 KiB
Text
152 lines
4.1 KiB
Text
@load ./main
|
|
@load base/utils/conn-ids
|
|
@load base/frameworks/files
|
|
@load base/files/x509
|
|
|
|
module SSL;
|
|
|
|
export {
|
|
redef record Info += {
|
|
## Chain of certificates offered by the server to validate its
|
|
## complete signing chain.
|
|
cert_chain: vector of Files::Info &optional;
|
|
|
|
## An ordered vector of all certicate sha1 hashes for the
|
|
## certificates offered by the server.
|
|
cert_chain_sha1s: vector of string &optional &log;
|
|
|
|
## Chain of certificates offered by the client to validate its
|
|
## complete signing chain.
|
|
client_cert_chain: vector of Files::Info &optional;
|
|
|
|
## An ordered vector of all certicate sha1 hashes for the
|
|
## certificates offered by the client.
|
|
client_cert_chain_sha1s: vector of string &optional &log;
|
|
|
|
## Subject of the X.509 certificate offered by the server.
|
|
subject: string &log &optional;
|
|
## Subject of the signer of the X.509 certificate offered by the
|
|
## server.
|
|
issuer: string &log &optional;
|
|
|
|
## Subject of the X.509 certificate offered by the client.
|
|
client_subject: string &log &optional;
|
|
## Subject of the signer of the X.509 certificate offered by the
|
|
## client.
|
|
client_issuer: string &log &optional;
|
|
|
|
## current number of certificates seen from either side. Used
|
|
## to create file handles
|
|
server_depth: count &default=0;
|
|
client_depth: count &default=0;
|
|
};
|
|
|
|
## Default file handle provider for SSL.
|
|
global get_file_handle: function(c: connection, is_orig: bool): string;
|
|
|
|
## Default file describer for SSL.
|
|
global describe_file: function(f: fa_file): string;
|
|
}
|
|
|
|
function get_file_handle(c: connection, is_orig: bool): string
|
|
{
|
|
set_session(c);
|
|
|
|
local depth: count;
|
|
|
|
if ( is_orig )
|
|
{
|
|
depth = c$ssl$client_depth;
|
|
++c$ssl$client_depth;
|
|
}
|
|
else
|
|
{
|
|
depth = c$ssl$server_depth;
|
|
++c$ssl$server_depth;
|
|
}
|
|
|
|
return cat(Analyzer::ANALYZER_SSL, c$start_time, is_orig, id_string(c$id), depth);
|
|
}
|
|
|
|
function describe_file(f: fa_file): string
|
|
{
|
|
# This shouldn't be needed, but just in case...
|
|
if ( f$source != "SSL" )
|
|
return "";
|
|
|
|
# It is difficult to reliably describe a certificate - especially since
|
|
# we do not know when this function is called (hence, if the data structures
|
|
# are already populated).
|
|
#
|
|
# Just return a bit of our connection information and hope that that is good enough.
|
|
for ( cid in f$conns )
|
|
{
|
|
if ( f$conns[cid]?$ssl )
|
|
{
|
|
local c = f$conns[cid];
|
|
return cat(c$id$resp_h, ":", c$id$resp_p);
|
|
}
|
|
}
|
|
|
|
return "";
|
|
}
|
|
|
|
event bro_init() &priority=5
|
|
{
|
|
Files::register_protocol(Analyzer::ANALYZER_SSL,
|
|
[$get_file_handle = SSL::get_file_handle,
|
|
$describe = SSL::describe_file]);
|
|
}
|
|
|
|
event file_over_new_connection(f: fa_file, c: connection, is_orig: bool) &priority=5
|
|
{
|
|
if ( ! c?$ssl )
|
|
return;
|
|
|
|
if ( ! c$ssl?$cert_chain )
|
|
{
|
|
c$ssl$cert_chain = vector();
|
|
c$ssl$client_cert_chain = vector();
|
|
}
|
|
|
|
if ( is_orig )
|
|
c$ssl$client_cert_chain[|c$ssl$client_cert_chain|] = f$info;
|
|
else
|
|
c$ssl$cert_chain[|c$ssl$cert_chain|] = f$info;
|
|
|
|
Files::add_analyzer(f, Files::ANALYZER_X509);
|
|
# always calculate hashes. SHA1 is always required for certificates.
|
|
Files::add_analyzer(f, Files::ANALYZER_MD5);
|
|
Files::add_analyzer(f, Files::ANALYZER_SHA1);
|
|
}
|
|
|
|
event ssl_established(c: connection) &priority=6
|
|
{
|
|
# update subject and issuer information as well as sha1 hashes
|
|
if ( c$ssl?$cert_chain && |c$ssl$cert_chain| > 0 )
|
|
{
|
|
c$ssl$subject = c$ssl$cert_chain[0]$x509$certificate$subject;
|
|
c$ssl$issuer = c$ssl$cert_chain[0]$x509$certificate$issuer;
|
|
}
|
|
|
|
if ( c$ssl?$client_cert_chain && |c$ssl$client_cert_chain| > 0 )
|
|
{
|
|
c$ssl$client_subject = c$ssl$client_cert_chain[0]$x509$certificate$subject;
|
|
c$ssl$client_issuer = c$ssl$client_cert_chain[0]$x509$certificate$issuer;
|
|
}
|
|
|
|
|
|
if ( c$ssl?$cert_chain )
|
|
{
|
|
c$ssl$cert_chain_sha1s = string_vec();
|
|
for ( i in c$ssl$cert_chain )
|
|
c$ssl$cert_chain_sha1s[i] = c$ssl$cert_chain[i]$x509$sha1;
|
|
}
|
|
|
|
if ( c$ssl?$client_cert_chain )
|
|
{
|
|
c$ssl$client_cert_chain_sha1s = string_vec();
|
|
for ( i in c$ssl$client_cert_chain )
|
|
c$ssl$client_cert_chain_sha1s[i] = c$ssl$client_cert_chain[i]$x509$sha1;
|
|
}
|
|
}
|