wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

handle query parameters and full-string queries as specified in the updated safebrowsing protocol. b=395377, r=tony, a=mconnor

Browse Source
This commit is contained in:
dcamp@mozilla.com 2007-10-01 16:53:53 -07:00
parent bcd60c5581
commit 3500f85eab
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
View File

@ -647,11 +647,12 @@ nsUrlClassifierDBServiceWorker::GetLookupFragments(const nsACString& spec,
}
const nsCSubstring& host = Substring(begin, iter++);
const nsCSubstring& path = Substring(iter, end);
nsCAutoString path;
path.Assign(Substring(iter, end));
/**
* From the protocol doc:
* For the hostname, the client will try at most 5 different strings. They
* For the hostname, the client will try at most 5 different strings. They
* are:
* a) The exact hostname of the url
* b) The 4 hostnames formed by starting with the last 5 components and
@ -677,10 +678,11 @@ nsUrlClassifierDBServiceWorker::GetLookupFragments(const nsACString& spec,
/**
* From the protocol doc:
* For the path, the client will also try at most 5 different strings.
* For the path, the client will also try at most 6 different strings.
* They are:
* a) the exact path of the url
* b) the 4 paths formed by starting at the root (/) and
* a) the exact path of the url, including query parameters
* b) the exact path of the url, without query parameters
* c) the 4 paths formed by starting at the root (/) and
* successively appending path components, including a trailing
* slash. This behavior should only extend up to the next-to-last
* path component, that is, a trailing slash should never be
@ -689,6 +691,14 @@ nsUrlClassifierDBServiceWorker::GetLookupFragments(const nsACString& spec,
nsCStringArray paths;
paths.AppendCString(path);
path.BeginReading(iter);
path.EndReading(end);
if (FindCharInReadable('?', iter, end)) {
path.BeginReading(begin);
path = Substring(begin, iter);
paths.AppendCString(path);
}
numComponents = 0;
path.BeginReading(begin);
path.EndReading(end);
@ -700,26 +710,15 @@ nsUrlClassifierDBServiceWorker::GetLookupFragments(const nsACString& spec,
numComponents++;
}
/**
* "In addition to these, the client should look up the exact host
* and exact path, with a trailing '$' appended." */
nsCAutoString key;
key.Assign(spec);
key.Append('$');
LOG(("Chking %s", key.get()));
nsUrlClassifierHash* hash = fragments.AppendElement();
if (!hash) return NS_ERROR_OUT_OF_MEMORY;
hash->FromPlaintext(key, mCryptoHash);
for (int hostIndex = 0; hostIndex < hosts.Count(); hostIndex++) {
for (int pathIndex = 0; pathIndex < paths.Count(); pathIndex++) {
nsCAutoString key;
key.Assign(*hosts[hostIndex]);
key.Append('/');
key.Append(*paths[pathIndex]);
LOG(("Chking %s", key.get()));
hash = fragments.AppendElement();
nsUrlClassifierHash* hash = fragments.AppendElement();
if (!hash) return NS_ERROR_OUT_OF_MEMORY;
hash->FromPlaintext(key, mCryptoHash);
}

6
toolkit/components/url-classifier/src/nsUrlClassifierUtils.cpp
View File

@ -137,15 +137,11 @@ nsUrlClassifierUtils::GetKeyForURI(nsIURI * uri, nsACString & _retval)
rv = innerURI->GetPath(path);
NS_ENSURE_SUCCESS(rv, rv);
// strip out anchors and query parameters
// strip out anchors
PRInt32 ref = path.FindChar('#');
if (ref != kNotFound)
path.SetLength(ref);
ref = path.FindChar('?');
if (ref != kNotFound)
path.SetLength(ref);
nsCAutoString temp;
rv = CanonicalizePath(path, temp);
NS_ENSURE_SUCCESS(rv, rv);

3
toolkit/components/url-classifier/tests/unit/test_dbservice.js
View File

@ -13,7 +13,8 @@ var chunk1 = chunk1Urls.join("\n");
var chunk2Urls = [
"blah.com/a",
"baz.com/",
"255.255.0.1/"
"255.255.0.1/",
"www.foo.com/test2?param=1"
];
var chunk2 = chunk2Urls.join("\n");