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

bug 1125503 - when canonicalizing hostnames, check string length before calling Last() r=mmc

Browse Source
This commit is contained in:
David Keeler 2015-01-26 12:47:50 -08:00
parent 83c156b615
commit d043f815ec
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/manager/boot/src/PublicKeyPinningService.cpp
View File

@ -375,7 +375,8 @@ PublicKeyPinningService::CanonicalizeHostname(const char* hostname)
{
nsAutoCString canonicalizedHostname(hostname);
ToLowerCase(canonicalizedHostname);
while (canonicalizedHostname.Last() == '.') {
while (canonicalizedHostname.Length() > 0 &&
canonicalizedHostname.Last() == '.') {
canonicalizedHostname.Truncate(canonicalizedHostname.Length() - 1);
}
return canonicalizedHostname;

8
security/manager/boot/src/nsSiteSecurityService.cpp
View File

@ -279,12 +279,14 @@ nsSiteSecurityService::GetHost(nsIURI* aURI, nsACString& aResult)
nsAutoCString host;
nsresult rv = innerURI->GetAsciiHost(host);
if (NS_FAILED(rv) || host.IsEmpty()) {
return NS_ERROR_UNEXPECTED;
if (NS_FAILED(rv)) {
return rv;
}
aResult.Assign(PublicKeyPinningService::CanonicalizeHostname(host.get()));
if (aResult.IsEmpty()) {
return NS_ERROR_UNEXPECTED;
}
return NS_OK;
}

11
security/manager/ssl/tests/unit/test_sts_fqdn.js
View File

@ -42,4 +42,15 @@ function run_test() {
"example.com.", 0));
do_check_false(SSService.isSecureHost(Ci.nsISiteSecurityService.HEADER_HSTS,
"example.com..", 0));
// Somehow creating this malformed URI succeeds - we need to handle it
// gracefully.
uri = Services.io.newURI("https://../foo", null, null);
do_check_eq(uri.host, "..");
try {
SSService.isSecureURI(Ci.nsISiteSecurityService.HEADER_HSTS, uri, 0);
do_check_false(true); // this shouldn't run
} catch (e) {
do_check_eq(e.result, Cr.NS_ERROR_UNEXPECTED);
}
}