Skip to content

moved check for valid ipv4 as to not accept bogus address when matching /0 range #6015

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
SimonThalvorsen wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

moved check for valid ipv4 as to not accept bogus address when matching /0 range #6015

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 libcfnet/addr_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ int FuzzySetMatch(const char *s1, const char *s2)
struct sockaddr_in addr1, addr2;
unsigned long mask;

// Checks that the addr to match is a valid address
// else bogus addresses will always match /0 range
if (inet_pton(AF_INET, s2, &addr2.sin_addr) != 1) {
Log(LOG_LEVEL_ERR, "Invalid reference IPv4: %s", s2);
return -1;
}

address[0] = '\0';
int ret = sscanf(s1, "%16[^/]/%lu", address, &mask);
if (ret != 2 || mask > 32)
Expand All @@ -129,7 +136,6 @@ int FuzzySetMatch(const char *s1, const char *s2)
}

inet_pton(AF_INET, address, &addr1.sin_addr);
inet_pton(AF_INET, s2, &addr2.sin_addr);

unsigned long a1 = htonl(addr1.sin_addr.s_addr);
unsigned long a2 = htonl(addr2.sin_addr.s_addr);
Expand Down
3 changes: 0 additions & 3 deletions tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ bundle agent test
"description" -> { "CFE-3081" }
string => "Test that isipinsubnet() validates IP addresses as valid especially within the 0.0.0.0/0 range";

"test_soft_fail"
string => "any",
meta => { "CFE-3081"};
vars:

"variable_value_from_varible" string => "$(nosuch.variable)";
Expand Down
Loading