debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #121 from vibe-d/issue117-bogus-ip-address-detection

Browse source 
Use a robust check IP vs. host name check for resolveHost
merged-on-behalf-of: Leonid Kramer <l-kramer@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2019-01-18 20:31:48 +01:00 committed by GitHub
parent 8edca75696 28260bd612
commit 113d16b860
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/vibe/core/net.d
View file

@ -39,8 +39,7 @@ NetworkAddress resolveHost(string host, ushort address_family, bool use_dns = tr
else import core.sys.posix.netinet.in_ : sockaddr_in, sockaddr_in6;
enforce(host.length > 0, "Host name must not be empty.");
// FIXME: this check needs to be more specific to not disallow valid DNS names
if (host[0] == ':' || host[0] >= '0' && host[0] <= '9') {
if (isMaybeIPAddress(host)) {
auto addr = parseAddress(host);
enforce(address_family == AddressFamily.UNSPEC || addr.addressFamily == address_family);
NetworkAddress ret;
@ -1124,3 +1123,31 @@ class ReadTimeoutException: Exception
super(message, file, line, next);
}
}
// check whether the given name is not a valid host name, but may instead
// be a valid IP address. This is used as a quick check to avoid
// unnecessary address parsing or DNS queries
private bool isMaybeIPAddress(in char[] name)
{
import std.algorithm.searching : all, canFind;
import std.ascii : isDigit;
// could be an IPv6 address, but ':' is invalid in host names
if (name.canFind(':')) return true;
// an IPv4 address is at least 7 characters (0.0.0.0)
if (name.length < 7) return false;
// no valid TLD consists of only digits
return name.canFind('.') && name.all!(ch => ch.isDigit || ch == '.');
}
unittest {
assert(isMaybeIPAddress("0.0.0.0"));
assert(isMaybeIPAddress("::1"));
assert(isMaybeIPAddress("aabb::1f"));
assert(!isMaybeIPAddress("example.com"));
assert(!isMaybeIPAddress("12.com"));
assert(!isMaybeIPAddress("1.1.1.t12"));
}