Skip to content

Reject multi-character labels in IPAddressV6::fromInverseArpaName #2747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0z5a wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reject multi-character labels in IPAddressV6::fromInverseArpaName #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion folly/IPAddressV6.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,13 @@ IPAddressV6 IPAddressV6::fromInverseArpaName(const std::string& arpaname) {
size_t pos = 0;
int count = 0;
for (size_t i = 1; i <= pieces.size(); i++) {
ip[pos] = pieces[pieces.size() - i][0];
// Each label is a single hex digit; IPAddressV6 checks that it is hex.
auto const label = pieces[pieces.size() - i];
if (label.size() != 1) {
throw IPAddressFormatException(
fmt::format("Invalid input. Got '{}'", piece));
}
ip[pos] = label[0];
pos++;
count++;
// add ':' every 4 chars
Expand Down
13 changes: 13 additions & 0 deletions folly/test/IPAddressTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,19 @@ TEST(IPaddress, fromInverseArpaName) {
fmt::format(
"{}.ip6.arpa",
"3.0.0.0.0.0.0.0.0.0.0.0.c.0.0.b.e.c.a.f.e.f.c.1.0.0.0.0.0.2.6.2")));
// Each label must be exactly one hex digit.
EXPECT_THROW(
IPAddressV6::fromInverseArpaName(
fmt::format(
"{}.ip6.arpa",
"30.0.0.0.0.0.0.0.0.0.0.0.c.0.0.b.e.c.a.f.e.f.c.1.0.0.0.0.0.2.6.2")),
IPAddressFormatException);
EXPECT_THROW(
IPAddressV6::fromInverseArpaName(
fmt::format(
"{}.ip6.arpa",
".0.0.0.0.0.0.0.0.0.0.0.c.0.0.b.e.c.a.f.e.f.c.1.0.0.0.0.0.2.6.2")),
IPAddressFormatException);
}

// Test that invalid string values are killed
Expand Down