From: Thomas Markwalder Date: Wed, 18 Jun 2025 11:56:25 +0000 (-0400) Subject: [#3848] Make message IDs consistent X-Git-Tag: Kea-3.1.0~61 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=33caead065ccde0d980f84d3417c586c315c3846;p=thirdparty%2Fkea.git [#3848] Make message IDs consistent --- diff --git a/doc/sphinx/arm/security.rst b/doc/sphinx/arm/security.rst index ea46b0e023..85865cc444 100644 --- a/doc/sphinx/arm/security.rst +++ b/doc/sphinx/arm/security.rst @@ -578,7 +578,7 @@ a security risk it emits an error log and exits. The following checks are perfor As of Kea 3.0, starting the daemons with the command line option, '-X', instructs them to warn about security risks but continue operating anyway. -The message IDs for all such warnings are suffixed with "_SECURITY_WARN". +The message IDs for all such warnings are suffixed with "_SECURITY_WARNING". .. warning:: diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc index 63aac9fd4f..66c2d4902e 100644 --- a/src/bin/dhcp4/dhcp4_messages.cc +++ b/src/bin/dhcp4/dhcp4_messages.cc @@ -157,7 +157,7 @@ extern const isc::log::MessageID DHCP4_RESPONSE_DATA = "DHCP4_RESPONSE_DATA"; extern const isc::log::MessageID DHCP4_RESPONSE_FQDN_DATA = "DHCP4_RESPONSE_FQDN_DATA"; extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_DATA = "DHCP4_RESPONSE_HOSTNAME_DATA"; extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_GENERATE = "DHCP4_RESPONSE_HOSTNAME_GENERATE"; -extern const isc::log::MessageID DHCP4_ROOT_USER_SECURITY_WARN = "DHCP4_ROOT_USER_SECURITY_WARN"; +extern const isc::log::MessageID DHCP4_ROOT_USER_SECURITY_WARNING = "DHCP4_ROOT_USER_SECURITY_WARNING"; extern const isc::log::MessageID DHCP4_SECURITY_CHECKS_DISABLED = "DHCP4_SECURITY_CHECKS_DISABLED"; extern const isc::log::MessageID DHCP4_SERVER_FAILED = "DHCP4_SERVER_FAILED"; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE = "DHCP4_SERVER_INITIATED_DECLINE"; @@ -338,7 +338,7 @@ const char* values[] = { "DHCP4_RESPONSE_FQDN_DATA", "%1: including FQDN option in the server's response: %2", "DHCP4_RESPONSE_HOSTNAME_DATA", "%1: including Hostname option in the server's response: %2", "DHCP4_RESPONSE_HOSTNAME_GENERATE", "%1: server has generated hostname %2 for the client", - "DHCP4_ROOT_USER_SECURITY_WARN", "kea-dhcp4 running as root user!", + "DHCP4_ROOT_USER_SECURITY_WARNING", "kea-dhcp4 running as root user!", "DHCP4_SECURITY_CHECKS_DISABLED", "Invoked with command line option -X, Security checks are disabled!!", "DHCP4_SERVER_FAILED", "server failed: %1", "DHCP4_SERVER_INITIATED_DECLINE", "%1: Lease for addr %2 has been found to be already in use. The lease will be unavailable for %3 seconds.", diff --git a/src/bin/dhcp4/dhcp4_messages.h b/src/bin/dhcp4/dhcp4_messages.h index 76de2b30bd..97a9ac3a3b 100644 --- a/src/bin/dhcp4/dhcp4_messages.h +++ b/src/bin/dhcp4/dhcp4_messages.h @@ -158,7 +158,7 @@ extern const isc::log::MessageID DHCP4_RESPONSE_DATA; extern const isc::log::MessageID DHCP4_RESPONSE_FQDN_DATA; extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_DATA; extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_GENERATE; -extern const isc::log::MessageID DHCP4_ROOT_USER_SECURITY_WARN; +extern const isc::log::MessageID DHCP4_ROOT_USER_SECURITY_WARNING; extern const isc::log::MessageID DHCP4_SECURITY_CHECKS_DISABLED; extern const isc::log::MessageID DHCP4_SERVER_FAILED; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE; diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes index 97d9a8128c..dee14f6270 100644 --- a/src/bin/dhcp4/dhcp4_messages.mes +++ b/src/bin/dhcp4/dhcp4_messages.mes @@ -1199,7 +1199,7 @@ paths or permissions. This mode of operation may expose your environment to security vulnerabilities and should only be used after careful consideration. -% DHCP4_ROOT_USER_SECURITY_WARN kea-dhcp4 running as root user! +% DHCP4_ROOT_USER_SECURITY_WARNING kea-dhcp4 running as root user! This warning is emitted when kea-dhcp4 is running as a root user. While the server will function fully, this mode of operation may expose your environment to security vulnerabilities and should diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc index 18b9cbb49a..b1dc80f7d1 100644 --- a/src/bin/dhcp6/dhcp6_messages.cc +++ b/src/bin/dhcp6/dhcp6_messages.cc @@ -160,7 +160,7 @@ extern const isc::log::MessageID DHCP6_RELEASE_PD_FAIL_WRONG_IAID = "DHCP6_RELEA extern const isc::log::MessageID DHCP6_REQUIRED_OPTIONS_CHECK_FAIL = "DHCP6_REQUIRED_OPTIONS_CHECK_FAIL"; extern const isc::log::MessageID DHCP6_RESERVATIONS_LOOKUP_FIRST_ENABLED = "DHCP6_RESERVATIONS_LOOKUP_FIRST_ENABLED"; extern const isc::log::MessageID DHCP6_RESPONSE_DATA = "DHCP6_RESPONSE_DATA"; -extern const isc::log::MessageID DHCP6_ROOT_USER_SECURITY_WARN = "DHCP6_ROOT_USER_SECURITY_WARN"; +extern const isc::log::MessageID DHCP6_ROOT_USER_SECURITY_WARNING = "DHCP6_ROOT_USER_SECURITY_WARNING"; extern const isc::log::MessageID DHCP6_SECURITY_CHECKS_DISABLED = "DHCP6_SECURITY_CHECKS_DISABLED"; extern const isc::log::MessageID DHCP6_SERVER_FAILED = "DHCP6_SERVER_FAILED"; extern const isc::log::MessageID DHCP6_SHUTDOWN = "DHCP6_SHUTDOWN"; @@ -337,7 +337,7 @@ const char* values[] = { "DHCP6_REQUIRED_OPTIONS_CHECK_FAIL", "%1: %2 message received from %3 failed the following check: %4", "DHCP6_RESERVATIONS_LOOKUP_FIRST_ENABLED", "Multi-threading is enabled and host reservations lookup is always performed first.", "DHCP6_RESPONSE_DATA", "%1: responding with packet %2 (type %3), packet details: %4", - "DHCP6_ROOT_USER_SECURITY_WARN", "kea-dhcp6 running as root user!", + "DHCP6_ROOT_USER_SECURITY_WARNING", "kea-dhcp6 running as root user!", "DHCP6_SECURITY_CHECKS_DISABLED", "Invoked with command line option -X, Security checks are disabled!!", "DHCP6_SERVER_FAILED", "server failed: %1", "DHCP6_SHUTDOWN", "server shutdown", diff --git a/src/bin/dhcp6/dhcp6_messages.h b/src/bin/dhcp6/dhcp6_messages.h index d0c5f4afdd..cae45ff606 100644 --- a/src/bin/dhcp6/dhcp6_messages.h +++ b/src/bin/dhcp6/dhcp6_messages.h @@ -161,7 +161,7 @@ extern const isc::log::MessageID DHCP6_RELEASE_PD_FAIL_WRONG_IAID; extern const isc::log::MessageID DHCP6_REQUIRED_OPTIONS_CHECK_FAIL; extern const isc::log::MessageID DHCP6_RESERVATIONS_LOOKUP_FIRST_ENABLED; extern const isc::log::MessageID DHCP6_RESPONSE_DATA; -extern const isc::log::MessageID DHCP6_ROOT_USER_SECURITY_WARN; +extern const isc::log::MessageID DHCP6_ROOT_USER_SECURITY_WARNING; extern const isc::log::MessageID DHCP6_SECURITY_CHECKS_DISABLED; extern const isc::log::MessageID DHCP6_SERVER_FAILED; extern const isc::log::MessageID DHCP6_SHUTDOWN; diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes index ac178fa960..d7a8007e26 100644 --- a/src/bin/dhcp6/dhcp6_messages.mes +++ b/src/bin/dhcp6/dhcp6_messages.mes @@ -1176,7 +1176,7 @@ paths or permissions. This mode of operation may expose your environment to security vulnerabilities and should only be used after careful consideration. -% DHCP6_ROOT_USER_SECURITY_WARN kea-dhcp6 running as root user! +% DHCP6_ROOT_USER_SECURITY_WARNING kea-dhcp6 running as root user! This warning is emitted when kea-dhcp6 is running as a root user. While the server will function fully, this mode of operation may expose your environment to security vulnerabilities and should diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc index e210590481..9deb7f3d61 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc @@ -26,7 +26,7 @@ extern const isc::log::MessageID LEASE_CMDS_LEASES6_COMMITTED_CONFLICT = "LEASE_ extern const isc::log::MessageID LEASE_CMDS_LEASES6_COMMITTED_FAILED = "LEASE_CMDS_LEASES6_COMMITTED_FAILED"; extern const isc::log::MessageID LEASE_CMDS_LEASES6_COMMITTED_LEASE_ERROR = "LEASE_CMDS_LEASES6_COMMITTED_LEASE_ERROR"; extern const isc::log::MessageID LEASE_CMDS_LOAD_ERROR = "LEASE_CMDS_LOAD_ERROR"; -extern const isc::log::MessageID LEASE_CMDS_PATH_SECURITY_WARN = "LEASE_CMDS_PATH_SECURITY_WARN"; +extern const isc::log::MessageID LEASE_CMDS_PATH_SECURITY_WARNING = "LEASE_CMDS_PATH_SECURITY_WARNING"; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS4 = "LEASE_CMDS_RESEND_DDNS4"; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS4_FAILED = "LEASE_CMDS_RESEND_DDNS4_FAILED"; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS6 = "LEASE_CMDS_RESEND_DDNS6"; @@ -67,7 +67,7 @@ const char* values[] = { "LEASE_CMDS_LEASES6_COMMITTED_FAILED", "reason: %1", "LEASE_CMDS_LEASES6_COMMITTED_LEASE_ERROR", "evaluating binding-variables for lease: %1 for: %2, reason: %3", "LEASE_CMDS_LOAD_ERROR", "loading Lease Commands hooks library failed: %1", - "LEASE_CMDS_PATH_SECURITY_WARN", "lease file path specified is NOT SECURE: %1", + "LEASE_CMDS_PATH_SECURITY_WARNING", "lease file path specified is NOT SECURE: %1", "LEASE_CMDS_RESEND_DDNS4", "lease4-resend-ddns command successful: %1", "LEASE_CMDS_RESEND_DDNS4_FAILED", "lease4-resend-ddns command failed: %1", "LEASE_CMDS_RESEND_DDNS6", "lease6-resend-ddns command successful: %1", diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h index 96f4105281..c2baa81c8c 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h +++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h @@ -27,7 +27,7 @@ extern const isc::log::MessageID LEASE_CMDS_LEASES6_COMMITTED_CONFLICT; extern const isc::log::MessageID LEASE_CMDS_LEASES6_COMMITTED_FAILED; extern const isc::log::MessageID LEASE_CMDS_LEASES6_COMMITTED_LEASE_ERROR; extern const isc::log::MessageID LEASE_CMDS_LOAD_ERROR; -extern const isc::log::MessageID LEASE_CMDS_PATH_SECURITY_WARN; +extern const isc::log::MessageID LEASE_CMDS_PATH_SECURITY_WARNING; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS4; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS4_FAILED; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS6; diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes index 35966219b6..34e023454c 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes +++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes @@ -167,7 +167,7 @@ are logged. The lease6-wipe command has failed. Both the reason as well as the parameters passed are logged. -% LEASE_CMDS_PATH_SECURITY_WARN lease file path specified is NOT SECURE: %1 +% LEASE_CMDS_PATH_SECURITY_WARNING lease file path specified is NOT SECURE: %1 This warning message is issued when security enforcement is disabled and the path portion of the `filename` parameter of the lease4-write or lease6-write command does not comply with the supported path. The diff --git a/src/lib/config/config_messages.cc b/src/lib/config/config_messages.cc index 856965acc4..6806f911ef 100644 --- a/src/lib/config/config_messages.cc +++ b/src/lib/config/config_messages.cc @@ -14,7 +14,7 @@ extern const isc::log::MessageID COMMAND_HTTP_LISTENER_COMMAND_REJECTED = "COMMA extern const isc::log::MessageID COMMAND_HTTP_LISTENER_STARTED = "COMMAND_HTTP_LISTENER_STARTED"; extern const isc::log::MessageID COMMAND_HTTP_LISTENER_STOPPED = "COMMAND_HTTP_LISTENER_STOPPED"; extern const isc::log::MessageID COMMAND_HTTP_LISTENER_STOPPING = "COMMAND_HTTP_LISTENER_STOPPING"; -extern const isc::log::MessageID COMMAND_HTTP_SOCKET_SECURITY_WARN = "COMMAND_HTTP_SOCKET_SECURITY_WARN"; +extern const isc::log::MessageID COMMAND_HTTP_SOCKET_SECURITY_WARNING = "COMMAND_HTTP_SOCKET_SECURITY_WARNING"; extern const isc::log::MessageID COMMAND_PROCESS_ERROR1 = "COMMAND_PROCESS_ERROR1"; extern const isc::log::MessageID COMMAND_PROCESS_ERROR2 = "COMMAND_PROCESS_ERROR2"; extern const isc::log::MessageID COMMAND_RECEIVED = "COMMAND_RECEIVED"; @@ -57,7 +57,7 @@ const char* values[] = { "COMMAND_HTTP_LISTENER_STARTED", "Command HTTP listener started with %1 threads, listening on address: %2 port: %3, use TLS: %4", "COMMAND_HTTP_LISTENER_STOPPED", "Command HTTP listener for address: %1 port: %2 stopped.", "COMMAND_HTTP_LISTENER_STOPPING", "Stopping Command HTTP listener for address: %1 port: %2", - "COMMAND_HTTP_SOCKET_SECURITY_WARN", "command socket configuration is NOT SECURE: %1", + "COMMAND_HTTP_SOCKET_SECURITY_WARNING", "command socket configuration is NOT SECURE: %1", "COMMAND_PROCESS_ERROR1", "Error while processing command: %1", "COMMAND_PROCESS_ERROR2", "Error while processing command: %1", "COMMAND_RECEIVED", "Received command '%1'", diff --git a/src/lib/config/config_messages.h b/src/lib/config/config_messages.h index 1edd106996..c914302f58 100644 --- a/src/lib/config/config_messages.h +++ b/src/lib/config/config_messages.h @@ -15,7 +15,7 @@ extern const isc::log::MessageID COMMAND_HTTP_LISTENER_COMMAND_REJECTED; extern const isc::log::MessageID COMMAND_HTTP_LISTENER_STARTED; extern const isc::log::MessageID COMMAND_HTTP_LISTENER_STOPPED; extern const isc::log::MessageID COMMAND_HTTP_LISTENER_STOPPING; -extern const isc::log::MessageID COMMAND_HTTP_SOCKET_SECURITY_WARN; +extern const isc::log::MessageID COMMAND_HTTP_SOCKET_SECURITY_WARNING; extern const isc::log::MessageID COMMAND_PROCESS_ERROR1; extern const isc::log::MessageID COMMAND_PROCESS_ERROR2; extern const isc::log::MessageID COMMAND_RECEIVED; diff --git a/src/lib/config/config_messages.mes b/src/lib/config/config_messages.mes index 0492d28976..c3854e10c0 100644 --- a/src/lib/config/config_messages.mes +++ b/src/lib/config/config_messages.mes @@ -193,7 +193,7 @@ and the path specified for a control channel unix socket-name does not have the required socket permissions. The server will still use the specified path but is warning that doing so may pose a security risk. -% COMMAND_HTTP_SOCKET_SECURITY_WARN command socket configuration is NOT SECURE: %1 +% COMMAND_HTTP_SOCKET_SECURITY_WARNING command socket configuration is NOT SECURE: %1 This warning message is issued when security enforcement is disabled and command socket configuration does not use HTTPS/TLS or baseic HTTP authentication. The server will still use the socket as configured but diff --git a/src/lib/d2srv/d2_messages.cc b/src/lib/d2srv/d2_messages.cc index 16a34c1d8f..0a84c91870 100644 --- a/src/lib/d2srv/d2_messages.cc +++ b/src/lib/d2srv/d2_messages.cc @@ -86,7 +86,7 @@ extern const isc::log::MessageID DHCP_DDNS_STARTED = "DHCP_DDNS_STARTED"; extern const isc::log::MessageID DHCP_DDNS_STARTING_TRANSACTION = "DHCP_DDNS_STARTING_TRANSACTION"; extern const isc::log::MessageID DHCP_DDNS_STATE_MODEL_UNEXPECTED_ERROR = "DHCP_DDNS_STATE_MODEL_UNEXPECTED_ERROR"; extern const isc::log::MessageID DHCP_DDNS_TRANS_SEND_ERROR = "DHCP_DDNS_TRANS_SEND_ERROR"; -extern const isc::log::MessageID DHCP_DDNS_TSIG_SECRET_SECURITY_WARN = "DHCP_DDNS_TSIG_SECRET_SECURITY_WARN"; +extern const isc::log::MessageID DHCP_DDNS_TSIG_SECRET_SECURITY_WARNING = "DHCP_DDNS_TSIG_SECRET_SECURITY_WARNING"; extern const isc::log::MessageID DHCP_DDNS_UPDATE_REQUEST_SENT = "DHCP_DDNS_UPDATE_REQUEST_SENT"; extern const isc::log::MessageID DHCP_DDNS_UPDATE_RESPONSE_RECEIVED = "DHCP_DDNS_UPDATE_RESPONSE_RECEIVED"; @@ -175,7 +175,7 @@ const char* values[] = { "DHCP_DDNS_STARTING_TRANSACTION", "Request ID %1:", "DHCP_DDNS_STATE_MODEL_UNEXPECTED_ERROR", "Request ID %1: application encountered an unexpected error while carrying out a NameChangeRequest: %2", "DHCP_DDNS_TRANS_SEND_ERROR", "Request ID %1: application encountered an unexpected error while attempting to send a DNS update: %2", - "DHCP_DDNS_TSIG_SECRET_SECURITY_WARN", "use of clear text TSIG 'secret' is NOT SECURE: %1", + "DHCP_DDNS_TSIG_SECRET_SECURITY_WARNING", "use of clear text TSIG 'secret' is NOT SECURE: %1", "DHCP_DDNS_UPDATE_REQUEST_SENT", "Request ID %1: %2 to server: %3", "DHCP_DDNS_UPDATE_RESPONSE_RECEIVED", "Request ID %1: to server: %2 status: %3", NULL diff --git a/src/lib/d2srv/d2_messages.h b/src/lib/d2srv/d2_messages.h index 09434dc532..4e46f4d6df 100644 --- a/src/lib/d2srv/d2_messages.h +++ b/src/lib/d2srv/d2_messages.h @@ -87,7 +87,7 @@ extern const isc::log::MessageID DHCP_DDNS_STARTED; extern const isc::log::MessageID DHCP_DDNS_STARTING_TRANSACTION; extern const isc::log::MessageID DHCP_DDNS_STATE_MODEL_UNEXPECTED_ERROR; extern const isc::log::MessageID DHCP_DDNS_TRANS_SEND_ERROR; -extern const isc::log::MessageID DHCP_DDNS_TSIG_SECRET_SECURITY_WARN; +extern const isc::log::MessageID DHCP_DDNS_TSIG_SECRET_SECURITY_WARNING; extern const isc::log::MessageID DHCP_DDNS_UPDATE_REQUEST_SENT; extern const isc::log::MessageID DHCP_DDNS_UPDATE_RESPONSE_RECEIVED; diff --git a/src/lib/d2srv/d2_messages.mes b/src/lib/d2srv/d2_messages.mes index 2167064fd8..78ec0f1861 100644 --- a/src/lib/d2srv/d2_messages.mes +++ b/src/lib/d2srv/d2_messages.mes @@ -464,7 +464,7 @@ paths or permissions. This mode of operation may expose your environment to security vulnerabilities and should only be used after consideration. -% DHCP_DDNS_TSIG_SECRET_SECURITY_WARN use of clear text TSIG 'secret' is NOT SECURE: %1 +% DHCP_DDNS_TSIG_SECRET_SECURITY_WARNING use of clear text TSIG 'secret' is NOT SECURE: %1 This warning message is issued when security enforcement is disabled and TSIG key configuration uses clear text 'secret' rather than 'secret-file'. The server will still use the key as configured diff --git a/src/lib/http/auth_messages.cc b/src/lib/http/auth_messages.cc index bc85af8487..892bfea944 100644 --- a/src/lib/http/auth_messages.cc +++ b/src/lib/http/auth_messages.cc @@ -7,12 +7,12 @@ namespace isc { namespace http { -extern const isc::log::MessageID HTTP_CLIENT_PASSWORD_SECURITY_WARN = "HTTP_CLIENT_PASSWORD_SECURITY_WARN"; +extern const isc::log::MessageID HTTP_CLIENT_PASSWORD_SECURITY_WARNING = "HTTP_CLIENT_PASSWORD_SECURITY_WARNING"; extern const isc::log::MessageID HTTP_CLIENT_REQUEST_AUTHORIZED = "HTTP_CLIENT_REQUEST_AUTHORIZED"; extern const isc::log::MessageID HTTP_CLIENT_REQUEST_BAD_AUTH_HEADER = "HTTP_CLIENT_REQUEST_BAD_AUTH_HEADER"; extern const isc::log::MessageID HTTP_CLIENT_REQUEST_NOT_AUTHORIZED = "HTTP_CLIENT_REQUEST_NOT_AUTHORIZED"; extern const isc::log::MessageID HTTP_CLIENT_REQUEST_NO_AUTH_HEADER = "HTTP_CLIENT_REQUEST_NO_AUTH_HEADER"; -extern const isc::log::MessageID HTTP_CLIENT_USER_SECURITY_WARN = "HTTP_CLIENT_USER_SECURITY_WARN"; +extern const isc::log::MessageID HTTP_CLIENT_USER_SECURITY_WARNING = "HTTP_CLIENT_USER_SECURITY_WARNING"; } // namespace http } // namespace isc @@ -20,12 +20,12 @@ extern const isc::log::MessageID HTTP_CLIENT_USER_SECURITY_WARN = "HTTP_CLIENT_U namespace { const char* values[] = { - "HTTP_CLIENT_PASSWORD_SECURITY_WARN", "use of clear text 'password' is NOT SECURE: %1", + "HTTP_CLIENT_PASSWORD_SECURITY_WARNING", "use of clear text 'password' is NOT SECURE: %1", "HTTP_CLIENT_REQUEST_AUTHORIZED", "received HTTP request authorized for '%1'", "HTTP_CLIENT_REQUEST_BAD_AUTH_HEADER", "received HTTP request with malformed authentication header: %1", "HTTP_CLIENT_REQUEST_NOT_AUTHORIZED", "received HTTP request with not matching authentication header", "HTTP_CLIENT_REQUEST_NO_AUTH_HEADER", "received HTTP request without required authentication header", - "HTTP_CLIENT_USER_SECURITY_WARN", "use of clear text 'user' is NOT SECURE: %1", + "HTTP_CLIENT_USER_SECURITY_WARNING", "use of clear text 'user' is NOT SECURE: %1", NULL }; diff --git a/src/lib/http/auth_messages.h b/src/lib/http/auth_messages.h index c12fb918cd..a978462adb 100644 --- a/src/lib/http/auth_messages.h +++ b/src/lib/http/auth_messages.h @@ -8,12 +8,12 @@ namespace isc { namespace http { -extern const isc::log::MessageID HTTP_CLIENT_PASSWORD_SECURITY_WARN; +extern const isc::log::MessageID HTTP_CLIENT_PASSWORD_SECURITY_WARNING; extern const isc::log::MessageID HTTP_CLIENT_REQUEST_AUTHORIZED; extern const isc::log::MessageID HTTP_CLIENT_REQUEST_BAD_AUTH_HEADER; extern const isc::log::MessageID HTTP_CLIENT_REQUEST_NOT_AUTHORIZED; extern const isc::log::MessageID HTTP_CLIENT_REQUEST_NO_AUTH_HEADER; -extern const isc::log::MessageID HTTP_CLIENT_USER_SECURITY_WARN; +extern const isc::log::MessageID HTTP_CLIENT_USER_SECURITY_WARNING; } // namespace http } // namespace isc diff --git a/src/lib/http/auth_messages.mes b/src/lib/http/auth_messages.mes index 2e44e1e01a..d7ea4c11f2 100644 --- a/src/lib/http/auth_messages.mes +++ b/src/lib/http/auth_messages.mes @@ -23,13 +23,13 @@ provided incorrect user id and/or password. This information message is issued when the server receives a request without a required authentication header. -% HTTP_CLIENT_PASSWORD_SECURITY_WARN use of clear text 'password' is NOT SECURE: %1 +% HTTP_CLIENT_PASSWORD_SECURITY_WARNING use of clear text 'password' is NOT SECURE: %1 This warning message is issued when security enforcement is disabled and command socket configuration uses clear text 'password' rather than 'password-file'. The server will still use the socket as configured but is warning that doing so may pose a security risk. -% HTTP_CLIENT_USER_SECURITY_WARN use of clear text 'user' is NOT SECURE: %1 +% HTTP_CLIENT_USER_SECURITY_WARNING use of clear text 'user' is NOT SECURE: %1 This warning message is issued when security enforcement is disabled and command socket configuration uses clear text 'user' rather than 'user-file'. The server will still use the socket as configured diff --git a/src/lib/process/process_messages.cc b/src/lib/process/process_messages.cc index 32ab9353d8..53b91e8c12 100644 --- a/src/lib/process/process_messages.cc +++ b/src/lib/process/process_messages.cc @@ -27,7 +27,7 @@ extern const isc::log::MessageID DCTL_OPEN_CONFIG_DB = "DCTL_OPEN_CONFIG_DB"; extern const isc::log::MessageID DCTL_PARSER_FAIL = "DCTL_PARSER_FAIL"; extern const isc::log::MessageID DCTL_PID_FILE_ERROR = "DCTL_PID_FILE_ERROR"; extern const isc::log::MessageID DCTL_PROCESS_FAILED = "DCTL_PROCESS_FAILED"; -extern const isc::log::MessageID DCTL_ROOT_USER_SECURITY_WARN = "DCTL_ROOT_USER_SECURITY_WARN"; +extern const isc::log::MessageID DCTL_ROOT_USER_SECURITY_WARNING = "DCTL_ROOT_USER_SECURITY_WARNING"; extern const isc::log::MessageID DCTL_RUN_PROCESS = "DCTL_RUN_PROCESS"; extern const isc::log::MessageID DCTL_SHUTDOWN = "DCTL_SHUTDOWN"; extern const isc::log::MessageID DCTL_SHUTDOWN_SIGNAL_RECVD = "DCTL_SHUTDOWN_SIGNAL_RECVD"; @@ -62,7 +62,7 @@ const char* values[] = { "DCTL_PARSER_FAIL", "Parser error: %1", "DCTL_PID_FILE_ERROR", "%1 could not create a PID file: %2", "DCTL_PROCESS_FAILED", "%1 application execution failed: %2", - "DCTL_ROOT_USER_SECURITY_WARN", "%1 running as root user!", + "DCTL_ROOT_USER_SECURITY_WARNING", "%1 running as root user!", "DCTL_RUN_PROCESS", "%1 starting application event loop", "DCTL_SHUTDOWN", "%1 has shut down, pid: %2, version: %3", "DCTL_SHUTDOWN_SIGNAL_RECVD", "OS signal %1 received, starting shutdown", diff --git a/src/lib/process/process_messages.h b/src/lib/process/process_messages.h index 5fcdcd8d6b..7b0eae7b6c 100644 --- a/src/lib/process/process_messages.h +++ b/src/lib/process/process_messages.h @@ -28,7 +28,7 @@ extern const isc::log::MessageID DCTL_OPEN_CONFIG_DB; extern const isc::log::MessageID DCTL_PARSER_FAIL; extern const isc::log::MessageID DCTL_PID_FILE_ERROR; extern const isc::log::MessageID DCTL_PROCESS_FAILED; -extern const isc::log::MessageID DCTL_ROOT_USER_SECURITY_WARN; +extern const isc::log::MessageID DCTL_ROOT_USER_SECURITY_WARNING; extern const isc::log::MessageID DCTL_RUN_PROCESS; extern const isc::log::MessageID DCTL_SHUTDOWN; extern const isc::log::MessageID DCTL_SHUTDOWN_SIGNAL_RECVD; diff --git a/src/lib/process/process_messages.mes b/src/lib/process/process_messages.mes index 98eabf27e5..2d34581285 100644 --- a/src/lib/process/process_messages.mes +++ b/src/lib/process/process_messages.mes @@ -153,7 +153,7 @@ not comply with the supported path. The server will still use the specified path but is warning that doing so may pose a security risk. -% DCTL_ROOT_USER_SECURITY_WARN %1 running as root user! +% DCTL_ROOT_USER_SECURITY_WARNING %1 running as root user! This warning is emitted when the server is running as a root user. While the server will function fully, this mode of operation may expose your environment to security vulnerabilities and should