[#3848] Replace WARN with WARNING some more

diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index cb054b1f506b97e40024abad7659fbbec267d4ec..616ade80c64b2e2d09a551219343ae28b9afbe2d 100644 (file)
--- 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 de519ba46a360883616579cc0817af046b6998f3..b231f46bb95d26b6b5a38632cf89ece0ad62517a 100644 (file)
--- 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 5d0b546c70fc788bd88081719f03c94dc7736b02..389cb4097840d362357879bdfd09ada72a2b1f65 100644 (file)
--- 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 90add865335309c2804cf4a5dc8471e873e442b1..a4fb0a61d3cd34141b24343bb33b9c078c1381e3 100644 (file)
--- 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 ee3bd09a7f82cea522231f20e8eb435c5373d254..065abe75922614676fed974e75adbc1b349100fc 100644 (file)
--- 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 82d092a23009f5d1499ed9e89baec8e12ec429cf..1bc67d189cbf3cb72963debce0d11f727f6dacb5 100644 (file)
--- 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 27804bd35d8bb64e47bb4fca30c25904e6b2af52..c42b0235d7b81d3e50b73e50b06c978fbd836af3 100644 (file)
--- 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 0336b16d8c2a1f891f6480809d0eda47828faadb..53192449e84552ea82c71eaa48d0da4091bc6683 100644 (file)
--- 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 5eec9e687a92d15c66333c49e02d3e812354c3de..0b32999c72bdc4d48723d1bdd0d146e142340cc8 100644 (file)
--- 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<BasicHttpAuthConfig>(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: <string>: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: <string>: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: <string>:6:21"));
 }
 

diff --git a/src/lib/process/d_controller.cc b/src/lib/process/d_controller.cc
index 8f35366ca8ed7da459d3f9434062f3e7cd299c6d..1303c228fc71bfa4cfb078e5ab9e58a1e9f6da72 100644 (file)
--- 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_);
     }