pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-09 14:42:05 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Account for port specification with IP address for MQTT server. Some additional format validation. (#5084)

Browse Source
This commit is contained in:
Johnathon Mohr 2024-10-17 03:05:35 -07:00 committed by GitHub
parent 2ea2b47690
commit fbb6778415
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mqtt/MQTT.cpp
View File

@ -706,18 +706,43 @@ bool MQTT::isValidJsonEnvelope(JSONObject &json)
bool MQTT::isPrivateIpAddress(const char address[]) bool MQTT::isPrivateIpAddress(const char address[])
{ {
// Min. length like 10.0.0.0, max like 192.168.255.255 // Min. length like 10.0.0.0 (8), max like 192.168.255.255:65535 (21)
size_t length = strlen(address); size_t length = strlen(address);
if (length < 8 || length > 15) { if (length < 8 || length > 21) {
return false; return false;
} }
// Ensure the address contains only digits and dots. // Ensure the address contains only digits and dots and maybe a colon.
// Some limited validation is done.
// Even if it's not a valid IP address, we will know it's not a domain. // Even if it's not a valid IP address, we will know it's not a domain.
bool hasColon = false;
int numDots = 0;
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
if (!isdigit(address[i]) && address[i] != '.') { if (!isdigit(address[i]) && address[i] != '.' && address[i] != ':') {
return false; return false;
} }
// Dots can't be the first character, immediately follow another dot,
// occur more than 3 times, or occur after a colon.
if (address[i] == '.') {
if (++numDots > 3 || i == 0 || address[i - 1] == '.' || hasColon) {
return false;
}
}
// There can only be a single colon, and it can only occur after 3 dots
else if (address[i] == ':') {
if (hasColon || numDots < 3) {
return false;
}
hasColon = true;
}
}
// Final validation for IPv4 address and port format.
// Note that the values of octets haven't been tested, only the address format.
if (numDots != 3) {
return false;
} }
// Check the easy ones first. // Check the easy ones first.