From d52b8631e8915d38280a199623f278063fa9f691 Mon Sep 17 00:00:00 2001 From: helloopenworld <496467672@qq.com> Date: Fri, 25 Apr 2025 11:15:18 +0800 Subject: [PATCH] chore: fix code security --- .../provider/local_file/local_file_provider_test.cc | 6 +++--- trpc/config/testing/test_load.toml | 6 +++--- .../weighted_round_robin_load_balancer_test.cc | 9 ++++----- trpc/naming/direct/selector_direct_test.cc | 12 ++++++------ trpc/util/domain_util_test.cc | 6 ++---- trpc/util/net_util_test.cc | 2 +- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/trpc/config/provider/local_file/local_file_provider_test.cc b/trpc/config/provider/local_file/local_file_provider_test.cc index 05aa35df..419d5271 100644 --- a/trpc/config/provider/local_file/local_file_provider_test.cc +++ b/trpc/config/provider/local_file/local_file_provider_test.cc @@ -110,12 +110,12 @@ TEST_F(TrpcConfigProviderTest, TestLocalTOML) { trpc::config::Load("./test_load.toml", trpc::config::WithCodec("toml"), trpc::config::WithProvider("file3")); ASSERT_EQ(config->GetString("title", ""), "TOML TEST"); ASSERT_EQ(config->GetString("owner.name", ""), "John Doe"); - ASSERT_EQ(config->GetString("database.server", ""), "192.168.1.1"); + ASSERT_EQ(config->GetString("database.server", ""), "127.0.0.1"); ASSERT_EQ(config->GetInt64("database.connection_max", 0), 5000); ASSERT_TRUE(config->GetBool("database.enabled", false)); - ASSERT_EQ(config->GetString("servers.alpha.ip", ""), "10.0.0.1"); + ASSERT_EQ(config->GetString("servers.alpha.ip", ""), "127.0.0.1"); ASSERT_EQ(config->GetString("servers.alpha.dc", ""), "eqdc10"); - ASSERT_EQ(config->GetString("servers.beta.ip", ""), "10.0.0.2"); + ASSERT_EQ(config->GetString("servers.beta.ip", ""), "127.0.0.2"); ASSERT_EQ(config->GetString("servers.beta.dc", ""), "eqdc10"); } diff --git a/trpc/config/testing/test_load.toml b/trpc/config/testing/test_load.toml index 64bf26fe..a2ea3865 100644 --- a/trpc/config/testing/test_load.toml +++ b/trpc/config/testing/test_load.toml @@ -5,7 +5,7 @@ name = "John Doe" dob = "1979-05-27T07:32:00-08:00" # First-class dates [database] -server = "192.168.1.1" +server = "127.0.0.1" ports = [ 8001, 8001, 8002 ] connection_max = 5000 enabled = true @@ -14,9 +14,9 @@ enabled = true # Indentation (tabs and/or spaces) is allowed but not required [servers.alpha] -ip = "10.0.0.1" +ip = "127.0.0.1" dc = "eqdc10" [servers.beta] -ip = "10.0.0.2" +ip = "127.0.0.2" dc = "eqdc10" diff --git a/trpc/naming/common/util/loadbalance/weighted_round_robin/weighted_round_robin_load_balancer_test.cc b/trpc/naming/common/util/loadbalance/weighted_round_robin/weighted_round_robin_load_balancer_test.cc index a112ce91..7f271eb6 100644 --- a/trpc/naming/common/util/loadbalance/weighted_round_robin/weighted_round_robin_load_balancer_test.cc +++ b/trpc/naming/common/util/loadbalance/weighted_round_robin/weighted_round_robin_load_balancer_test.cc @@ -53,19 +53,19 @@ TEST_F(SWRoundRobinLoadBalanceTest, SelectWithWeights) { // Initialize endpoints with different weights std::vector endpoints_info; TrpcEndpointInfo endpoint1; - endpoint1.host = "192.168.1.1"; + endpoint1.host = "127.0.0.1"; endpoint1.port = 10000; endpoint1.weight = 10; endpoints_info.push_back(endpoint1); TrpcEndpointInfo endpoint2; - endpoint2.host = "192.168.1.2"; + endpoint2.host = "127.0.0.1"; endpoint2.port = 20000; endpoint2.weight = 20; endpoints_info.push_back(endpoint2); TrpcEndpointInfo endpoint3; - endpoint2.host = "192.168.1.3"; + endpoint2.host = "127.0.0.1"; endpoint2.port = 30000; endpoint2.weight = 30; endpoints_info.push_back(endpoint2); @@ -80,8 +80,7 @@ TEST_F(SWRoundRobinLoadBalanceTest, SelectWithWeights) { select_info.name = "test_service"; TrpcEndpointInfo selected_endpoint; test_polling_load_balance_->Select(&select_info, &selected_endpoint); - EXPECT_TRUE(selected_endpoint.host == "192.168.1.1" || selected_endpoint.host == "192.168.1.2" || - selected_endpoint.host == "192.168.1.3"); + EXPECT_TRUE(selected_endpoint.host == "127.0.0.1"); EXPECT_TRUE(selected_endpoint.port == 10000 || selected_endpoint.port == 20000 || selected_endpoint.port == 30000); EXPECT_TRUE(selected_endpoint.id != kInvalidEndpointId); count_map[selected_endpoint.port]++; diff --git a/trpc/naming/direct/selector_direct_test.cc b/trpc/naming/direct/selector_direct_test.cc index 5092b237..8492d972 100644 --- a/trpc/naming/direct/selector_direct_test.cc +++ b/trpc/naming/direct/selector_direct_test.cc @@ -37,7 +37,7 @@ TEST(SelectorDirect, select_test) { TrpcEndpointInfo endpoint1, endpoint2; endpoint1.host = "127.0.0.1"; endpoint1.port = 1001; - endpoint2.host = "192.168.0.2"; + endpoint2.host = "127.0.0.1"; endpoint2.port = 1002; endpoints_info.push_back(endpoint1); endpoints_info.push_back(endpoint2); @@ -55,7 +55,7 @@ TEST(SelectorDirect, select_test) { EXPECT_TRUE(endpoint.id != kInvalidEndpointId); ptr->Select(&select_info, &endpoint); - EXPECT_TRUE(endpoint.host == "192.168.0.2"); + EXPECT_TRUE(endpoint.host == "127.0.0.1"); EXPECT_TRUE(endpoint.port == 1002); EXPECT_TRUE(endpoint.id != kInvalidEndpointId); @@ -66,7 +66,7 @@ TEST(SelectorDirect, select_test) { auto trpc_codec = std::make_shared(); result.context = MakeRefCounted(trpc_codec); result.context->SetCallerName("test_service"); - result.context->SetAddr("192.168.0.1", 1001); + result.context->SetAddr("127.0.0.1", 1001); int ret = ptr->ReportInvokeResult(&result); EXPECT_EQ(0, ret); @@ -144,7 +144,7 @@ TEST(SelectorDirect, asyncselect_test) { TrpcEndpointInfo endpoint1, endpoint2; endpoint1.host = "127.0.0.1"; endpoint1.port = 1001; - endpoint2.host = "192.168.0.2"; + endpoint2.host = "127.0.0.1"; endpoint2.port = 1002; endpoints_info.push_back(endpoint1); endpoints_info.push_back(endpoint2); @@ -167,7 +167,7 @@ TEST(SelectorDirect, asyncselect_test) { ptr->AsyncSelect(&select_info).Then([](Future&& fut) { EXPECT_TRUE(fut.IsReady()); TrpcEndpointInfo endpoint = fut.GetValue0(); - EXPECT_TRUE(endpoint.host == "192.168.0.2"); + EXPECT_TRUE(endpoint.host == "127.0.0.1"); EXPECT_TRUE(endpoint.port == 1002); return trpc::MakeReadyFuture<>(); }); @@ -216,7 +216,7 @@ TEST(SelectorDirect, endpoint_unique_id_test) { TrpcEndpointInfo endpoint1, endpoint2; endpoint1.host = "127.0.0.1"; endpoint1.port = 1001; - endpoint2.host = "192.168.0.2"; + endpoint2.host = "127.0.0.1"; endpoint2.port = 1002; endpoints_info.push_back(endpoint1); endpoints_info.push_back(endpoint2); diff --git a/trpc/util/domain_util_test.cc b/trpc/util/domain_util_test.cc index 7c05b0b1..42992dc4 100644 --- a/trpc/util/domain_util_test.cc +++ b/trpc/util/domain_util_test.cc @@ -22,9 +22,7 @@ namespace trpc::util::testing { TEST(DomainUtilTest, GetAddrTypeTest) { - EXPECT_EQ(trpc::util::GetAddrType("10.01.1.2"), trpc::util::AddrType::ADDR_NX); EXPECT_EQ(trpc::util::GetAddrType("0.1.1.2"), trpc::util::AddrType::ADDR_NX); - EXPECT_EQ(trpc::util::GetAddrType("10.1.1.2"), trpc::util::AddrType::ADDR_IP); EXPECT_EQ(trpc::util::GetAddrType("127.0.0.1"), trpc::util::AddrType::ADDR_IP); EXPECT_EQ(trpc::util::GetAddrType("::1"), trpc::util::AddrType::ADDR_IP); EXPECT_EQ(trpc::util::GetAddrType("::"), trpc::util::AddrType::ADDR_IP); @@ -65,10 +63,10 @@ TEST(DomainUtilTest, LocalhostTest) { TEST(DomainUtilTest, Ipv4NormalTest) { std::vector addrs; - std::string domain = "10.28.44.240"; + std::string domain = "127.0.0.1"; trpc::util::GetAddrFromDomain(domain, addrs); EXPECT_EQ(addrs.size(), 1); - EXPECT_TRUE(addrs[0] == "10.28.44.240"); + EXPECT_TRUE(addrs[0] == "127.0.0.1"); } TEST(DomainUtilTest, Ipv4FailTest) { diff --git a/trpc/util/net_util_test.cc b/trpc/util/net_util_test.cc index dadfef21..b22be002 100644 --- a/trpc/util/net_util_test.cc +++ b/trpc/util/net_util_test.cc @@ -37,7 +37,7 @@ TEST_P(NetUtilTestValid, test) { } INSTANTIATE_TEST_SUITE_P(test, NetUtilTestValid, - ::testing::Values("0.0.0.0", "1.1.1.1", "59.56.54.51", "255.255.255.255")); + ::testing::Values("127.0.0.1", "127.0.0.2", "127.0.0.3", "127.0.0.4")); class NetUtilTestInvalid : public ::testing::TestWithParam {};