Bug 541739 - Flaws in download cancellation checks when switching the private browsing mode; r=sdwilsh

This commit is contained in:
Ehsan Akhgari 2010-01-26 20:28:51 -05:00
Родитель 8e0750463a
Коммит fd1cfaa6ee
2 изменённых файлов: 307 добавлений и 13 удалений

Просмотреть файл

@ -897,14 +897,15 @@ nsDownloadManager::Init()
// These observers will be cleaned up automatically at app shutdown. We do
// not bother explicitly breaking the observers because we are a singleton
// that lives for the duration of the app.
mObserverService->AddObserver(this, "quit-application", PR_FALSE);
mObserverService->AddObserver(this, "quit-application-requested", PR_FALSE);
mObserverService->AddObserver(this, "offline-requested", PR_FALSE);
mObserverService->AddObserver(this, "sleep_notification", PR_FALSE);
mObserverService->AddObserver(this, "wake_notification", PR_FALSE);
mObserverService->AddObserver(this, NS_IOSERVICE_GOING_OFFLINE_TOPIC, PR_FALSE);
mObserverService->AddObserver(this, NS_IOSERVICE_OFFLINE_STATUS_TOPIC, PR_FALSE);
mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, PR_FALSE);
(void)mObserverService->AddObserver(this, "quit-application", PR_FALSE);
(void)mObserverService->AddObserver(this, "quit-application-requested", PR_FALSE);
(void)mObserverService->AddObserver(this, "offline-requested", PR_FALSE);
(void)mObserverService->AddObserver(this, "sleep_notification", PR_FALSE);
(void)mObserverService->AddObserver(this, "wake_notification", PR_FALSE);
(void)mObserverService->AddObserver(this, NS_IOSERVICE_GOING_OFFLINE_TOPIC, PR_FALSE);
(void)mObserverService->AddObserver(this, NS_IOSERVICE_OFFLINE_STATUS_TOPIC, PR_FALSE);
(void)mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_REQUEST_TOPIC, PR_FALSE);
(void)mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, PR_FALSE);
if (history)
(void)history->AddObserver(this, PR_FALSE);
@ -1986,9 +1987,9 @@ nsDownloadManager::Observe(nsISupports *aSubject,
this, resumeOnWakeDelay, nsITimer::TYPE_ONE_SHOT);
}
}
else if (strcmp(aTopic, NS_PRIVATE_BROWSING_REQUEST_TOPIC) == 0 &&
currDownloadCount) {
if (NS_LITERAL_STRING(NS_PRIVATE_BROWSING_ENTER).Equals(aData)) {
else if (strcmp(aTopic, NS_PRIVATE_BROWSING_REQUEST_TOPIC) == 0) {
if (NS_LITERAL_STRING(NS_PRIVATE_BROWSING_ENTER).Equals(aData) &&
currDownloadCount) {
nsCOMPtr<nsISupportsPRBool> cancelDownloads =
do_QueryInterface(aSubject, &rv);
NS_ENSURE_SUCCESS(rv, rv);
@ -1998,11 +1999,12 @@ nsDownloadManager::Observe(nsISupports *aSubject,
NS_LITERAL_STRING("enterPrivateBrowsingCancelDownloadsAlertMsg").get(),
NS_LITERAL_STRING("dontEnterPrivateBrowsingButton").get());
}
else if (NS_LITERAL_STRING(NS_PRIVATE_BROWSING_LEAVE).Equals(aData)) {
else if (NS_LITERAL_STRING(NS_PRIVATE_BROWSING_LEAVE).Equals(aData) &&
mCurrentDownloads.Count()) {
nsCOMPtr<nsISupportsPRBool> cancelDownloads =
do_QueryInterface(aSubject, &rv);
NS_ENSURE_SUCCESS(rv, rv);
ConfirmCancelDownloads(currDownloadCount, cancelDownloads,
ConfirmCancelDownloads(mCurrentDownloads.Count(), cancelDownloads,
NS_LITERAL_STRING("leavePrivateBrowsingCancelDownloadsAlertTitle").get(),
NS_LITERAL_STRING("leavePrivateBrowsingCancelDownloadsAlertMsgMultiple").get(),
NS_LITERAL_STRING("leavePrivateBrowsingCancelDownloadsAlertMsg").get(),

Просмотреть файл

@ -0,0 +1,292 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the spefic language governing rights and limitations under the
* License.
*
* The Original Code is Private Browsing Tests.
*
* The Initial Developer of the Original Code is Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Ehsan Akhgari <ehsan@mozilla.com> (Original Author)
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
Make sure that the download manager service is given a chance to cancel the
private browisng mode transition.
**/
const Cm = Components.manager;
const kPromptServiceUUID = "{6cc9c9fe-bc0b-432b-a410-253ef8bcc699}";
const kPromptServiceContractID = "@mozilla.org/embedcomp/prompt-service;1";
// Save original prompt service factory
const kPromptServiceFactory = Cm.getClassObject(Cc[kPromptServiceContractID],
Ci.nsIFactory);
let fakePromptServiceFactory = {
createInstance: function(aOuter, aIid) {
if (aOuter != null)
throw Cr.NS_ERROR_NO_AGGREGATION;
return promptService.QueryInterface(aIid);
}
};
let promptService = {
_buttonChoice: 0,
_called: false,
wasCalled: function() {
let called = this._called;
this._called = false;
return called;
},
sayCancel: function() {
this._buttonChoice = 1;
this._called = false;
},
sayProceed: function() {
this._buttonChoice = 0;
this._called = false;
},
QueryInterface: function(aIID) {
if (aIID.equals(Ci.nsIPromptService) ||
aIID.equals(Ci.nsISupports)) {
return this;
}
throw Cr.NS_ERROR_NO_INTERFACE;
},
confirmEx: function(parent, title, text, buttonFlags,
button0Title, button1Title, button2Title,
checkMsg, checkState) {
this._called = true;
return this._buttonChoice;
}
};
Cm.QueryInterface(Ci.nsIComponentRegistrar)
.registerFactory(Components.ID(kPromptServiceUUID), "Prompt Service",
kPromptServiceContractID, fakePromptServiceFactory);
this.__defineGetter__("pb", function () {
delete this.pb;
try {
return this.pb = Cc["@mozilla.org/privatebrowsing;1"].
getService(Ci.nsIPrivateBrowsingService);
} catch (e) {}
return this.pb = null;
});
this.__defineGetter__("dm", function() {
delete this.dm;
return this.dm = Cc["@mozilla.org/download-manager;1"].
getService(Ci.nsIDownloadManager);
});
function run_test() {
if (!pb) // Private Browsing might not be available
return;
function finishTest() {
// Cancel Download-E
dm.cancelDownload(dlE.id);
dm.removeDownload(dlE.id);
dm.cleanUp();
do_check_eq(dm.activeDownloadCount, 0);
prefBranch.clearUserPref("browser.privatebrowsing.keep_current_session");
dm.removeListener(listener);
httpserv.stop(do_test_finished);
// Unregister the factory so we do not leak
Cm.QueryInterface(Ci.nsIComponentRegistrar)
.unregisterFactory(Components.ID(kPromptServiceUUID),
fakePromptServiceFactory);
// Restore the original factory
Cm.QueryInterface(Ci.nsIComponentRegistrar)
.registerFactory(Components.ID(kPromptServiceUUID), "Prompt Service",
kPromptServiceContractID, kPromptServiceFactory);
}
let prefBranch = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
prefBranch.setBoolPref("browser.privatebrowsing.keep_current_session", true);
do_test_pending();
let httpserv = new nsHttpServer();
httpserv.registerDirectory("/file/", do_get_cwd());
httpserv.registerPathHandler("/noresume", function (meta, response) {
response.setHeader("Content-Type", "text/html", false);
response.setHeader("Accept-Ranges", "none", false);
response.write("foo");
});
httpserv.start(4444);
let tmpDir = Cc["@mozilla.org/file/directory_service;1"].
getService(Ci.nsIProperties).
get("TmpD", Ci.nsIFile);
// make sure we're starting with an empty DB
do_check_eq(dm.activeDownloadCount, 0);
let listener = {
onDownloadStateChange: function(aState, aDownload)
{
switch (aDownload.state) {
case dm.DOWNLOAD_QUEUED:
case dm.DOWNLOAD_DOWNLOADING:
if (aDownload.targetFile.equals(dlD.targetFile)) {
// Sanity check: Download-D must not be resumable
do_check_false(dlD.resumable);
// Cancel the transition
promptService.sayCancel();
// Enter private browsing mode immediately
pb.privateBrowsingEnabled = true;
do_check_true(promptService.wasCalled());
do_check_false(pb.privateBrowsingEnabled); // transition was canceled
// Check that Download-D status has not changed
do_check_neq(dlD.state, dm.DOWNLOAD_PAUSED);
// proceed with the transition
promptService.sayProceed();
// Try to enter the private browsing mode again
pb.privateBrowsingEnabled = true;
do_check_true(promptService.wasCalled());
do_check_true(pb.privateBrowsingEnabled);
// Check that Download-D is canceled and not accessible
do_check_eq(dlD.state, dm.DOWNLOAD_CANCELED);
// Exit private browsing mode
pb.privateBrowsingEnabled = false;
do_check_false(pb.privateBrowsingEnabled);
// Create Download-E
dlE = addDownload({
targetFile: fileE,
sourceURI: downloadESource,
downloadName: downloadEName
});
// Wait for Download-E to start
} else if (aDownload.targetFile.equals(dlE.targetFile)) {
// Sanity check: Download-E must be resumable
do_check_true(dlE.resumable);
// Enter the private browsing mode
pb.privateBrowsingEnabled = true;
do_check_false(promptService.wasCalled());
do_check_true(pb.privateBrowsingEnabled);
// Create Download-F
dlF = addDownload({
targetFile: fileF,
sourceURI: downloadFSource,
downloadName: downloadFName
});
// Wait for Download-F to start
} else if (aDownload.targetFile.equals(dlF.targetFile)) {
// Sanity check: Download-F must be resumable
do_check_true(dlF.resumable);
// Cancel the transition
promptService.sayCancel();
// Exit private browsing mode immediately
pb.privateBrowsingEnabled = false;
do_check_true(promptService.wasCalled());
do_check_true(pb.privateBrowsingEnabled); // transition was canceled
// Check that Download-F status has not changed
do_check_neq(dlF.state, dm.DOWNLOAD_PAUSED);
// proceed with the transition
promptService.sayProceed();
// Try to exit the private browsing mode again
pb.privateBrowsingEnabled = false;
do_check_true(promptService.wasCalled());
do_check_false(pb.privateBrowsingEnabled);
// Check that Download-F is canceled and not accessible
do_check_eq(dlF.state, dm.DOWNLOAD_PAUSED);
finishTest();
}
break;
}
},
onStateChange: function(a, b, c, d, e) { },
onProgressChange: function(a, b, c, d, e, f, g) { },
onSecurityChange: function(a, b, c, d) { }
};
dm.addListener(listener);
// properties of Download-D
const downloadDSource = "http://localhost:4444/noresume";
const downloadDDest = "download-file-D";
const downloadDName = "download-D";
// properties of Download-E
const downloadESource = "http://localhost:4444/file/head_download_manager.js";
const downloadEDest = "download-file-E";
const downloadEName = "download-E";
// properties of Download-F
const downloadFSource = "http://localhost:4444/file/test_privatebrowsing_cancel.js";
const downloadFDest = "download-file-F";
const downloadFName = "download-F";
// Create all target files
let fileD = tmpDir.clone();
fileD.append(downloadDDest);
fileD.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
let fileE = tmpDir.clone();
fileE.append(downloadEDest);
fileE.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
let fileF = tmpDir.clone();
fileF.append(downloadFDest);
fileF.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
// Create Download-D
let dlD = addDownload({
targetFile: fileD,
sourceURI: downloadDSource,
downloadName: downloadDName
});
downloadD = dlD.id;
let dlE, dlF;
// wait for Download-D to start
}