diff options
Diffstat (limited to 'src/httpscan.cc')
| -rw-r--r-- | src/httpscan.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/httpscan.cc b/src/httpscan.cc index 8f3a20c..991d6c9 100644 --- a/src/httpscan.cc +++ b/src/httpscan.cc @@ -134,7 +134,8 @@ void HttpScanSession::ScanRequestHeader(HttpSession * http_session_ctx) /* 扫描IP地址 */ nr_maat_scan_result_ = Maat_scan_addr(httpscan_module_ref_.maat_feather_ref, httpscan_module_ref_.table_id_ctrl_ip, sapp_tuple4_ptr.get(), - maat_scan_result_, MAAT_SCAN_RESULT_, &maat_scan_mid_, 0); + maat_scan_result_, MAAT_SCAN_RESULT_, + &maat_scan_mid_, tfe_thread_current_thread_id()); /* 以下所有扫描命中后，配置callback tag为repeat，在本函数返回后，再次调用RequestHeader处理回调 * 函数，执行命中动作 */ @@ -153,7 +154,8 @@ void HttpScanSession::ScanRequestHeader(HttpSession * http_session_ctx) nr_maat_scan_result_ = Maat_full_scan_string(httpscan_module_ref_.maat_feather_ref, httpscan_module_ref_.table_id_ctrl_http_url, CHARSET_UTF8, __url.c_str(), (int) __url.length(), - maat_scan_result_, dummy, MAAT_SCAN_RESULT_, &maat_scan_mid_, 0); + maat_scan_result_, dummy, MAAT_SCAN_RESULT_, + &maat_scan_mid_, tfe_thread_current_thread_id()); if (nr_maat_scan_result_ > 0) { @@ -184,7 +186,8 @@ void HttpScanSession::ScanRequestHeader(HttpSession * http_session_ctx) nr_maat_scan_result_ = Maat_full_scan_string(httpscan_module_ref_.maat_feather_ref, httpscan_module_ref_.table_id_ctrl_http_req_hdr, MAAT_DEFAULT_CHARSET_, - value.c_str(), (int) value.length(), maat_scan_result_, __dummy, MAAT_SCAN_RESULT_, &maat_scan_mid_, 0); + value.c_str(), (int) value.length(), maat_scan_result_, __dummy, MAAT_SCAN_RESULT_, + &maat_scan_mid_, tfe_thread_current_thread_id()); if (nr_maat_scan_result_ > 0) { @@ -215,7 +218,7 @@ void HttpScanSession::ScanRequestBody(HttpSession * http_session_ctx) nr_maat_scan_result_ = Maat_full_scan_string(httpscan_module_ref_.maat_feather_ref, httpscan_module_ref_.table_id_ctrl_http_req_body, CHARSET_UTF8, body_content_raw, (int) body_content_length, - maat_scan_result_, __dummy, MAAT_SCAN_RESULT_, &maat_scan_mid_, 0); + maat_scan_result_, __dummy, MAAT_SCAN_RESULT_, &maat_scan_mid_, tfe_thread_current_thread_id()); if (nr_maat_scan_result_ > 0) { @@ -311,7 +314,7 @@ HttpScanSession::scan_result_t HttpScanSession::scan_headers(const HttpHeaders & nr_maat_scan_result_ = Maat_full_scan_string(httpscan_module_ref_.maat_feather_ref, table_id, MAAT_DEFAULT_CHARSET_, value.c_str(), (int) value.length(), maat_scan_result_, __dummy, - MAAT_SCAN_RESULT_, &maat_scan_mid_, 0); + MAAT_SCAN_RESULT_, &maat_scan_mid_, tfe_thread_current_thread_id()); if (nr_maat_scan_result_ > 0) { @@ -336,7 +339,8 @@ HttpScanSession::scan_result_t HttpScanSession::scan_body(const char * data, siz int __dummy[MAAT_SCAN_RESULT_]; nr_maat_scan_result_ = Maat_full_scan_string(httpscan_module_ref_.maat_feather_ref, - table_id, CHARSET_UTF8, data, (int) len, maat_scan_result_, __dummy, MAAT_SCAN_RESULT_, &maat_scan_mid_, 0); + table_id, CHARSET_UTF8, data, (int) len, maat_scan_result_, __dummy, MAAT_SCAN_RESULT_, + &maat_scan_mid_, tfe_thread_current_thread_id()); if (nr_maat_scan_result_ > 0) return scan_result_t::kScanResultHit; @@ -357,7 +361,7 @@ HttpScanSession::scan_result_t HttpScanSession::scan_bypass_content_type(const H content_type = value; return false; }); - if (content_type.find("text") == 0) + if (content_type.find("text") != 0) { return scan_result_t::kScanResultHit; } |