espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-04 01:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dns] fix dns failed to append names of length 255 (#6088)

Browse Source
This commit is contained in:
Simon Lin
2021-01-23 08:50:06 -08:00
committed by GitHub
parent e12178a256
commit 6ee13b7a8d
3 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/dns_headers.cpp
+1 -2
View File
@@ -128,8 +128,6 @@ otError Name::AppendMultipleLabels(const char *aLabels, Message &aMessage)
do
{
VerifyOrExit(index < kMaxLength, error = OT_ERROR_INVALID_ARGS);
ch = aLabels[index];
if ((ch == kNullChar) || (ch == kLabelSeperatorChar))
@@ -149,6 +147,7 @@ otError Name::AppendMultipleLabels(const char *aLabels, Message &aMessage)
ExitNow();
}
VerifyOrExit(index + 1 < kMaxEncodedLength, error = OT_ERROR_INVALID_ARGS);
SuccessOrExit(error = AppendLabel(&aLabels[labelStartIndex], labelLength, aMessage));
labelStartIndex = index + 1;
src/core/net/dns_headers.hpp
+3 -2
View File
@@ -487,8 +487,9 @@ class Name
public:
enum : uint8_t
{
kMaxLabelLength = 63, ///< Max number of characters in a label.
kMaxLength = 255, ///< Max number of characters in a name.
kMaxLabelLength = 63, ///< Max number of characters in a label.
kMaxLength = 254, ///< Max number of characters in a name.
kMaxEncodedLength = 255, ///< Max length of an encoded name.
};
/**
tests/unit/test_dns.cpp
+47
View File
@@ -88,6 +88,18 @@ void TestDnsName(void)
{nullptr, sizeof(kEncodedName4), kEncodedName4, kLabels4, "."},
};
static const char *kMaxLengthNames[] = {
"HereIsSomeoneHidden.MyHoldFromMeTaken.FromSelfHasMeDriven.MyLeadFromMeTaken."
"HereIsSomeoneHidden.AsLifeSweeterThanLife.TakesMeToGardenOfSoul.MyFortFromMeTaken."
"HereIsSomeoneHidden.LikeSugarInSugarCane.ASweetSugarTrader.MyShopFromMeTaken."
"SorcererAndMagicia.",
"HereIsSomeoneHidden.MyHoldFromMeTaken.FromSelfHasMeDriven.MyLeadFromMeTaken."
"HereIsSomeoneHidden.AsLifeSweeterThanLife.TakesMeToGardenOfSoul.MyFortFromMeTaken."
"HereIsSomeoneHidden.LikeSugarInSugarCane.ASweetSugarTrader.MyShopFromMeTaken."
"SorcererAndMagicia",
};
static const char *kInvalidNames[] = {
"foo..bar",
"..",
@@ -104,6 +116,19 @@ void TestDnsName(void)
"SorcererAndMagician.NoEyesCanEverSee.AnArtfulConjurer.MySenseFromMeTaken."
"MyEyesWillNeverSee.BeautiesOfTheWholeWorld.BeholdWhoseVisionFine.MySightFromMeTaken"
"PoemByRumiMolana",
// Long name of 255 characters which ends with a dot
"HereIsSomeoneHidden.MyHoldFromMeTaken.FromSelfHasMeDriven.MyLeadFromMeTaken."
"HereIsSomeoneHidden.AsLifeSweeterThanLife.TakesMeToGardenOfSoul.MyFortFromMeTaken."
"HereIsSomeoneHidden.LikeSugarInSugarCane.ASweetSugarTrader.MyShopFromMeTaken."
"SorcererAndMagician.",
// Long name of 254 characters which does not end with a dot
"HereIsSomeoneHidden.MyHoldFromMeTaken.FromSelfHasMeDriven.MyLeadFromMeTaken."
"HereIsSomeoneHidden.AsLifeSweeterThanLife.TakesMeToGardenOfSoul.MyFortFromMeTaken."
"HereIsSomeoneHidden.LikeSugarInSugarCane.ASweetSugarTrader.MyShopFromMeTaken."
"SorcererAndMagician",
};
printf("================================================================\n");
@@ -177,6 +202,28 @@ void TestDnsName(void)
"Name::ReadName() did not fail with too small name buffer size");
}
printf("----------------------------------------------------------------\n");
printf("Max length names:\n");
for (const char *&maxLengthName : kMaxLengthNames)
{
if (maxLengthName[strlen(maxLengthName) - 1] == '.')
{
VerifyOrQuit(strlen(maxLengthName) == Dns::Name::kMaxLength, "invalid max length string");
}
else
{
VerifyOrQuit(strlen(maxLengthName) == Dns::Name::kMaxLength - 1, "invalid max length string");
}
IgnoreError(message->SetLength(0));
printf("\"%s\"\n", maxLengthName);
VerifyOrQuit(Dns::Name::AppendName(maxLengthName, *message) == OT_ERROR_NONE,
"Name::AppendName() failed with max length name");
}
printf("----------------------------------------------------------------\n");
printf("Invalid names:\n");