diff --git a/browser/base/content/sanitize.js b/browser/base/content/sanitize.js index 771783e69eba..5c3aa05e9369 100644 --- a/browser/base/content/sanitize.js +++ b/browser/base/content/sanitize.js @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "DownloadsCommon", "resource:///modules/DownloadsCommon.jsm"); - + function Sanitizer() {} Sanitizer.prototype = { // warning to the caller: this one may raise an exception (e.g. bug #265028) @@ -37,14 +37,14 @@ Sanitizer.prototype = { aCallback(aItemName, canClear, aArg); return canClear; }, - + prefDomain: "", - + getNameFromPreference: function (aPreferenceName) { return aPreferenceName.substr(this.prefDomain.length); }, - + /** * Deletes privacy sensitive data in a batch, according to user preferences. * Returns a promise which is resolved if no errors occurred. If an error @@ -87,7 +87,8 @@ Sanitizer.prototype = { item.clear(); } catch(er) { seenError = true; - Cu.reportError("Error sanitizing " + itemName + ": " + er + "\n"); + Components.utils.reportError("Error sanitizing " + itemName + + ": " + er + "\n"); } onItemComplete(); }; @@ -99,7 +100,7 @@ Sanitizer.prototype = { return deferred.promise; }, - + // Time span only makes sense in certain cases. Consumers who want // to only clear some private data can opt in by setting this to false, // and can optionally specify a specific range. If timespan is not ignored, @@ -107,7 +108,7 @@ Sanitizer.prototype = { // pref to determine a range ignoreTimespan : true, range : null, - + items: { cache: { clear: function () @@ -126,13 +127,13 @@ Sanitizer.prototype = { imageCache.clearCache(false); // true=chrome, false=content } catch(er) {} }, - + get canClear() { return true; } }, - + cookies: { clear: function () { @@ -143,7 +144,7 @@ Sanitizer.prototype = { var cookiesEnum = cookieMgr.enumerator; while (cookiesEnum.hasMoreElements()) { var cookie = cookiesEnum.getNext().QueryInterface(Ci.nsICookie2); - + if (cookie.creationTime > this.range[0]) // This cookie was created after our cutoff, clear it cookieMgr.remove(cookie.host, cookie.name, cookie.path, false); @@ -211,14 +212,14 @@ Sanitizer.prototype = { PlacesUtils.history.removeVisitsByTimeframe(this.range[0], this.range[1]); else PlacesUtils.history.removeAllPages(); - + try { var os = Components.classes["@mozilla.org/observer-service;1"] .getService(Components.interfaces.nsIObserverService); os.notifyObservers(null, "browser:purge-session-history", ""); } catch (e) { } - + // Clear last URL of the Open Web Location dialog var prefs = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch); @@ -227,7 +228,7 @@ Sanitizer.prototype = { } catch (e) { } }, - + get canClear() { // bug 347231: Always allow clearing history due to dependencies on @@ -235,7 +236,7 @@ Sanitizer.prototype = { return true; } }, - + formdata: { clear: function () { @@ -305,15 +306,20 @@ Sanitizer.prototype = { return false; } }, - + downloads: { clear: function () { if (DownloadsCommon.useJSTransfer) { Task.spawn(function () { - let filterByTime = this.range ? - (download => download.startTime >= this.range[0] && - download.startTime <= this.range[1]) : null; + let filterByTime = null; + if (this.range) { + // Convert microseconds back to milliseconds for date comparisons. + let rangeBeginMs = this.range[0] / 1000; + let rangeEndMs = this.range[1] / 1000; + filterByTime = download => download.startTime >= rangeBeginMs && + download.startTime <= rangeEndMs; + } // Clear all completed/cancelled downloads let publicList = yield Downloads.getPublicDownloadList(); @@ -321,7 +327,7 @@ Sanitizer.prototype = { let privateList = yield Downloads.getPrivateDownloadList(); privateList.removeFinished(filterByTime); - }.bind(this)).then(null, Cu.reportError); + }.bind(this)).then(null, Components.utils.reportError); } else { var dlMgr = Components.classes["@mozilla.org/download-manager;1"] @@ -352,7 +358,7 @@ Sanitizer.prototype = { return false; } }, - + passwords: { clear: function () { @@ -361,7 +367,7 @@ Sanitizer.prototype = { // Passwords are timeless, and don't respect the timeSpan setting pwmgr.removeAllLogins(); }, - + get canClear() { var pwmgr = Components.classes["@mozilla.org/login-manager;1"] @@ -370,7 +376,7 @@ Sanitizer.prototype = { return (count > 0); } }, - + sessions: { clear: function () { @@ -384,13 +390,13 @@ Sanitizer.prototype = { .getService(Components.interfaces.nsIObserverService); os.notifyObservers(null, "net:clear-active-logins", null); }, - + get canClear() { return true; } }, - + siteSettings: { clear: function () { @@ -398,12 +404,12 @@ Sanitizer.prototype = { var pm = Components.classes["@mozilla.org/permissionmanager;1"] .getService(Components.interfaces.nsIPermissionManager); pm.removeAll(); - + // Clear site-specific settings like page-zoom level var cps = Components.classes["@mozilla.org/content-pref/service;1"] .getService(Components.interfaces.nsIContentPrefService2); cps.removeAllDomains(null); - + // Clear "Never remember passwords for this site", which is not handled by // the permission manager var pwmgr = Components.classes["@mozilla.org/login-manager;1"] @@ -413,7 +419,7 @@ Sanitizer.prototype = { pwmgr.setLoginSavingEnabled(host, true); } }, - + get canClear() { return true; @@ -446,7 +452,7 @@ Sanitizer.getClearRange = function (ts) { ts = Sanitizer.prefs.getIntPref("timeSpan"); if (ts === Sanitizer.TIMESPAN_EVERYTHING) return null; - + // PRTime is microseconds while JS time is milliseconds var endDate = Date.now() * 1000; switch (ts) { @@ -473,7 +479,7 @@ Sanitizer.getClearRange = function (ts) { }; Sanitizer._prefs = null; -Sanitizer.__defineGetter__("prefs", function() +Sanitizer.__defineGetter__("prefs", function() { return Sanitizer._prefs ? Sanitizer._prefs : Sanitizer._prefs = Components.classes["@mozilla.org/preferences-service;1"] @@ -482,7 +488,7 @@ Sanitizer.__defineGetter__("prefs", function() }); // Shows sanitization UI -Sanitizer.showUI = function(aParentWindow) +Sanitizer.showUI = function(aParentWindow) { var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] .getService(Components.interfaces.nsIWindowWatcher); @@ -497,32 +503,32 @@ Sanitizer.showUI = function(aParentWindow) null); }; -/** - * Deletes privacy sensitive data in a batch, optionally showing the +/** + * Deletes privacy sensitive data in a batch, optionally showing the * sanitize UI, according to user preferences */ -Sanitizer.sanitize = function(aParentWindow) +Sanitizer.sanitize = function(aParentWindow) { Sanitizer.showUI(aParentWindow); }; -Sanitizer.onStartup = function() +Sanitizer.onStartup = function() { // we check for unclean exit with pending sanitization Sanitizer._checkAndSanitize(); }; -Sanitizer.onShutdown = function() +Sanitizer.onShutdown = function() { // we check if sanitization is needed and perform it Sanitizer._checkAndSanitize(); }; // this is called on startup and shutdown, to perform pending sanitizations -Sanitizer._checkAndSanitize = function() +Sanitizer._checkAndSanitize = function() { const prefs = Sanitizer.prefs; - if (prefs.getBoolPref(Sanitizer.prefShutdown) && + if (prefs.getBoolPref(Sanitizer.prefShutdown) && !prefs.prefHasUserValue(Sanitizer.prefDidShutdown)) { // this is a shutdown or a startup after an unclean exit var s = new Sanitizer(); diff --git a/browser/base/content/test/browser_sanitize-timespans.js b/browser/base/content/test/browser_sanitize-timespans.js index 6c6fb059b9fa..e470b22cc617 100644 --- a/browser/base/content/test/browser_sanitize-timespans.js +++ b/browser/base/content/test/browser_sanitize-timespans.js @@ -2,10 +2,10 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); // Bug 453440 - Test the timespan-based logic of the sanitizer code -var now_uSec = Date.now() * 1000; - -const dm = Cc["@mozilla.org/download-manager;1"].getService(Ci.nsIDownloadManager); +let now_mSec = Date.now(); +let now_uSec = now_mSec * 1000; +const kMsecPerMin = 60 * 1000; const kUsecPerMin = 60 * 1000000; let tempScope = {}; @@ -14,6 +14,7 @@ Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader) let Sanitizer = tempScope.Sanitizer; let FormHistory = (Components.utils.import("resource://gre/modules/FormHistory.jsm", {})).FormHistory; +let Downloads = (Components.utils.import("resource://gre/modules/Downloads.jsm", {})).Downloads; function promiseFormHistoryRemoved() { let deferred = Promise.defer(); @@ -24,15 +25,30 @@ function promiseFormHistoryRemoved() { return deferred.promise; } +function promiseDownloadRemoved(list) { + let deferred = Promise.defer(); + + let view = { + onDownloadRemoved: function(download) { + list.removeView(view); + deferred.resolve(); + } + }; + + list.addView(view); + + return deferred.promise; +} + function test() { waitForExplicitFinish(); Task.spawn(function() { - setupDownloads(); + yield setupDownloads(); yield setupFormHistory(); yield setupHistory(); yield onHistoryReady(); - }).then(finish); + }).then(null, ex => ok(false, ex)).then(finish); } function countEntries(name, message, check) { @@ -80,12 +96,16 @@ function onHistoryReady() { itemPrefs.setBoolPref("sessions", false); itemPrefs.setBoolPref("siteSettings", false); + let publicList = yield Downloads.getPublicDownloadList(); + let downloadPromise = promiseDownloadRemoved(publicList); + // Clear 10 minutes ago s.range = [now_uSec - 10*60*1000000, now_uSec]; s.sanitize(); s.range = null; yield promiseFormHistoryRemoved(); + yield downloadPromise; ok(!(yield promiseIsURIVisited(makeURI("http://10minutes.com"))), "Pretend visit to 10minutes.com should now be deleted"); @@ -122,23 +142,26 @@ function onHistoryReady() { yield countEntries("today", "today form entry should still exist", checkOne); yield countEntries("b4today", "b4today form entry should still exist", checkOne); - ok(!downloadExists(5555555), "10 minute download should now be deleted"); - ok(downloadExists(5555551), "<1 hour download should still be present"); - ok(downloadExists(5555556), "1 hour 10 minute download should still be present"); - ok(downloadExists(5555550), "Year old download should still be present"); - ok(downloadExists(5555552), "<2 hour old download should still be present"); - ok(downloadExists(5555557), "2 hour 10 minute download should still be present"); - ok(downloadExists(5555553), "<4 hour old download should still be present"); - ok(downloadExists(5555558), "4 hour 10 minute download should still be present"); + ok(!(yield downloadExists(publicList, "fakefile-10-minutes")), "10 minute download should now be deleted"); + ok((yield downloadExists(publicList, "fakefile-1-hour")), "<1 hour download should still be present"); + ok((yield downloadExists(publicList, "fakefile-1-hour-10-minutes")), "1 hour 10 minute download should still be present"); + ok((yield downloadExists(publicList, "fakefile-old")), "Year old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-2-hour")), "<2 hour old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-2-hour-10-minutes")), "2 hour 10 minute download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour")), "<4 hour old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour-10-minutes")), "4 hour 10 minute download should still be present"); if (minutesSinceMidnight > 10) - ok(downloadExists(5555554), "'Today' download should still be present"); + ok((yield downloadExists(publicList, "fakefile-today")), "'Today' download should still be present"); + + downloadPromise = promiseDownloadRemoved(publicList); // Clear 1 hour Sanitizer.prefs.setIntPref("timeSpan", 1); s.sanitize(); yield promiseFormHistoryRemoved(); + yield downloadPromise; ok(!(yield promiseIsURIVisited(makeURI("http://1hour.com"))), "Pretend visit to 1hour.com should now be deleted"); @@ -169,23 +192,26 @@ function onHistoryReady() { yield countEntries("today", "today form entry should still exist", checkOne); yield countEntries("b4today", "b4today form entry should still exist", checkOne); - ok(!downloadExists(5555551), "<1 hour download should now be deleted"); - ok(downloadExists(5555556), "1 hour 10 minute download should still be present"); - ok(downloadExists(5555550), "Year old download should still be present"); - ok(downloadExists(5555552), "<2 hour old download should still be present"); - ok(downloadExists(5555557), "2 hour 10 minute download should still be present"); - ok(downloadExists(5555553), "<4 hour old download should still be present"); - ok(downloadExists(5555558), "4 hour 10 minute download should still be present"); + ok(!(yield downloadExists(publicList, "fakefile-1-hour")), "<1 hour download should now be deleted"); + ok((yield downloadExists(publicList, "fakefile-1-hour-10-minutes")), "1 hour 10 minute download should still be present"); + ok((yield downloadExists(publicList, "fakefile-old")), "Year old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-2-hour")), "<2 hour old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-2-hour-10-minutes")), "2 hour 10 minute download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour")), "<4 hour old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour-10-minutes")), "4 hour 10 minute download should still be present"); if (hoursSinceMidnight > 1) - ok(downloadExists(5555554), "'Today' download should still be present"); + ok((yield downloadExists(publicList, "fakefile-today")), "'Today' download should still be present"); + downloadPromise = promiseDownloadRemoved(publicList); + // Clear 1 hour 10 minutes s.range = [now_uSec - 70*60*1000000, now_uSec]; s.sanitize(); s.range = null; yield promiseFormHistoryRemoved(); + yield downloadPromise; ok(!(yield promiseIsURIVisited(makeURI("http://1hour10minutes.com"))), "Pretend visit to 1hour10minutes.com should now be deleted"); @@ -213,20 +239,23 @@ function onHistoryReady() { yield countEntries("today", "today form entry should still exist", checkOne); yield countEntries("b4today", "b4today form entry should still exist", checkOne); - ok(!downloadExists(5555556), "1 hour 10 minute old download should now be deleted"); - ok(downloadExists(5555550), "Year old download should still be present"); - ok(downloadExists(5555552), "<2 hour old download should still be present"); - ok(downloadExists(5555557), "2 hour 10 minute download should still be present"); - ok(downloadExists(5555553), "<4 hour old download should still be present"); - ok(downloadExists(5555558), "4 hour 10 minute download should still be present"); + ok(!(yield downloadExists(publicList, "fakefile-1-hour-10-minutes")), "1 hour 10 minute old download should now be deleted"); + ok((yield downloadExists(publicList, "fakefile-old")), "Year old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-2-hour")), "<2 hour old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-2-hour-10-minutes")), "2 hour 10 minute download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour")), "<4 hour old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour-10-minutes")), "4 hour 10 minute download should still be present"); if (minutesSinceMidnight > 70) - ok(downloadExists(5555554), "'Today' download should still be present"); + ok((yield downloadExists(publicList, "fakefile-today")), "'Today' download should still be present"); + + downloadPromise = promiseDownloadRemoved(publicList); // Clear 2 hours Sanitizer.prefs.setIntPref("timeSpan", 2); s.sanitize(); yield promiseFormHistoryRemoved(); + yield downloadPromise; ok(!(yield promiseIsURIVisited(makeURI("http://2hour.com"))), "Pretend visit to 2hour.com should now be deleted"); @@ -251,20 +280,23 @@ function onHistoryReady() { yield countEntries("today", "today form entry should still exist", checkOne); yield countEntries("b4today", "b4today form entry should still exist", checkOne); - ok(!downloadExists(5555552), "<2 hour old download should now be deleted"); - ok(downloadExists(5555550), "Year old download should still be present"); - ok(downloadExists(5555557), "2 hour 10 minute download should still be present"); - ok(downloadExists(5555553), "<4 hour old download should still be present"); - ok(downloadExists(5555558), "4 hour 10 minute download should still be present"); + ok(!(yield downloadExists(publicList, "fakefile-2-hour")), "<2 hour old download should now be deleted"); + ok((yield downloadExists(publicList, "fakefile-old")), "Year old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-2-hour-10-minutes")), "2 hour 10 minute download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour")), "<4 hour old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour-10-minutes")), "4 hour 10 minute download should still be present"); if (hoursSinceMidnight > 2) - ok(downloadExists(5555554), "'Today' download should still be present"); + ok((yield downloadExists(publicList, "fakefile-today")), "'Today' download should still be present"); + downloadPromise = promiseDownloadRemoved(publicList); + // Clear 2 hours 10 minutes s.range = [now_uSec - 130*60*1000000, now_uSec]; s.sanitize(); s.range = null; yield promiseFormHistoryRemoved(); + yield downloadPromise; ok(!(yield promiseIsURIVisited(makeURI("http://2hour10minutes.com"))), "Pretend visit to 2hour10minutes.com should now be deleted"); @@ -286,18 +318,21 @@ function onHistoryReady() { yield countEntries("today", "today form entry should still exist", checkOne); yield countEntries("b4today", "b4today form entry should still exist", checkOne); - ok(!downloadExists(5555557), "2 hour 10 minute old download should now be deleted"); - ok(downloadExists(5555553), "<4 hour old download should still be present"); - ok(downloadExists(5555558), "4 hour 10 minute download should still be present"); - ok(downloadExists(5555550), "Year old download should still be present"); + ok(!(yield downloadExists(publicList, "fakefile-2-hour-10-minutes")), "2 hour 10 minute old download should now be deleted"); + ok((yield downloadExists(publicList, "fakefile-4-hour")), "<4 hour old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-4-hour-10-minutes")), "4 hour 10 minute download should still be present"); + ok((yield downloadExists(publicList, "fakefile-old")), "Year old download should still be present"); if (minutesSinceMidnight > 130) - ok(downloadExists(5555554), "'Today' download should still be present"); + ok((yield downloadExists(publicList, "fakefile-today")), "'Today' download should still be present"); + + downloadPromise = promiseDownloadRemoved(publicList); // Clear 4 hours Sanitizer.prefs.setIntPref("timeSpan", 3); s.sanitize(); yield promiseFormHistoryRemoved(); + yield downloadPromise; ok(!(yield promiseIsURIVisited(makeURI("http://4hour.com"))), "Pretend visit to 4hour.com should now be deleted"); @@ -316,11 +351,13 @@ function onHistoryReady() { yield countEntries("today", "today form entry should still exist", checkOne); yield countEntries("b4today", "b4today form entry should still exist", checkOne); - ok(!downloadExists(5555553), "<4 hour old download should now be deleted"); - ok(downloadExists(5555558), "4 hour 10 minute download should still be present"); - ok(downloadExists(5555550), "Year old download should still be present"); + ok(!(yield downloadExists(publicList, "fakefile-4-hour")), "<4 hour old download should now be deleted"); + ok((yield downloadExists(publicList, "fakefile-4-hour-10-minutes")), "4 hour 10 minute download should still be present"); + ok((yield downloadExists(publicList, "fakefile-old")), "Year old download should still be present"); if (hoursSinceMidnight > 4) - ok(downloadExists(5555554), "'Today' download should still be present"); + ok((yield downloadExists(publicList, "fakefile-today")), "'Today' download should still be present"); + + downloadPromise = promiseDownloadRemoved(publicList); // Clear 4 hours 10 minutes s.range = [now_uSec - 250*60*1000000, now_uSec]; @@ -328,6 +365,7 @@ function onHistoryReady() { s.range = null; yield promiseFormHistoryRemoved(); + yield downloadPromise; ok(!(yield promiseIsURIVisited(makeURI("http://4hour10minutes.com"))), "Pretend visit to 4hour10minutes.com should now be deleted"); @@ -343,48 +381,60 @@ function onHistoryReady() { yield countEntries("today", "today form entry should still exist", checkOne); yield countEntries("b4today", "b4today form entry should still exist", checkOne); - ok(!downloadExists(5555558), "4 hour 10 minute download should now be deleted"); - ok(downloadExists(5555550), "Year old download should still be present"); + ok(!(yield downloadExists(publicList, "fakefile-4-hour-10-minutes")), "4 hour 10 minute download should now be deleted"); + ok((yield downloadExists(publicList, "fakefile-old")), "Year old download should still be present"); if (minutesSinceMidnight > 250) - ok(downloadExists(5555554), "'Today' download should still be present"); + ok((yield downloadExists(publicList, "fakefile-today")), "'Today' download should still be present"); + + // The 'Today' download might have been already deleted, in which case we + // should not wait for a download removal notification. + if (minutesSinceMidnight > 250) { + downloadPromise = promiseDownloadRemoved(publicList); + } else { + downloadPromise = Promise.resolve(); + } // Clear Today Sanitizer.prefs.setIntPref("timeSpan", 4); s.sanitize(); yield promiseFormHistoryRemoved(); + yield downloadPromise; // Be careful. If we add our objectss just before midnight, and sanitize // runs immediately after, they won't be expired. This is expected, but // we should not test in that case. We cannot just test for opposite // condition because we could cross midnight just one moment after we // cache our time, then we would have an even worse random failure. - var today = isToday(new Date(now_uSec/1000)); + var today = isToday(new Date(now_mSec)); if (today) { ok(!(yield promiseIsURIVisited(makeURI("http://today.com"))), "Pretend visit to today.com should now be deleted"); yield countEntries("today", "today form entry should be deleted", checkZero); - ok(!downloadExists(5555554), "'Today' download should now be deleted"); + ok(!(yield downloadExists(publicList, "fakefile-today")), "'Today' download should now be deleted"); } ok((yield promiseIsURIVisited(makeURI("http://before-today.com"))), "Pretend visit to before-today.com should still exist"); yield countEntries("b4today", "b4today form entry should still exist", checkOne); - ok(downloadExists(5555550), "Year old download should still be present"); + ok((yield downloadExists(publicList, "fakefile-old")), "Year old download should still be present"); + + downloadPromise = promiseDownloadRemoved(publicList); // Choose everything Sanitizer.prefs.setIntPref("timeSpan", 0); s.sanitize(); yield promiseFormHistoryRemoved(); + yield downloadPromise; ok(!(yield promiseIsURIVisited(makeURI("http://before-today.com"))), "Pretend visit to before-today.com should now be deleted"); yield countEntries("b4today", "b4today form entry should be deleted", checkZero); - ok(!downloadExists(5555550), "Year old download should now be deleted"); + ok(!(yield downloadExists(publicList, "fakefile-old")), "Year old download should now be deleted"); } function setupHistory() { @@ -562,227 +612,103 @@ function setupFormHistory() { function setupDownloads() { - // Add 10-minutes download to DB - let data = { - id: "5555555", - name: "fakefile-10-minutes", - source: "https://bugzilla.mozilla.org/show_bug.cgi?id=480169", - target: "fakefile-10-minutes", - startTime: now_uSec - 10 * kUsecPerMin, // 10 minutes ago, in uSec - endTime: now_uSec - 11 * kUsecPerMin, // 1 minute later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "a1bcD23eF4g5" - }; + let publicList = yield Downloads.getPublicDownloadList(); - let db = dm.DBConnection; - let stmt = db.createStatement( - "INSERT INTO moz_downloads (id, name, source, target, startTime, endTime, " + - "state, currBytes, maxBytes, preferredAction, autoResume, guid) " + - "VALUES (:id, :name, :source, :target, :startTime, :endTime, :state, " + - ":currBytes, :maxBytes, :preferredAction, :autoResume, :guid)"); - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.reset(); - } - - // Add within-1-hour download to DB - data = { - id: "5555551", - name: "fakefile-1-hour", + let download = yield Downloads.createDownload({ + source: "https://bugzilla.mozilla.org/show_bug.cgi?id=480169", + target: "fakefile-10-minutes" + }); + download.startTime = new Date(now_mSec - 10 * kMsecPerMin), // 10 minutes ago + download.canceled = true; + publicList.add(download); + + download = yield Downloads.createDownload({ source: "https://bugzilla.mozilla.org/show_bug.cgi?id=453440", - target: "fakefile-1-hour", - startTime: now_uSec - 45 * kUsecPerMin, // 45 minutes ago, in uSec - endTime: now_uSec - 44 * kUsecPerMin, // 1 minute later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "1bcD23eF4g5a" - }; + target: "fakefile-1-hour" + }); + download.startTime = new Date(now_mSec - 45 * kMsecPerMin), // 45 minutes ago + download.canceled = true; + publicList.add(download); - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.reset(); - } - - // Add 1-hour-10-minutes download to DB - data = { - id: "5555556", - name: "fakefile-1-hour-10-minutes", + download = yield Downloads.createDownload({ source: "https://bugzilla.mozilla.org/show_bug.cgi?id=480169", - target: "fakefile-1-hour-10-minutes", - startTime: now_uSec - 70 * kUsecPerMin, // 70 minutes ago, in uSec - endTime: now_uSec - 71 * kUsecPerMin, // 1 minute later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "a1cbD23e4Fg5" - }; + target: "fakefile-1-hour-10-minutes" + }); + download.startTime = new Date(now_mSec - 70 * kMsecPerMin), // 70 minutes ago + download.canceled = true; + publicList.add(download); - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.reset(); - } - - // Add within-2-hour download - data = { - id: "5555552", - name: "fakefile-2-hour", + download = yield Downloads.createDownload({ source: "https://bugzilla.mozilla.org/show_bug.cgi?id=453440", - target: "fakefile-2-hour", - startTime: now_uSec - 90 * kUsecPerMin, // 90 minutes ago, in uSec - endTime: now_uSec - 89 * kUsecPerMin, // 1 minute later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "b1aDc23eFg54" - }; + target: "fakefile-2-hour" + }); + download.startTime = new Date(now_mSec - 90 * kMsecPerMin), // 90 minutes ago + download.canceled = true; + publicList.add(download); - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.reset(); - } - - // Add 2-hour-10-minutes download - data = { - id: "5555557", - name: "fakefile-2-hour-10-minutes", + download = yield Downloads.createDownload({ source: "https://bugzilla.mozilla.org/show_bug.cgi?id=480169", - target: "fakefile-2-hour-10-minutes", - startTime: now_uSec - 130 * kUsecPerMin, // 130 minutes ago, in uSec - endTime: now_uSec - 131 * kUsecPerMin, // 1 minute later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "z1bcD23eF4g5" - }; + target: "fakefile-2-hour-10-minutes" + }); + download.startTime = new Date(now_mSec - 130 * kMsecPerMin), // 130 minutes ago + download.canceled = true; + publicList.add(download); - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.reset(); - } - - // Add within-4-hour download - data = { - id: "5555553", - name: "fakefile-4-hour", + download = yield Downloads.createDownload({ source: "https://bugzilla.mozilla.org/show_bug.cgi?id=453440", - target: "fakefile-4-hour", - startTime: now_uSec - 180 * kUsecPerMin, // 180 minutes ago, in uSec - endTime: now_uSec - 179 * kUsecPerMin, // 1 minute later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "zzzcD23eF4g5" - }; - - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.reset(); - } - - // Add 4-hour-10-minutes download - data = { - id: "5555558", - name: "fakefile-4-hour-10-minutes", + target: "fakefile-4-hour" + }); + download.startTime = new Date(now_mSec - 180 * kMsecPerMin), // 180 minutes ago + download.canceled = true; + publicList.add(download); + + download = yield Downloads.createDownload({ source: "https://bugzilla.mozilla.org/show_bug.cgi?id=480169", - target: "fakefile-4-hour-10-minutes", - startTime: now_uSec - 250 * kUsecPerMin, // 250 minutes ago, in uSec - endTime: now_uSec - 251 * kUsecPerMin, // 1 minute later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "z1bzz23eF4gz" - }; - - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.reset(); - } + target: "fakefile-4-hour-10-minutes" + }); + download.startTime = new Date(now_mSec - 250 * kMsecPerMin), // 250 minutes ago + download.canceled = true; + publicList.add(download); // Add "today" download let today = new Date(); today.setHours(0); today.setMinutes(0); today.setSeconds(1); - - data = { - id: "5555554", - name: "fakefile-today", + + download = yield Downloads.createDownload({ source: "https://bugzilla.mozilla.org/show_bug.cgi?id=453440", - target: "fakefile-today", - startTime: today.getTime() * 1000, // 12:00:30am this morning, in uSec - endTime: (today.getTime() + 1000) * 1000, // 1 second later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "ffffD23eF4g5" - }; - - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.reset(); - } + target: "fakefile-today" + }); + download.startTime = today, // 12:00:01 AM this morning + download.canceled = true; + publicList.add(download); // Add "before today" download let lastYear = new Date(); lastYear.setFullYear(lastYear.getFullYear() - 1); - data = { - id: "5555550", - name: "fakefile-old", + + download = yield Downloads.createDownload({ source: "https://bugzilla.mozilla.org/show_bug.cgi?id=453440", - target: "fakefile-old", - startTime: lastYear.getTime() * 1000, // 1 year ago, in uSec - endTime: (lastYear.getTime() + 1000) * 1000, // 1 second later - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0, - guid: "ggggg23eF4g5" - }; - - try { - for (let prop in data) - stmt.params[prop] = data[prop]; - stmt.execute(); - } - finally { - stmt.finalize(); - } + target: "fakefile-old" + }); + download.startTime = lastYear, + download.canceled = true; + publicList.add(download); // Confirm everything worked - ok(downloadExists(5555550), "Pretend download for everything case should exist"); - ok(downloadExists(5555555), "Pretend download for 10-minutes case should exist"); - ok(downloadExists(5555551), "Pretend download for 1-hour case should exist"); - ok(downloadExists(5555556), "Pretend download for 1-hour-10-minutes case should exist"); - ok(downloadExists(5555552), "Pretend download for 2-hour case should exist"); - ok(downloadExists(5555557), "Pretend download for 2-hour-10-minutes case should exist"); - ok(downloadExists(5555553), "Pretend download for 4-hour case should exist"); - ok(downloadExists(5555558), "Pretend download for 4-hour-10-minutes case should exist"); - ok(downloadExists(5555554), "Pretend download for Today case should exist"); + let downloads = yield publicList.getAll(); + is(downloads.length, 9, "9 Pretend downloads added"); + + ok((yield downloadExists(publicList, "fakefile-old")), "Pretend download for everything case should exist"); + ok((yield downloadExists(publicList, "fakefile-10-minutes")), "Pretend download for 10-minutes case should exist"); + ok((yield downloadExists(publicList, "fakefile-1-hour")), "Pretend download for 1-hour case should exist"); + ok((yield downloadExists(publicList, "fakefile-1-hour-10-minutes")), "Pretend download for 1-hour-10-minutes case should exist"); + ok((yield downloadExists(publicList, "fakefile-2-hour")), "Pretend download for 2-hour case should exist"); + ok((yield downloadExists(publicList, "fakefile-2-hour-10-minutes")), "Pretend download for 2-hour-10-minutes case should exist"); + ok((yield downloadExists(publicList, "fakefile-4-hour")), "Pretend download for 4-hour case should exist"); + ok((yield downloadExists(publicList, "fakefile-4-hour-10-minutes")), "Pretend download for 4-hour-10-minutes case should exist"); + ok((yield downloadExists(publicList, "fakefile-today")), "Pretend download for Today case should exist"); } /** @@ -791,18 +717,12 @@ function setupDownloads() { * @param aID * The ids of the downloads to check. */ -function downloadExists(aID) +function downloadExists(list, path) { - let db = dm.DBConnection; - let stmt = db.createStatement( - "SELECT * " + - "FROM moz_downloads " + - "WHERE id = :id" - ); - stmt.params.id = aID; - var rows = stmt.executeStep(); - stmt.finalize(); - return rows; + return Task.spawn(function() { + let listArray = yield list.getAll(); + throw new Task.Result(listArray.some(i => i.target.path == path)); + }); } function isToday(aDate) { diff --git a/browser/base/content/test/browser_sanitizeDialog.js b/browser/base/content/test/browser_sanitizeDialog.js index 8f87b61a1143..7f4e75d317a4 100644 --- a/browser/base/content/test/browser_sanitizeDialog.js +++ b/browser/base/content/test/browser_sanitizeDialog.js @@ -21,18 +21,18 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "FormHistory", "resource://gre/modules/FormHistory.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "Downloads", + "resource://gre/modules/Downloads.jsm"); let tempScope = {}; Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader) .loadSubScript("chrome://browser/content/sanitize.js", tempScope); let Sanitizer = tempScope.Sanitizer; -const dm = Cc["@mozilla.org/download-manager;1"]. - getService(Ci.nsIDownloadManager); - +const kMsecPerMin = 60 * 1000; const kUsecPerMin = 60 * 1000000; -let formEntries; +let formEntries, downloadIDs, olderDownloadIDs; // Add tests here. Each is a function that's called by doNextTest(). var gAllTests = [ @@ -92,6 +92,23 @@ var gAllTests = [ }); }, + function () { + // Add downloads (within the past hour). + Task.spawn(function () { + downloadIDs = []; + for (let i = 0; i < 5; i++) { + yield addDownloadWithMinutesAgo(downloadIDs, i); + } + // Add downloads (over an hour ago). + olderDownloadIDs = []; + for (let i = 0; i < 5; i++) { + yield addDownloadWithMinutesAgo(olderDownloadIDs, 61 + i); + } + + doNextTest(); + }).then(null, Components.utils.reportError); + }, + /** * Ensures that the combined history-downloads checkbox clears both history * visits and downloads when checked; the dialog respects simple timespan. @@ -115,16 +132,6 @@ var gAllTests = [ } addVisits(places, function() { - // Add downloads (within the past hour). - let downloadIDs = []; - for (let i = 0; i < 5; i++) { - downloadIDs.push(addDownloadWithMinutesAgo(i)); - } - // Add downloads (over an hour ago). - let olderDownloadIDs = []; - for (let i = 0; i < 5; i++) { - olderDownloadIDs.push(addDownloadWithMinutesAgo(61 + i)); - } let totalHistoryVisits = uris.length + olderURIs.length; let wh = new WindowHelper(); @@ -146,16 +153,16 @@ var gAllTests = [ wh.onunload = function () { // History visits and downloads within one hour should be cleared. yield promiseHistoryClearedState(uris, true); - ensureDownloadsClearedState(downloadIDs, true); + yield ensureDownloadsClearedState(downloadIDs, true); // Visits and downloads > 1 hour should still exist. yield promiseHistoryClearedState(olderURIs, false); - ensureDownloadsClearedState(olderDownloadIDs, false); + yield ensureDownloadsClearedState(olderDownloadIDs, false); // OK, done, cleanup after ourselves. yield blankSlate(); yield promiseHistoryClearedState(olderURIs, true); - ensureDownloadsClearedState(olderDownloadIDs, true); + yield ensureDownloadsClearedState(olderDownloadIDs, true); }; wh.open(); }); @@ -178,6 +185,18 @@ var gAllTests = [ iter.next(); }, + function () { + // Add downloads (within the past hour). + Task.spawn(function () { + downloadIDs = []; + for (let i = 0; i < 5; i++) { + yield addDownloadWithMinutesAgo(downloadIDs, i); + } + + doNextTest(); + }).then(null, Components.utils.reportError); + }, + /** * Ensures that the combined history-downloads checkbox removes neither * history visits nor downloads when not checked. @@ -194,11 +213,6 @@ var gAllTests = [ } addVisits(places, function() { - let downloadIDs = []; - for (let i = 0; i < 5; i++) { - downloadIDs.push(addDownloadWithMinutesAgo(i)); - } - let wh = new WindowHelper(); wh.onload = function () { is(this.isWarningPanelVisible(), false, @@ -224,7 +238,7 @@ var gAllTests = [ wh.onunload = function () { // Of the three only form entries should be cleared. yield promiseHistoryClearedState(uris, false); - ensureDownloadsClearedState(downloadIDs, false); + yield ensureDownloadsClearedState(downloadIDs, false); formEntries.forEach(function (entry) { let exists = yield formNameExists(entry); @@ -234,7 +248,7 @@ var gAllTests = [ // OK, done, cleanup after ourselves. yield blankSlate(); yield promiseHistoryClearedState(uris, true); - ensureDownloadsClearedState(downloadIDs, true); + yield ensureDownloadsClearedState(downloadIDs, true); }; wh.open(); }); @@ -639,15 +653,12 @@ var gAllTests = [ } ]; -// Used as the download database ID for a new download. Incremented for each -// new download. See addDownloadWithMinutesAgo(). -var gDownloadId = 5555551; - // Index in gAllTests of the test currently being run. Incremented for each // test run. See doNextTest(). var gCurrTest = 0; -var now_uSec = Date.now() * 1000; +let now_mSec = Date.now(); +let now_uSec = now_mSec * 1000; /////////////////////////////////////////////////////////////////////////////// @@ -847,7 +858,7 @@ WindowHelper.prototype = { if (wh.onunload) { Task.spawn(wh.onunload).then(function() { waitForAsyncUpdates(doNextTest); - }); + }).then(null, Components.utils.reportError); } else { waitForAsyncUpdates(doNextTest); } @@ -900,40 +911,23 @@ WindowHelper.prototype = { * @param aMinutesAgo * The download will be downloaded this many minutes ago */ -function addDownloadWithMinutesAgo(aMinutesAgo) { +function addDownloadWithMinutesAgo(aExpectedPathList, aMinutesAgo) { + let publicList = yield Downloads.getPublicDownloadList(); + let name = "fakefile-" + aMinutesAgo + "-minutes-ago"; - let data = { - id: gDownloadId, - name: name, - source: "https://bugzilla.mozilla.org/show_bug.cgi?id=480169", - target: name, - startTime: now_uSec - (aMinutesAgo * kUsecPerMin), - endTime: now_uSec - ((aMinutesAgo + 1) * kUsecPerMin), - state: Ci.nsIDownloadManager.DOWNLOAD_FINISHED, - currBytes: 0, maxBytes: -1, preferredAction: 0, autoResume: 0 - }; + let download = yield Downloads.createDownload({ + source: "https://bugzilla.mozilla.org/show_bug.cgi?id=480169", + target: name + }); + download.startTime = new Date(now_mSec - (aMinutesAgo * kMsecPerMin)); + download.canceled = true; + publicList.add(download); - let db = dm.DBConnection; - let stmt = db.createStatement( - "INSERT INTO moz_downloads (id, name, source, target, startTime, endTime, " + - "state, currBytes, maxBytes, preferredAction, autoResume) " + - "VALUES (:id, :name, :source, :target, :startTime, :endTime, :state, " + - ":currBytes, :maxBytes, :preferredAction, :autoResume)"); - try { - for (let prop in data) { - stmt.params[prop] = data[prop]; - } - stmt.execute(); - } - finally { - stmt.reset(); - } - - is(downloadExists(gDownloadId), true, - "Sanity check: download " + gDownloadId + + ok((yield downloadExists(name)), + "Sanity check: download " + name + " should exist after creating it"); - return gDownloadId++; + aExpectedPathList.push(name); } /** @@ -984,15 +978,37 @@ function formNameExists(name) */ function blankSlate() { PlacesUtils.bhistory.removeAllPages(); - dm.cleanUp(); + // The promise is resolved only when removing both downloads and form history are done. let deferred = Promise.defer(); + let formHistoryDone = false, downloadsDone = false; + + Task.spawn(function deleteAllDownloads() { + let publicList = yield Downloads.getPublicDownloadList(); + let downloads = yield publicList.getAll(); + for (let download of downloads) { + publicList.remove(download); + yield download.finalize(true); + } + downloadsDone = true; + if (formHistoryDone) { + deferred.resolve(); + } + }).then(null, Components.utils.reportError); + FormHistory.update({ op: "remove" }, { handleError: function (error) { do_throw("Error occurred updating form history: " + error); deferred.reject(error); }, - handleCompletion: function (reason) { if (!reason) deferred.resolve(); } + handleCompletion: function (reason) { + if (!reason) { + formHistoryDone = true; + if (downloadsDone) { + deferred.resolve(); + } + } + } }); return deferred.promise; } @@ -1012,24 +1028,19 @@ function boolPrefIs(aPrefName, aExpectedVal, aMsg) { } /** - * Checks to see if the download with the specified ID exists. + * Checks to see if the download with the specified path exists. * - * @param aID - * The ID of the download to check + * @param aPath + * The path of the download to check * @return True if the download exists, false otherwise */ -function downloadExists(aID) +function downloadExists(aPath) { - let db = dm.DBConnection; - let stmt = db.createStatement( - "SELECT * " + - "FROM moz_downloads " + - "WHERE id = :id" - ); - stmt.params.id = aID; - let rows = stmt.executeStep(); - stmt.finalize(); - return !!rows; + return Task.spawn(function() { + let publicList = yield Downloads.getPublicDownloadList(); + let listArray = yield publicList.getAll(); + throw new Task.Result(listArray.some(i => i.target.path == aPath)); + }); } /** @@ -1059,7 +1070,7 @@ function doNextTest() { function ensureDownloadsClearedState(aDownloadIDs, aShouldBeCleared) { let niceStr = aShouldBeCleared ? "no longer" : "still"; aDownloadIDs.forEach(function (id) { - is(downloadExists(id), !aShouldBeCleared, + is((yield downloadExists(id)), !aShouldBeCleared, "download " + id + " should " + niceStr + " exist"); }); }