Commit 1878553a authored by Thomas Markwalder's avatar Thomas Markwalder

[#730,!2-p] Addressed review comments

    Minor cleanup

ChangeLog
src/bin/dhcp4/dhcp4_messages.mes
src/bin/dhcp4/dhcp4_srv.cc
src/lib/dns/tests/name_unittest.cc
parent d1395c7a
......@@ -3,7 +3,7 @@
hostname or FQDN options are received. Now the servers will
drop the DHCP packets containing the malformed options.
CVE:2019-6473
(Gitlab #730,private!2 git a2a98c421bb400a81218bd28d6a6f62accd31b1f)
(Gitlab #730,!2-p git a2a98c421bb400a81218bd28d6a6f62accd31b1f)
1651. [security] tmark
Added logic to kea-dhcp6 to catch values for client or
......
......@@ -116,8 +116,7 @@ client.
This debug message is issued when the DHCP server was unable to process the
the hostname option sent by the client because the content is malformed.
The first argument includes the client and transaction identification
information. The second argument should contain a description of the data
error.
information. The second argument contains a description of the data error.
% DHCP4_CLIENT_HOSTNAME_PROCESS %1: processing client's Hostname option
This debug message is issued when the server starts processing the Hostname
......
......@@ -1824,7 +1824,7 @@ Dhcpv4Srv::processHostnameOption(Dhcpv4Exchange& ex) {
// going to explicitly catch that here.
label_count = OptionDataTypeUtil::getLabelCount(hostname);
} catch (const std::exception& exc) {
LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL_DATA, DHCP4_CLIENT_HOSTNAME_MALFORMED)
LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL, DHCP4_CLIENT_HOSTNAME_MALFORMED)
.arg(ex.getQuery()->getLabel())
.arg(exc.what());
return;
......@@ -1835,7 +1835,7 @@ Dhcpv4Srv::processHostnameOption(Dhcpv4Exchange& ex) {
/// @todo It would be more liberal to accept this and let it fall into
/// the case of replace or less than two below.
if (label_count == 0) {
LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL_DATA, DHCP4_EMPTY_HOSTNAME)
LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL, DHCP4_EMPTY_HOSTNAME)
.arg(ex.getQuery()->getLabel());
return;
}
......
......@@ -290,7 +290,7 @@ TEST_F(NameTest, fromText) {
}
// The following test uses a name data that was produced by
// fuz testing and causes an unexpected condition in stringParser.
// fuzz testing and causes an unexpected condition in stringParser.
// Formerly this condition was trapped by an assert, but for
// robustness it has been replaced by a throw.
TEST_F(NameTest, unexpectedParseError) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment