This patch includes following changes:
1. nsUrlClassifierHashCompleter.js
nsUrlClassifierHashCompleter.idl
- Add completionV4 interface for hashCompleter to pass response data to
DB service.
- Process response data includes negative cache duration, matched full
hashes and cache duration for each match. Full matches are passed through
nsIFullHashMatch interface.
- Change _requests.responses from array contains matched fullhashes to
dictionary so that it can store additional information likes negative cache
duration.
2. nsUrlClassifierDBService.cpp
- Implement CompletionV4 interface, store response data to CacheResultV4
object. Expired duration to expired time is handled here.
- Add CacheResultToTableUpdate function to convert V2 & V4 cache result
to TableUpdate object.
3. LookupCache.h
- Extend CacheResult to CacheResultV2 and CacheResultV4 so we can store
response data in CompletionV2 and CompletionV4.
4. HashStore.h
- Add API and member variable in TableUpdateV4 to store response data.
TableUpdate object is used by DB service to pass update data or gethash
response to Classifier, so we need to extend TableUpdateV4 to be able
to store fullHashes.find response.
6. Entry.h
- Define the structure about how we cache fullHashes.find response.
MozReview-Commit-ID: 8pUJITn8c1n
317 lines
9.0 KiB
C++
317 lines
9.0 KiB
C++
//* -*- Mode: C++; tab-width: 8; 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/. */
|
|
|
|
#ifndef LookupCache_h__
|
|
#define LookupCache_h__
|
|
|
|
#include "Entries.h"
|
|
#include "nsString.h"
|
|
#include "nsTArray.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIFile.h"
|
|
#include "nsIFileStreams.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "nsUrlClassifierPrefixSet.h"
|
|
#include "VariableLengthPrefixSet.h"
|
|
#include "mozilla/Logging.h"
|
|
#include "mozilla/TypedEnumBits.h"
|
|
|
|
namespace mozilla {
|
|
namespace safebrowsing {
|
|
|
|
#define MAX_HOST_COMPONENTS 5
|
|
#define MAX_PATH_COMPONENTS 4
|
|
|
|
enum class MatchResult : uint8_t
|
|
{
|
|
eNoMatch = 0x00,
|
|
eV2Prefix = 0x01,
|
|
eV4Prefix = 0x02,
|
|
eV2Completion = 0x04,
|
|
eV4Completion = 0x08,
|
|
eTelemetryDisabled = 0x10,
|
|
|
|
eBothPrefix = eV2Prefix | eV4Prefix,
|
|
eBothCompletion = eV2Completion | eV4Completion,
|
|
eV2PreAndCom = eV2Prefix | eV2Completion,
|
|
eV4PreAndCom = eV4Prefix | eV4Completion,
|
|
eBothPreAndV2Com = eBothPrefix | eV2Completion,
|
|
eBothPreAndV4Com = eBothPrefix | eV4Completion,
|
|
eAll = eBothPrefix | eBothCompletion,
|
|
};
|
|
MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(MatchResult)
|
|
|
|
class LookupResult {
|
|
public:
|
|
LookupResult() : mNoise(false), mProtocolConfirmed(false),
|
|
mPartialHashLength(0), mConfirmed(false),
|
|
mProtocolV2(true),
|
|
mMatchResult(MatchResult::eTelemetryDisabled) {}
|
|
|
|
// The fragment that matched in the LookupCache
|
|
union {
|
|
Prefix fixedLengthPrefix;
|
|
Completion complete;
|
|
} hash;
|
|
|
|
const Completion &CompleteHash() {
|
|
MOZ_ASSERT(!mNoise);
|
|
return hash.complete;
|
|
}
|
|
|
|
nsCString PartialHash() {
|
|
MOZ_ASSERT(mPartialHashLength <= COMPLETE_SIZE);
|
|
return nsCString(reinterpret_cast<char*>(hash.complete.buf), mPartialHashLength);
|
|
}
|
|
|
|
nsCString PartialHashHex() {
|
|
nsAutoCString hex;
|
|
for (size_t i = 0; i < mPartialHashLength; i++) {
|
|
hex.AppendPrintf("%.2X", hash.complete.buf[i]);
|
|
}
|
|
return hex;
|
|
}
|
|
|
|
bool Confirmed() const { return mConfirmed || mProtocolConfirmed; }
|
|
|
|
// True if we have a complete match for this hash in the table.
|
|
bool Complete() const { return mPartialHashLength == COMPLETE_SIZE; }
|
|
|
|
// True if this is a noise entry, i.e. an extra entry
|
|
// that is inserted to mask the true URL we are requesting.
|
|
// Noise entries will not have a complete 256-bit hash as
|
|
// they are fetched from the local 32-bit database and we
|
|
// don't know the corresponding full URL.
|
|
bool mNoise;
|
|
|
|
bool mProtocolConfirmed;
|
|
|
|
nsCString mTableName;
|
|
|
|
uint32_t mPartialHashLength;
|
|
|
|
// True as long as this lookup is complete and hasn't expired.
|
|
bool mConfirmed;
|
|
|
|
bool mProtocolV2;
|
|
|
|
// This is only used by telemetry to record the match result.
|
|
MatchResult mMatchResult;
|
|
};
|
|
|
|
typedef nsTArray<LookupResult> LookupResultArray;
|
|
|
|
class CacheResult {
|
|
public:
|
|
enum { V2, V4 };
|
|
|
|
virtual int Ver() const = 0;
|
|
virtual bool findCompletion(const Completion& aCompletion) const = 0;
|
|
|
|
virtual ~CacheResult() {}
|
|
|
|
template<typename T>
|
|
static T* Cast(CacheResult* aThat) {
|
|
return ((aThat && T::VER == aThat->Ver()) ?
|
|
reinterpret_cast<T*>(aThat) : nullptr);
|
|
}
|
|
|
|
nsCString table;
|
|
};
|
|
|
|
class CacheResultV2 final : public CacheResult
|
|
{
|
|
public:
|
|
static const int VER;
|
|
|
|
Completion completion;
|
|
uint32_t addChunk;
|
|
|
|
bool operator==(const CacheResultV2& aOther) const {
|
|
return table == aOther.table &&
|
|
completion == aOther.completion &&
|
|
addChunk == aOther.addChunk;
|
|
}
|
|
|
|
bool findCompletion(const Completion& aCompletion) const override {
|
|
return completion == aCompletion;
|
|
}
|
|
|
|
virtual int Ver() const override { return VER; }
|
|
};
|
|
|
|
class CacheResultV4 final : public CacheResult
|
|
{
|
|
public:
|
|
static const int VER;
|
|
|
|
nsCString prefix;
|
|
CachedFullHashResponse response;
|
|
|
|
bool operator==(const CacheResultV4& aOther) const {
|
|
return prefix == aOther.prefix &&
|
|
response == aOther.response;
|
|
}
|
|
|
|
bool findCompletion(const Completion& aCompletion) const override {
|
|
nsDependentCSubstring completion(
|
|
reinterpret_cast<const char*>(aCompletion.buf), COMPLETE_SIZE);
|
|
return response.fullHashes.Contains(completion);
|
|
}
|
|
|
|
virtual int Ver() const override { return VER; }
|
|
};
|
|
|
|
typedef nsTArray<UniquePtr<CacheResult>> CacheResultArray;
|
|
|
|
class LookupCache {
|
|
public:
|
|
// Check for a canonicalized IP address.
|
|
static bool IsCanonicalizedIP(const nsACString& aHost);
|
|
|
|
// take a lookup string (www.hostname.com/path/to/resource.html) and
|
|
// expand it into the set of fragments that should be searched for in an
|
|
// entry
|
|
static nsresult GetLookupFragments(const nsACString& aSpec,
|
|
nsTArray<nsCString>* aFragments);
|
|
// Similar to GetKey(), but if the domain contains three or more components,
|
|
// two keys will be returned:
|
|
// hostname.com/foo/bar -> [hostname.com]
|
|
// mail.hostname.com/foo/bar -> [hostname.com, mail.hostname.com]
|
|
// www.mail.hostname.com/foo/bar -> [hostname.com, mail.hostname.com]
|
|
static nsresult GetHostKeys(const nsACString& aSpec,
|
|
nsTArray<nsCString>* aHostKeys);
|
|
|
|
LookupCache(const nsACString& aTableName,
|
|
const nsACString& aProvider,
|
|
nsIFile* aStoreFile);
|
|
virtual ~LookupCache() {}
|
|
|
|
const nsCString &TableName() const { return mTableName; }
|
|
|
|
// The directory handle where we operate will
|
|
// be moved away when a backup is made.
|
|
nsresult UpdateRootDirHandle(nsIFile* aRootStoreDirectory);
|
|
|
|
// This will Clear() the passed arrays when done.
|
|
nsresult AddCompletionsToCache(AddCompleteArray& aAddCompletes);
|
|
|
|
// Write data stored in lookup cache to disk.
|
|
nsresult WriteFile();
|
|
|
|
// Clear completions retrieved from gethash request.
|
|
void ClearCache();
|
|
|
|
bool IsPrimed() const { return mPrimed; };
|
|
|
|
#if DEBUG
|
|
void DumpCache();
|
|
#endif
|
|
|
|
virtual nsresult Open();
|
|
virtual nsresult Init() = 0;
|
|
virtual nsresult ClearPrefixes() = 0;
|
|
virtual nsresult Has(const Completion& aCompletion,
|
|
bool* aHas, uint32_t* aMatchLength,
|
|
bool* aFromCache) = 0;
|
|
|
|
virtual void IsHashEntryConfirmed(const Completion& aEntry,
|
|
const TableFreshnessMap& aTableFreshness,
|
|
uint32_t aFreshnessGuarantee,
|
|
bool* aConfirmed) = 0;
|
|
|
|
virtual bool IsEmpty() = 0;
|
|
|
|
virtual void ClearAll();
|
|
|
|
template<typename T>
|
|
static T* Cast(LookupCache* aThat) {
|
|
return ((aThat && T::VER == aThat->Ver()) ? reinterpret_cast<T*>(aThat) : nullptr);
|
|
}
|
|
|
|
private:
|
|
nsresult LoadPrefixSet();
|
|
|
|
virtual nsresult StoreToFile(nsIFile* aFile) = 0;
|
|
virtual nsresult LoadFromFile(nsIFile* aFile) = 0;
|
|
virtual size_t SizeOfPrefixSet() = 0;
|
|
|
|
virtual int Ver() const = 0;
|
|
|
|
protected:
|
|
bool mPrimed;
|
|
nsCString mTableName;
|
|
nsCString mProvider;
|
|
nsCOMPtr<nsIFile> mRootStoreDirectory;
|
|
nsCOMPtr<nsIFile> mStoreDirectory;
|
|
|
|
// Full length hashes obtained in gethash request
|
|
CompletionArray mGetHashCache;
|
|
|
|
// For gtest to inspect private members.
|
|
friend class PerProviderDirectoryTestUtils;
|
|
};
|
|
|
|
class LookupCacheV2 final : public LookupCache
|
|
{
|
|
public:
|
|
explicit LookupCacheV2(const nsACString& aTableName,
|
|
const nsACString& aProvider,
|
|
nsIFile* aStoreFile)
|
|
: LookupCache(aTableName, aProvider, aStoreFile) {}
|
|
~LookupCacheV2() {}
|
|
|
|
virtual nsresult Init() override;
|
|
virtual nsresult Open() override;
|
|
virtual void ClearAll() override;
|
|
virtual nsresult Has(const Completion& aCompletion,
|
|
bool* aHas, uint32_t* aMatchLength,
|
|
bool* aFromCache) override;
|
|
|
|
virtual void IsHashEntryConfirmed(const Completion& aEntry,
|
|
const TableFreshnessMap& aTableFreshness,
|
|
uint32_t aFreshnessGuarantee,
|
|
bool* aConfirmed) override;
|
|
|
|
virtual bool IsEmpty() override;
|
|
|
|
nsresult Build(AddPrefixArray& aAddPrefixes,
|
|
AddCompleteArray& aAddCompletes);
|
|
|
|
nsresult GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes);
|
|
|
|
#if DEBUG
|
|
void DumpCompletions();
|
|
#endif
|
|
|
|
static const int VER;
|
|
|
|
protected:
|
|
nsresult ReadCompletions();
|
|
|
|
virtual nsresult ClearPrefixes() override;
|
|
virtual nsresult StoreToFile(nsIFile* aFile) override;
|
|
virtual nsresult LoadFromFile(nsIFile* aFile) override;
|
|
virtual size_t SizeOfPrefixSet() override;
|
|
|
|
private:
|
|
virtual int Ver() const override { return VER; }
|
|
|
|
// Construct a Prefix Set with known prefixes.
|
|
// This will Clear() aAddPrefixes when done.
|
|
nsresult ConstructPrefixSet(AddPrefixArray& aAddPrefixes);
|
|
|
|
// Full length hashes obtained in update request
|
|
CompletionArray mUpdateCompletions;
|
|
|
|
// Set of prefixes known to be in the database
|
|
RefPtr<nsUrlClassifierPrefixSet> mPrefixSet;
|
|
};
|
|
|
|
} // namespace safebrowsing
|
|
} // namespace mozilla
|
|
|
|
#endif
|