corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1543341 - Refine Safe Browsing log output. r=baku

Browse Source 
After calling Lookup API per table, Safe Browsing outputs too many debug
message for a single URL lookup. Refine the current output.

Differential Revision: https://phabricator.services.mozilla.com/D27066
This commit is contained in:
dlee
2019-04-11 18:57:56 +00:00
parent 2544ecb9ae
commit 158ec83968
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
toolkit/components/url-classifier/Classifier.cpp
View File

@@ -409,10 +409,20 @@ nsresult Classifier::CheckURIFragments(
const nsTArray<nsCString>& aSpecFragments, const nsACString& aTable,
LookupResultArray& aResults) {
// A URL can form up to 30 different fragments
MOZ_ASSERT(aSpecFragments.Length() != 0);
MOZ_ASSERT(aSpecFragments.Length() <=
(MAX_HOST_COMPONENTS * (MAX_PATH_COMPONENTS + 2)));
LOG(("Checking table %s", aTable.BeginReading()));
if (LOG_ENABLED()) {
uint32_t urlIdx = 0;
for (uint32_t i = 1; i < aSpecFragments.Length(); i++) {
if (aSpecFragments[urlIdx].Length() < aSpecFragments[i].Length()) {
urlIdx = i;
}
}
LOG(("Checking table %s, URL is %s", aTable.BeginReading(), aSpecFragments[urlIdx].get()));
}
RefPtr<LookupCache> cache = GetLookupCache(aTable);
if (NS_WARN_IF(!cache)) {
return NS_ERROR_FAILURE;
@@ -423,13 +433,6 @@ nsresult Classifier::CheckURIFragments(
Completion lookupHash;
lookupHash.FromPlaintext(aSpecFragments[i]);
if (LOG_ENABLED()) {
nsAutoCString checking;
lookupHash.ToHexString(checking);
LOG(("Checking fragment %s, hash %s (%X)", aSpecFragments[i].get(),
checking.get(), lookupHash.ToUint32()));
}
bool has, confirmed;
uint32_t matchLength;
@@ -440,8 +443,14 @@ nsresult Classifier::CheckURIFragments(
RefPtr<LookupResult> result = new LookupResult;
aResults.AppendElement(result);
LOG(("Found a result in %s: %s", cache->TableName().get(),
confirmed ? "confirmed." : "Not confirmed."));
if (LOG_ENABLED()) {
nsAutoCString checking;
lookupHash.ToHexString(checking);
LOG(("Found a result in fragment %s, hash %s (%X)", aSpecFragments[i].get(),
checking.get(), lookupHash.ToUint32()));
LOG(("Result %s, match %d-bytes prefix", confirmed ? "confirmed." : "Not confirmed.",
matchLength));
}
result->hash.complete = lookupHash;
result->mConfirmed = confirmed;