From: Mike Stepanek (mstepane) Date: Wed, 13 Mar 2019 16:58:55 +0000 (-0400) Subject: Merge pull request #1546 in SNORT/snort3 from ~SMINUT/snort3:appid_cppcheck_fix to... X-Git-Tag: 3.0.0-251~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d153a5fe0ae7d68c6adf2b570dda3abf0e11044;p=thirdparty%2Fsnort3.git Merge pull request #1546 in SNORT/snort3 from ~SMINUT/snort3:appid_cppcheck_fix to master Squashed commit of the following: commit 3bc591783eec49228ab734db71c0dc84e9e9d208 Author: Silviu Minut Date: Wed Mar 13 11:46:32 2019 -0400 appid: keep cppcheck happy. appid: rename some global variables in http_url_patterns_test.cc to suppress cppcheck messages. appid: more cppcheck clean-up. --- diff --git a/src/network_inspectors/appid/appid_discovery.cc b/src/network_inspectors/appid/appid_discovery.cc index 5f4284b5a..0f967d3ee 100644 --- a/src/network_inspectors/appid/appid_discovery.cc +++ b/src/network_inspectors/appid/appid_discovery.cc @@ -536,7 +536,7 @@ static uint64_t is_session_monitored(AppIdSession& asd, const Packet* p, AppidSe static uint64_t is_session_monitored(const Packet* p, AppidSessionDirection dir, AppIdInspector& inspector) { - uint64_t flags = 0; + uint64_t flags; uint64_t flow_flags = APPID_SESSION_DISCOVER_APP; if ( check_port_exclusion(p, false, inspector) ) @@ -1046,4 +1046,3 @@ void AppIdDiscovery::do_post_discovery(Packet* p, AppIdSession& asd, asd.pick_misc_app_id(), change_bits); publish_appid_event(change_bits, p->flow); } - diff --git a/src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc b/src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc index b5aeeef4e..07f4047ee 100644 --- a/src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc +++ b/src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc @@ -41,9 +41,9 @@ static AppIdModule appid_mod; static AppIdInspector appid_inspector(appid_mod); static AppIdSession session(IpProtocol::IP, sfip, 0, appid_inspector); static AppIdHttpSession hsession(session); -static ChpMatchDescriptor cmd; +static ChpMatchDescriptor cmd_test; static MatchedCHPAction mchp; -static CHPAction chpa; +static CHPAction chpa_test; static char* version = nullptr; static char* user = nullptr; static char* my_action_data = (char*)"0"; @@ -240,32 +240,32 @@ TEST(http_url_patterns_tests, normalize_userid) TEST(http_url_patterns_tests, scan_header_x_working_with) { // appid is APP_ID_ASPROXY - char* version = snort_strdup("456"); + char* loc_version = snort_strdup("456"); const char* data = "ASProxy/123"; - CHECK(hm->scan_header_x_working_with(data, (uint32_t)strlen(data), (char**)&version) == + CHECK(hm->scan_header_x_working_with(data, (uint32_t)strlen(data), (char**)&loc_version) == APP_ID_ASPROXY); - STRCMP_EQUAL(version, "123"); - snort_free(version); - version = nullptr; + STRCMP_EQUAL(loc_version, "123"); + snort_free(loc_version); + loc_version = nullptr; // appid is APP_ID_NONE const char* data2 = "Not ASProxy format"; - CHECK(hm->scan_header_x_working_with(data2, (uint32_t)strlen(data2), (char**)&version) == + CHECK(hm->scan_header_x_working_with(data2, (uint32_t)strlen(data2), (char**)&loc_version) == APP_ID_NONE); - CHECK(version == nullptr); + CHECK(loc_version == nullptr); } TEST(http_url_patterns_tests, scan_chp_defer) { // testing DEFER_TO_SIMPLE_DETECT test_find_all_done = false; - chpa.appIdInstance = APP_ID_NONE; - chpa.action = DEFER_TO_SIMPLE_DETECT; - mchp.mpattern = &chpa; - cmd.chp_matches[RSP_BODY_FID].emplace_back(mchp); - cmd.cur_ptype = RSP_BODY_FID; + chpa_test.appIdInstance = APP_ID_NONE; + chpa_test.action = DEFER_TO_SIMPLE_DETECT; + mchp.mpattern = &chpa_test; + cmd_test.chp_matches[RSP_BODY_FID].emplace_back(mchp); + cmd_test.cur_ptype = RSP_BODY_FID; mod_config.safe_search_enabled = false; - CHECK(hm->scan_chp(cmd, &version, &user, &total_found, &hsession, (const + CHECK(hm->scan_chp(cmd_test, &version, &user, &total_found, &hsession, (const AppIdModuleConfig*)&mod_config) == APP_ID_NONE); CHECK_EQUAL(true, test_find_all_done); } @@ -274,14 +274,14 @@ TEST(http_url_patterns_tests, scan_chp_alt_appid) { // testing ALTERNATE_APPID test_find_all_done = false; - chpa.action_data = my_action_data; - chpa.appIdInstance = APP_ID_NONE; - chpa.action = ALTERNATE_APPID; - mchp.mpattern = &chpa; - cmd.chp_matches[RSP_BODY_FID].emplace_back(mchp); - cmd.cur_ptype = RSP_BODY_FID; + chpa_test.action_data = my_action_data; + chpa_test.appIdInstance = APP_ID_NONE; + chpa_test.action = ALTERNATE_APPID; + mchp.mpattern = &chpa_test; + cmd_test.chp_matches[RSP_BODY_FID].emplace_back(mchp); + cmd_test.cur_ptype = RSP_BODY_FID; mod_config.safe_search_enabled = false; - CHECK(hm->scan_chp(cmd, &version, &user, &total_found, &hsession, (const + CHECK(hm->scan_chp(cmd_test, &version, &user, &total_found, &hsession, (const AppIdModuleConfig*)&mod_config) == APP_ID_NONE); CHECK_EQUAL(true, test_find_all_done); } @@ -290,18 +290,18 @@ TEST(http_url_patterns_tests, scan_chp_extract_user) { // testing EXTRACT_USER test_find_all_done = false; - chpa.action_data = my_action_data; - chpa.appIdInstance = APP_ID_NONE; - chpa.action = EXTRACT_USER; - chpa.psize = 1; - mchp.mpattern = &chpa; + chpa_test.action_data = my_action_data; + chpa_test.appIdInstance = APP_ID_NONE; + chpa_test.action = EXTRACT_USER; + chpa_test.psize = 1; + mchp.mpattern = &chpa_test; mchp.start_match_pos = 0; - cmd.cur_ptype = RSP_BODY_FID; + cmd_test.cur_ptype = RSP_BODY_FID; mod_config.safe_search_enabled = false; - cmd.chp_matches[RSP_BODY_FID].emplace_back(mchp); - cmd.buffer[RSP_BODY_FID] = (const char*)"userid\n\rpassword"; - cmd.length[RSP_BODY_FID] = strlen(cmd.buffer[RSP_BODY_FID]); - CHECK(hm->scan_chp(cmd, &version, &user, &total_found, &hsession, (const + cmd_test.chp_matches[RSP_BODY_FID].emplace_back(mchp); + cmd_test.buffer[RSP_BODY_FID] = (const char*)"userid\n\rpassword"; + cmd_test.length[RSP_BODY_FID] = strlen(cmd_test.buffer[RSP_BODY_FID]); + CHECK(hm->scan_chp(cmd_test, &version, &user, &total_found, &hsession, (const AppIdModuleConfig*)&mod_config) == APP_ID_NONE); CHECK_EQUAL(true, test_find_all_done); snort_free(user); @@ -312,95 +312,95 @@ TEST(http_url_patterns_tests, scan_chp_rewrite_field) { // testing REWRITE_FIELD test_find_all_done = false; - cmd.cur_ptype = RSP_BODY_FID; + cmd_test.cur_ptype = RSP_BODY_FID; mod_config.safe_search_enabled = false; - chpa.action_data = my_action_data; - chpa.appIdInstance = APP_ID_NONE; - chpa.action = REWRITE_FIELD; - chpa.psize = 1; - mchp.mpattern = &chpa; + chpa_test.action_data = my_action_data; + chpa_test.appIdInstance = APP_ID_NONE; + chpa_test.action = REWRITE_FIELD; + chpa_test.psize = 1; + mchp.mpattern = &chpa_test; mchp.start_match_pos = 0; - cmd.chp_matches[RSP_BODY_FID].emplace_back(mchp); - cmd.buffer[RSP_BODY_FID] = my_chp_data; - cmd.length[RSP_BODY_FID] = strlen(cmd.buffer[RSP_BODY_FID]); - CHECK(hm->scan_chp(cmd, &version, &user, &total_found, &hsession, (const + cmd_test.chp_matches[RSP_BODY_FID].emplace_back(mchp); + cmd_test.buffer[RSP_BODY_FID] = my_chp_data; + cmd_test.length[RSP_BODY_FID] = strlen(cmd_test.buffer[RSP_BODY_FID]); + CHECK(hm->scan_chp(cmd_test, &version, &user, &total_found, &hsession, (const AppIdModuleConfig*)&mod_config) == APP_ID_NONE); CHECK_EQUAL(true, test_find_all_done); - snort_free(const_cast(cmd.chp_rewritten[RSP_BODY_FID])); - cmd.chp_rewritten[RSP_BODY_FID] = nullptr; + snort_free(const_cast(cmd_test.chp_rewritten[RSP_BODY_FID])); + cmd_test.chp_rewritten[RSP_BODY_FID] = nullptr; } TEST(http_url_patterns_tests, scan_chp_insert_without_action) { // testing INSERT_FIELD without action_data test_find_all_done = false; - cmd.cur_ptype = RSP_BODY_FID; + cmd_test.cur_ptype = RSP_BODY_FID; mod_config.safe_search_enabled = false; - chpa.action_data = nullptr; - chpa.appIdInstance = APP_ID_NONE; - chpa.action = INSERT_FIELD; - chpa.psize = 1; - mchp.mpattern = &chpa; + chpa_test.action_data = nullptr; + chpa_test.appIdInstance = APP_ID_NONE; + chpa_test.action = INSERT_FIELD; + chpa_test.psize = 1; + mchp.mpattern = &chpa_test; mchp.start_match_pos = 0; - cmd.chp_matches[RSP_BODY_FID].emplace_back(mchp); - cmd.buffer[RSP_BODY_FID] = my_chp_data; - cmd.length[RSP_BODY_FID] = strlen(cmd.buffer[RSP_BODY_FID]); - CHECK(hm->scan_chp(cmd, &version, &user, &total_found, &hsession, (const + cmd_test.chp_matches[RSP_BODY_FID].emplace_back(mchp); + cmd_test.buffer[RSP_BODY_FID] = my_chp_data; + cmd_test.length[RSP_BODY_FID] = strlen(cmd_test.buffer[RSP_BODY_FID]); + CHECK(hm->scan_chp(cmd_test, &version, &user, &total_found, &hsession, (const AppIdModuleConfig*)&mod_config) == APP_ID_NONE); CHECK_EQUAL(true, test_find_all_done); - snort_free(const_cast(cmd.chp_rewritten[RSP_BODY_FID])); - cmd.chp_rewritten[RSP_BODY_FID] = nullptr; + snort_free(const_cast(cmd_test.chp_rewritten[RSP_BODY_FID])); + cmd_test.chp_rewritten[RSP_BODY_FID] = nullptr; } TEST(http_url_patterns_tests, scan_chp_insert_with_action) { // testing INSERT_FIELD with action_data test_find_all_done = false; - cmd.cur_ptype = RSP_BODY_FID; + cmd_test.cur_ptype = RSP_BODY_FID; mod_config.safe_search_enabled = false; - chpa.action_data = my_action_data; - chpa.appIdInstance = APP_ID_NONE; - chpa.action = INSERT_FIELD; - chpa.psize = 1; - mchp.mpattern = &chpa; + chpa_test.action_data = my_action_data; + chpa_test.appIdInstance = APP_ID_NONE; + chpa_test.action = INSERT_FIELD; + chpa_test.psize = 1; + mchp.mpattern = &chpa_test; mchp.start_match_pos = 0; - cmd.chp_matches[RSP_BODY_FID].emplace_back(mchp); - cmd.buffer[RSP_BODY_FID] = my_chp_data; - cmd.length[RSP_BODY_FID] = strlen(cmd.buffer[RSP_BODY_FID]); - CHECK(hm->scan_chp(cmd, &version, &user, &total_found, &hsession, (const + cmd_test.chp_matches[RSP_BODY_FID].emplace_back(mchp); + cmd_test.buffer[RSP_BODY_FID] = my_chp_data; + cmd_test.length[RSP_BODY_FID] = strlen(cmd_test.buffer[RSP_BODY_FID]); + CHECK(hm->scan_chp(cmd_test, &version, &user, &total_found, &hsession, (const AppIdModuleConfig*)&mod_config) == APP_ID_NONE); CHECK_EQUAL(true, test_find_all_done); - snort_free(const_cast(cmd.chp_rewritten[RSP_BODY_FID])); - cmd.chp_rewritten[RSP_BODY_FID] = nullptr; + snort_free(const_cast(cmd_test.chp_rewritten[RSP_BODY_FID])); + cmd_test.chp_rewritten[RSP_BODY_FID] = nullptr; } TEST(http_url_patterns_tests, scan_chp_hold_and_default) { // testing HOLD_FLOW test_find_all_done = false; - chpa.action_data = my_action_data; - chpa.appIdInstance = APP_ID_NONE; - chpa.action = HOLD_FLOW; - mchp.mpattern = &chpa; - cmd.chp_matches[RSP_BODY_FID].emplace_back(mchp); - cmd.cur_ptype = RSP_BODY_FID; + chpa_test.action_data = my_action_data; + chpa_test.appIdInstance = APP_ID_NONE; + chpa_test.action = HOLD_FLOW; + mchp.mpattern = &chpa_test; + cmd_test.chp_matches[RSP_BODY_FID].emplace_back(mchp); + cmd_test.cur_ptype = RSP_BODY_FID; mod_config.safe_search_enabled = false; - chpa.psize = 1; + chpa_test.psize = 1; mchp.start_match_pos = 0; - cmd.buffer[RSP_BODY_FID] = my_chp_data; - cmd.length[RSP_BODY_FID] = strlen(cmd.buffer[RSP_BODY_FID]); - CHECK(hm->scan_chp(cmd, &version, &user, &total_found, &hsession, (const + cmd_test.buffer[RSP_BODY_FID] = my_chp_data; + cmd_test.length[RSP_BODY_FID] = strlen(cmd_test.buffer[RSP_BODY_FID]); + CHECK(hm->scan_chp(cmd_test, &version, &user, &total_found, &hsession, (const AppIdModuleConfig*)&mod_config) == APP_ID_NONE); CHECK_EQUAL(true, test_find_all_done); // testing FUTURE_APPID_SESSION_SIP (default action) test_find_all_done = false; - chpa.action_data = my_action_data; - chpa.appIdInstance = APP_ID_NONE; - chpa.action = FUTURE_APPID_SESSION_SIP; - mchp.mpattern = &chpa; - cmd.chp_matches[RSP_BODY_FID].emplace_back(mchp); - CHECK(hm->scan_chp(cmd, &version, &user, &total_found, &hsession, (const + chpa_test.action_data = my_action_data; + chpa_test.appIdInstance = APP_ID_NONE; + chpa_test.action = FUTURE_APPID_SESSION_SIP; + mchp.mpattern = &chpa_test; + cmd_test.chp_matches[RSP_BODY_FID].emplace_back(mchp); + CHECK(hm->scan_chp(cmd_test, &version, &user, &total_found, &hsession, (const AppIdModuleConfig*)&mod_config) == APP_ID_NONE); CHECK_EQUAL(true, test_find_all_done); } @@ -707,4 +707,3 @@ int main(int argc, char** argv) int return_value = CommandLineTestRunner::RunAllTests(argc, argv); return return_value; } - diff --git a/src/network_inspectors/appid/test/appid_api_test.cc b/src/network_inspectors/appid/test/appid_api_test.cc index 6f1cc8d53..23dff4411 100644 --- a/src/network_inspectors/appid/test/appid_api_test.cc +++ b/src/network_inspectors/appid/test/appid_api_test.cc @@ -55,8 +55,6 @@ AppId AppInfoManager::get_appid_by_name(const char*) return APPID_UT_ID; } -AppInfoManager& app_info_mgr = AppInfoManager::get_instance(); - Flow* flow = nullptr; AppIdSession* mock_session = nullptr; @@ -180,4 +178,3 @@ int main(int argc, char** argv) mock_cleanup_appid_pegs(); return rc; } - diff --git a/src/network_inspectors/appid/test/appid_mock_http_session.h b/src/network_inspectors/appid/test/appid_mock_http_session.h index c567c8832..5c58516ac 100644 --- a/src/network_inspectors/appid/test/appid_mock_http_session.h +++ b/src/network_inspectors/appid/test/appid_mock_http_session.h @@ -67,13 +67,13 @@ char const* RSP_BODY = "this is the body of the http response"; void AppIdHttpSession::update_url(AppidChangeBits&) { - const std::string* host = meta_data[REQ_HOST_FID]; - const std::string* uri = meta_data[REQ_URI_FID]; - if (host and uri) + const std::string* host_test = meta_data[REQ_HOST_FID]; + const std::string* uri_test = meta_data[REQ_URI_FID]; + if (host_test and uri_test) { if (meta_data[MISC_URL_FID]) delete meta_data[MISC_URL_FID]; - meta_data[MISC_URL_FID] = new std::string(std::string("http://") + *host + *uri); + meta_data[MISC_URL_FID] = new std::string(std::string("http://") + *host_test + *uri_test); } } @@ -126,4 +126,3 @@ public: }; #endif - diff --git a/src/network_inspectors/appid/test/tp_lib_handler_test.cc b/src/network_inspectors/appid/test/tp_lib_handler_test.cc index 5b8213158..ee4c51be8 100644 --- a/src/network_inspectors/appid/test/tp_lib_handler_test.cc +++ b/src/network_inspectors/appid/test/tp_lib_handler_test.cc @@ -38,7 +38,6 @@ using namespace std; TPLibHandler* tph = nullptr; -AppIdModuleConfig config; AppIdModuleConfig::~AppIdModuleConfig() { } @@ -48,6 +47,10 @@ TEST_GROUP(tp_lib_handler) TEST(tp_lib_handler, load_unload) { + AppIdModuleConfig config; + config.tp_appid_path="./libtp_mock.so"; + config.tp_appid_config="./tp.config"; + tph = TPLibHandler::get(); tph->pinit(&config); CHECK_TRUE(tph->have_tp()); @@ -95,11 +98,7 @@ TEST(tp_lib_handler, tp_appid_module_pinit_error) int main(int argc, char** argv) { - config.tp_appid_path="./libtp_mock.so"; - config.tp_appid_config="./tp.config"; - int rc = CommandLineTestRunner::RunAllTests(argc, argv); return rc; } -