From: Thomas Markwalder Date: Wed, 18 Jun 2025 13:26:00 +0000 (-0400) Subject: [#3848] Replace WARN with WARNING some more X-Git-Tag: Kea-3.1.0~60 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d8eb27b3fa2fdde61da5a879176e1cefbca9f628;p=thirdparty%2Fkea.git [#3848] Replace WARN with WARNING some more --- diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc index cb054b1f50..616ade80c6 100644 --- a/src/bin/dhcp4/main.cc +++ b/src/bin/dhcp4/main.cc @@ -247,7 +247,7 @@ main(int argc, char* argv[]) { } if (amRunningAsRoot()) { - LOG_WARN(dhcp4_logger, DHCP4_ROOT_USER_SECURITY_WARN); + LOG_WARN(dhcp4_logger, DHCP4_ROOT_USER_SECURITY_WARNING); } if (!PathChecker::shouldEnforceSecurity()) { diff --git a/src/bin/dhcp6/main.cc b/src/bin/dhcp6/main.cc index de519ba46a..b231f46bb9 100644 --- a/src/bin/dhcp6/main.cc +++ b/src/bin/dhcp6/main.cc @@ -247,7 +247,7 @@ main(int argc, char* argv[]) { } if (amRunningAsRoot()) { - LOG_WARN(dhcp6_logger, DHCP6_ROOT_USER_SECURITY_WARN); + LOG_WARN(dhcp6_logger, DHCP6_ROOT_USER_SECURITY_WARNING); } if (!PathChecker::shouldEnforceSecurity()) { diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc index 5d0b546c70..389cb40978 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc @@ -2758,7 +2758,7 @@ LeaseCmdsImpl::leaseWriteHandler(CalloutHandle& handle) { try { filename = CfgMgr::instance().validatePath(file->stringValue()); } catch (const SecurityWarn& ex) { - LOG_WARN(lease_cmds_logger, LEASE_CMDS_PATH_SECURITY_WARN) + LOG_WARN(lease_cmds_logger, LEASE_CMDS_PATH_SECURITY_WARNING) .arg(ex.what()); filename = file->stringValue(); } catch (const std::exception& ex) { diff --git a/src/hooks/dhcp/lease_cmds/libloadtests/lease_cmds4_unittest.cc b/src/hooks/dhcp/lease_cmds/libloadtests/lease_cmds4_unittest.cc index 90add86533..a4fb0a61d3 100644 --- a/src/hooks/dhcp/lease_cmds/libloadtests/lease_cmds4_unittest.cc +++ b/src/hooks/dhcp/lease_cmds/libloadtests/lease_cmds4_unittest.cc @@ -3520,7 +3520,7 @@ void Lease4CmdsTest::testLease4WriteSecurityWarn() { "}"; std::ostringstream os; - os << "LEASE_CMDS_PATH_SECURITY_WARN lease file path specified is NOT SECURE:" + os << "LEASE_CMDS_PATH_SECURITY_WARNING lease file path specified is NOT SECURE:" << " invalid path specified: '/tmp', supported path is '" << CfgMgr::instance().getDataDir() << "'"; diff --git a/src/lib/config/http_command_config.cc b/src/lib/config/http_command_config.cc index ee3bd09a7f..065abe7592 100644 --- a/src/lib/config/http_command_config.cc +++ b/src/lib/config/http_command_config.cc @@ -187,7 +187,7 @@ HttpCommandConfig::HttpCommandConfig(ConstElementPtr config) std::ostringstream oss; config->toJSON(oss); - LOG_WARN(command_logger, COMMAND_HTTP_SOCKET_SECURITY_WARN) + LOG_WARN(command_logger, COMMAND_HTTP_SOCKET_SECURITY_WARNING) .arg(oss.str()); } diff --git a/src/lib/config/tests/http_command_config_unittests.cc b/src/lib/config/tests/http_command_config_unittests.cc index 82d092a230..1bc67d189c 100644 --- a/src/lib/config/tests/http_command_config_unittests.cc +++ b/src/lib/config/tests/http_command_config_unittests.cc @@ -57,7 +57,7 @@ TEST_F(HttpCommandConfigTest, default) { DhcpConfigError, "Unsecured HTTP control channel (:0:0)"); // Turn off security enforcment. Configuration will succeed but we - // should see WARN logs. + // should see WARNING logs. file::PathChecker::enableEnforcement(false); ASSERT_NO_THROW_LOG(http_config_.reset(new HttpCommandConfig(json))); @@ -83,7 +83,7 @@ TEST_F(HttpCommandConfigTest, default) { )"; runToElementTest(expected, *http_config_); - ASSERT_EQ(1, countFile("COMMAND_HTTP_SOCKET_SECURITY_WARN command socket" + ASSERT_EQ(1, countFile("COMMAND_HTTP_SOCKET_SECURITY_WARNING command socket" " configuration is NOT SECURE: { }")); // Change class defaults. @@ -93,7 +93,7 @@ TEST_F(HttpCommandConfigTest, default) { EXPECT_EQ("::1", http_config_->getSocketAddress().toText()); EXPECT_EQ(8080, http_config_->getSocketPort()); - ASSERT_EQ(2, countFile("COMMAND_HTTP_SOCKET_SECURITY_WARN command socket" + ASSERT_EQ(2, countFile("COMMAND_HTTP_SOCKET_SECURITY_WARNING command socket" " configuration is NOT SECURE: { }")); } @@ -287,8 +287,8 @@ TEST_F(HttpCommandConfigTest, headers) { })"; runToElementTest(expected, *http_config_); - // Should have security WARN log. - ASSERT_EQ(1, countFile("COMMAND_HTTP_SOCKET_SECURITY_WARN command socket" + // Should have security WARNING log. + ASSERT_EQ(1, countFile("COMMAND_HTTP_SOCKET_SECURITY_WARNING command socket" " configuration is NOT SECURE: { \"http-headers\": " "[ { \"name\": \"Strict-Transport-Security\", \"value\":" " \"max-age=31536000\" }, { \"name\": \"Foo\", \"value\": \"bar\"" @@ -365,7 +365,7 @@ TEST_F(HttpCommandConfigTest, authentication) { runToElementTest(expected, *http_config_); // Should be no security warnings. - ASSERT_EQ(0, countFile("COMMAND_HTTP_SOCKET_SECURITY_WARN")); + ASSERT_EQ(0, countFile("COMMAND_HTTP_SOCKET_SECURITY_WARNING")); } // This test verifies a HTTP control socket configuration with TLS can diff --git a/src/lib/d2srv/d2_config.cc b/src/lib/d2srv/d2_config.cc index 27804bd35d..c42b0235d7 100644 --- a/src/lib/d2srv/d2_config.cc +++ b/src/lib/d2srv/d2_config.cc @@ -429,7 +429,7 @@ TSIGKeyInfoParser::parse(ConstElementPtr key_config) { << " (" << getPosition("secret", key_config) << ")"); } else { - LOG_WARN(dhcp_to_d2_logger, DHCP_DDNS_TSIG_SECRET_SECURITY_WARN) + LOG_WARN(dhcp_to_d2_logger, DHCP_DDNS_TSIG_SECRET_SECURITY_WARNING) .arg(getPosition("secret", key_config).str()); } } diff --git a/src/lib/http/basic_auth_config.cc b/src/lib/http/basic_auth_config.cc index 0336b16d8c..53192449e8 100644 --- a/src/lib/http/basic_auth_config.cc +++ b/src/lib/http/basic_auth_config.cc @@ -237,7 +237,7 @@ BasicHttpAuthConfig::parse(const ConstElementPtr& config) { isc_throw(DhcpConfigError, "use of clear text 'password' is NOT SECURE (" << password_cfg->getPosition() << ")"); } else { - LOG_INFO(auth_logger, HTTP_CLIENT_PASSWORD_SECURITY_WARN) + LOG_INFO(auth_logger, HTTP_CLIENT_PASSWORD_SECURITY_WARNING) .arg(password_cfg->getPosition().str()); } } @@ -299,7 +299,7 @@ BasicHttpAuthConfig::parse(const ConstElementPtr& config) { isc_throw(DhcpConfigError, "use of clear text 'user' is NOT SECURE (" << user_cfg->getPosition() << ")"); } else { - LOG_INFO(auth_logger, HTTP_CLIENT_USER_SECURITY_WARN) + LOG_INFO(auth_logger, HTTP_CLIENT_USER_SECURITY_WARNING) .arg(user_cfg->getPosition().str()); } } diff --git a/src/lib/http/tests/basic_auth_config_unittests.cc b/src/lib/http/tests/basic_auth_config_unittests.cc index 5eec9e687a..0b32999c72 100644 --- a/src/lib/http/tests/basic_auth_config_unittests.cc +++ b/src/lib/http/tests/basic_auth_config_unittests.cc @@ -570,7 +570,7 @@ TEST_F(BasicHttpAuthConfigTest, parse) { EXPECT_NO_THROW(config.parse(cfg)); runToElementTest(cfg, config); - EXPECT_EQ(4, countFile("HTTP_CLIENT_PASSWORD_SECURITY_WARN" + EXPECT_EQ(4, countFile("HTTP_CLIENT_PASSWORD_SECURITY_WARNING" " use of clear text 'password' is NOT SECURE: :0:0")); } @@ -597,7 +597,7 @@ TEST_F(BasicHttpAuthConfigTest, clearUser) { // Disable security. file::PathChecker::enableEnforcement(false); ASSERT_NO_THROW_LOG(auth.parse(config)); - EXPECT_EQ(1, countFile("HTTP_CLIENT_USER_SECURITY_WARN " + EXPECT_EQ(1, countFile("HTTP_CLIENT_USER_SECURITY_WARNING " "use of clear text 'user' is NOT SECURE: :6:21")); } @@ -625,9 +625,9 @@ TEST_F(BasicHttpAuthConfigTest, clearPassword) { // Disable security. file::PathChecker::enableEnforcement(false); ASSERT_NO_THROW_LOG(auth.parse(config)); - EXPECT_EQ(1, countFile("HTTP_CLIENT_PASSWORD_SECURITY_WARN " + EXPECT_EQ(1, countFile("HTTP_CLIENT_PASSWORD_SECURITY_WARNING " "use of clear text 'password' is NOT SECURE: :7:25")); - EXPECT_EQ(1, countFile("HTTP_CLIENT_USER_SECURITY_WARN " + EXPECT_EQ(1, countFile("HTTP_CLIENT_USER_SECURITY_WARNING " "use of clear text 'user' is NOT SECURE: :6:21")); } diff --git a/src/lib/process/d_controller.cc b/src/lib/process/d_controller.cc index 8f35366ca8..1303c228fc 100644 --- a/src/lib/process/d_controller.cc +++ b/src/lib/process/d_controller.cc @@ -134,7 +134,7 @@ DControllerBase::launch(int argc, char* argv[], const bool test_mode) { } if (file::amRunningAsRoot()) { - LOG_WARN(dctl_logger, DCTL_ROOT_USER_SECURITY_WARN) + LOG_WARN(dctl_logger, DCTL_ROOT_USER_SECURITY_WARNING) .arg(app_name_); }