Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 13:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

deal with bug url

Browse source
This commit is contained in:
Liang Zhu 2015-07-28 16:20:38 -07:00
parent 2d6e4393b6
commit 5d168792ee
1 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

44
scripts/policy/protocols/ssl/ocsp-ssl-split.bro
View file

@ -355,6 +355,28 @@ event x509_extension(f: fa_file, ext: X509::Extension) &priority= -10 {
Queue::put(c$ssl$cert_ts[ocsp_uri, serial_number, issuer_name], current_ts);
}
function clean_bug_host(host: string): string
{
local s: string = host;
s = clean_uri(s);
if ( s[0:7] == "http://" )
s = s[7:];
return s;
}
function clean_bug_uri(uri: string, host: string): string
{
local s: string = uri;
s = clean_uri(s);
if ( s[0:7] == "http://" )
s = s[7:];
if ( |host| > 0 && s[0:|host|] == host )
s = s[|host|:];
return s;
}
function update_http_info(ocsp: OCSP_SSL_SPLIT::Info_OCSP, http: HTTP::Info)
{
ocsp$num_ocsp = http$conn$num_ocsp;
@ -368,17 +390,27 @@ function update_http_info(ocsp: OCSP_SSL_SPLIT::Info_OCSP, http: HTTP::Info)
if ( http?$original_uri )
ocsp$original_uri = http$original_uri;
local host_str: string = "";
if ( http?$host )
host_str = clean_bug_host(http$host);
local uri_str: string = "";
if ( http?$uri)
{
if (http?$host)
uri_str = clean_bug_uri(http$uri, host_str);
else
uri_str = clean_bug_uri(http$uri, "");
}
if ( http?$host )
{
ocsp$host = http$host;
ocsp$ocsp_uri = http$host;
ocsp$host = host_str;
ocsp$ocsp_uri = host_str;
}
if ( http?$uri )
{
local uri_str = http$uri;
if ( http?$host && http$uri == "http://" + http$host )
uri_str = "/"; #deal with software bug: make the full url empty
if ( ocsp?$ocsp_uri )
ocsp$ocsp_uri += uri_str;
else
@ -390,7 +422,7 @@ function update_http_info(ocsp: OCSP_SSL_SPLIT::Info_OCSP, http: HTTP::Info)
if ( |http$uri_prefix| > 0)
ocsp$ocsp_uri = "";
if ( http?$host )
ocsp$ocsp_uri = http$host;
ocsp$ocsp_uri = host_str;
if ( |http$uri_prefix| > 0)
ocsp$ocsp_uri += http$uri_prefix;
}