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

log original uri and fix GET url parsing

Browse source
This commit is contained in:
Liang Zhu 2015-07-18 01:06:31 -07:00
parent 6c9b49a5d7
commit 0c3b03ac8d
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/base/files/ocsp/main.bro
View file

@ -176,7 +176,7 @@ function update_http_info(http: HTTP::Info, req_rec: OCSP::Info_req)
function enq_request(http: HTTP::Info, req: OCSP::Request, req_id: string, req_ts: time) function enq_request(http: HTTP::Info, req: OCSP::Request, req_id: string, req_ts: time)
{ {
local index: count = 0; local index: count = 0;
if (req?$requestList) if ( req?$requestList && |req$requestList| > 0 )
{ {
index += 1; index += 1;
for (x in req$requestList) for (x in req$requestList)
@ -271,6 +271,20 @@ function check_ocsp_request_uri(http: HTTP::Info): OCSP::Request
local uri_prefix: string = get_uri_prefix(http$original_uri); local uri_prefix: string = get_uri_prefix(http$original_uri);
local ocsp_req_str: string = http$uri[|uri_prefix|:]; local ocsp_req_str: string = http$uri[|uri_prefix|:];
parsed_req = ocsp_parse_request(decode_base64(ocsp_req_str)); parsed_req = ocsp_parse_request(decode_base64(ocsp_req_str));
if ( ! parsed_req?$requestList || |parsed_req$requestList| == 0 )
{
# normal parse fails, bug url, natively try each part
local w = split_string(http$original_uri, /\//);
local s = "";
for ( i in w )
{
s += "/" + w[i];
ocsp_req_str = http$uri[|s|:];
parsed_req = ocsp_parse_request(decode_base64(ocsp_req_str));
if ( parsed_req?$requestList && |parsed_req$requestList| > 0 )
break;
}
}
return parsed_req; return parsed_req;
} }
@ -279,7 +293,7 @@ event ocsp_response(f: fa_file, resp_ref: opaque of ocsp_resp, resp: OCSP::Respo
if ( ! f?$http ) if ( ! f?$http )
return; return;
if (resp?$responses) if ( resp?$responses && |resp$responses| > 0 )
{ {
local index: count = 0; local index: count = 0;
for (x in resp$responses) for (x in resp$responses)

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

@ -76,6 +76,9 @@ export {
## HTTP request may contain several OCSP requests; ## HTTP request may contain several OCSP requests;
## this is copied from connection ## this is copied from connection
num_ocsp: count &log &optional; num_ocsp: count &log &optional;
## the original_uri in HTTP request
original_uri: string &log &optional;
}; };
type Issuer_Name_Type: record { type Issuer_Name_Type: record {
@ -342,6 +345,9 @@ function update_http_info(ocsp: OCSP_SSL_SPLIT::Info_OCSP, http: HTTP::Info)
if ( http?$method ) if ( http?$method )
ocsp$method = http$method; ocsp$method = http$method;
if ( http?$original_uri )
ocsp$original_uri = http$original_uri;
if ( http?$host ) if ( http?$host )
ocsp$ocsp_uri = http$host; ocsp$ocsp_uri = http$host;