forked from mirrors/gecko-dev
The biggest set of APIs from ns[T]StringObsolete which are still heavily used are the string searching APIs. It appears the intention was for these to be replaced by the `FindInReadable` APIs, however that doesn't appear to have happened. In addition, the APIs have some quirks around their handling of mixed character widths. These APIs generally supported both narrow strings and the native string type, probably because char16_t string literals weren't available until c++11. Finally they also used easy-to-confuse unlabeled boolean and integer optional arguments to control behaviour. These patches do the following major changes to the searching APIs: 1. The ASCII case-insensitive search method was split out as LowerCaseFindASCII, rather than using a boolean. This should be less error-prone and more explicit, and allows the method to continue to use narrow string literals for all string types (as only ASCII is supported). 2. The other [R]Find methods were restricted to only support arguments with matching character types. I considered adding a FindASCII method which would use narrow string literals for both wide and narrow strings but it would've been the same amount of work as changing all of the literals to unicode literals. This ends up being the bulk of the changes in the patch. 3. All find methods were re-implemented using std::basic_string_view's find algorithm or stl algorithms to reduce code complexity, and avoid the need to carry around the logic from nsStringObsolete.cpp. 4. The implementations were moved to nsTStringRepr.cpp. 5. An overload of Find was added to try to catch callers which previously called `Find(..., false)` or `Find(..., true)` to set case-sensitivity, due to booleans normally implicitly coercing to `index_type`. This should probably be removed at some point, but may be useful during the transition. Differential Revision: https://phabricator.services.mozilla.com/D148300
162 lines
4.8 KiB
C++
162 lines
4.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "ProxyUtils.h"
|
|
|
|
#include "mozilla/IntegerRange.h"
|
|
#include "nsReadableUtils.h"
|
|
#include "nsTArray.h"
|
|
#include "prnetdb.h"
|
|
#include "prtypes.h"
|
|
|
|
namespace mozilla {
|
|
namespace toolkit {
|
|
namespace system {
|
|
|
|
/**
|
|
* Normalize the short IP form into the complete form.
|
|
* For example, it converts "192.168" into "192.168.0.0"
|
|
*/
|
|
static void NormalizeAddr(const nsACString& aAddr, nsCString& aNormalized) {
|
|
nsTArray<nsCString> addr;
|
|
ParseString(aAddr, '.', addr);
|
|
aNormalized =
|
|
StringJoin("."_ns, IntegerRange(4), [&addr](nsACString& dst, size_t i) {
|
|
if (i < addr.Length()) {
|
|
dst.Append(addr[i]);
|
|
} else {
|
|
dst.Append('0');
|
|
}
|
|
});
|
|
}
|
|
|
|
static PRUint32 MaskIPv4Addr(PRUint32 aAddr, uint16_t aMaskLen) {
|
|
if (aMaskLen == 32) {
|
|
return aAddr;
|
|
}
|
|
return PR_htonl(PR_ntohl(aAddr) & (~0L << (32 - aMaskLen)));
|
|
}
|
|
|
|
static void MaskIPv6Addr(PRIPv6Addr& aAddr, uint16_t aMaskLen) {
|
|
if (aMaskLen == 128) {
|
|
return;
|
|
}
|
|
|
|
if (aMaskLen > 96) {
|
|
aAddr.pr_s6_addr32[3] =
|
|
PR_htonl(PR_ntohl(aAddr.pr_s6_addr32[3]) & (~0L << (128 - aMaskLen)));
|
|
} else if (aMaskLen > 64) {
|
|
aAddr.pr_s6_addr32[3] = 0;
|
|
aAddr.pr_s6_addr32[2] =
|
|
PR_htonl(PR_ntohl(aAddr.pr_s6_addr32[2]) & (~0L << (96 - aMaskLen)));
|
|
} else if (aMaskLen > 32) {
|
|
aAddr.pr_s6_addr32[3] = 0;
|
|
aAddr.pr_s6_addr32[2] = 0;
|
|
aAddr.pr_s6_addr32[1] =
|
|
PR_htonl(PR_ntohl(aAddr.pr_s6_addr32[1]) & (~0L << (64 - aMaskLen)));
|
|
} else {
|
|
aAddr.pr_s6_addr32[3] = 0;
|
|
aAddr.pr_s6_addr32[2] = 0;
|
|
aAddr.pr_s6_addr32[1] = 0;
|
|
aAddr.pr_s6_addr32[0] =
|
|
PR_htonl(PR_ntohl(aAddr.pr_s6_addr32[0]) & (~0L << (32 - aMaskLen)));
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
static bool IsMatchMask(const nsACString& aHost, const nsACString& aOverride) {
|
|
nsresult rv;
|
|
|
|
auto tokenEnd = aOverride.FindChar('/');
|
|
if (tokenEnd == -1) {
|
|
return false;
|
|
}
|
|
|
|
nsAutoCString prefixStr(
|
|
Substring(aOverride, tokenEnd + 1, aOverride.Length() - tokenEnd - 1));
|
|
auto maskLen = prefixStr.ToInteger(&rv);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return false;
|
|
}
|
|
|
|
nsAutoCString override(aOverride);
|
|
NormalizeAddr(Substring(aOverride, 0, tokenEnd), override);
|
|
|
|
PRNetAddr prAddrHost;
|
|
PRNetAddr prAddrOverride;
|
|
if (PR_SUCCESS !=
|
|
PR_StringToNetAddr(PromiseFlatCString(aHost).get(), &prAddrHost) ||
|
|
PR_SUCCESS != PR_StringToNetAddr(override.get(), &prAddrOverride)) {
|
|
return false;
|
|
}
|
|
|
|
if (prAddrHost.raw.family == PR_AF_INET &&
|
|
prAddrOverride.raw.family == PR_AF_INET) {
|
|
return MaskIPv4Addr(prAddrHost.inet.ip, maskLen) ==
|
|
MaskIPv4Addr(prAddrOverride.inet.ip, maskLen);
|
|
} else if (prAddrHost.raw.family == PR_AF_INET6 &&
|
|
prAddrOverride.raw.family == PR_AF_INET6) {
|
|
MaskIPv6Addr(prAddrHost.ipv6.ip, maskLen);
|
|
MaskIPv6Addr(prAddrOverride.ipv6.ip, maskLen);
|
|
|
|
return memcmp(&prAddrHost.ipv6.ip, &prAddrOverride.ipv6.ip,
|
|
sizeof(PRIPv6Addr)) == 0;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
static bool IsMatchWildcard(const nsACString& aHost,
|
|
const nsACString& aOverride) {
|
|
nsAutoCString host(aHost);
|
|
nsAutoCString override(aOverride);
|
|
|
|
int32_t overrideLength = override.Length();
|
|
int32_t tokenStart = 0;
|
|
int32_t offset = 0;
|
|
bool star = false;
|
|
|
|
while (tokenStart < overrideLength) {
|
|
int32_t tokenEnd = override.FindChar('*', tokenStart);
|
|
if (tokenEnd == tokenStart) {
|
|
// Star is the first character in the token.
|
|
star = true;
|
|
tokenStart++;
|
|
// If the character following the '*' is a '.' character then skip
|
|
// it so that "*.foo.com" allows "foo.com".
|
|
if (override.FindChar('.', tokenStart) == tokenStart) {
|
|
nsAutoCString token(Substring(override, tokenStart + 1,
|
|
overrideLength - tokenStart - 1));
|
|
if (host.Equals(token)) {
|
|
return true;
|
|
}
|
|
}
|
|
} else {
|
|
if (tokenEnd == -1) {
|
|
tokenEnd = overrideLength; // no '*' char, match rest of string
|
|
}
|
|
nsAutoCString token(
|
|
Substring(override, tokenStart, tokenEnd - tokenStart));
|
|
offset = host.Find(token, offset);
|
|
if (offset == -1 || (!star && offset)) {
|
|
return false;
|
|
}
|
|
star = false;
|
|
tokenStart = tokenEnd;
|
|
offset += token.Length();
|
|
}
|
|
}
|
|
|
|
return (star || (offset == static_cast<int32_t>(host.Length())));
|
|
}
|
|
|
|
bool IsHostProxyEntry(const nsACString& aHost, const nsACString& aOverride) {
|
|
return IsMatchMask(aHost, aOverride) || IsMatchWildcard(aHost, aOverride);
|
|
}
|
|
|
|
} // namespace system
|
|
} // namespace toolkit
|
|
} // namespace mozilla
|