Attachment 8961744 Details for Bug 1252998

[patch] part 5 - getActiveOrigins

storage_3.patch (text/plain), 12.46 KB, created by Andrea Marchesini [:baku]

(hide)

Description:

Filename:

MIME Type:

Creator: Andrea Marchesini [:baku]

Size: 12.46 KB

patch

obsolete

># HG changeset patch
># User Andrea Marchesini <amarchesini@mozilla.com>
># Parent  68ef6aaff823a5617a972080907998291f25d8b0
>Bug 1252998 - StorageActivityService - part 5 - nsIStorageActivityService::getActiveOrigins, r=asuth
>
>diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm
>--- a/browser/components/customizableui/CustomizableWidgets.jsm
>+++ b/browser/components/customizableui/CustomizableWidgets.jsm
>@@ -805,17 +805,17 @@ if (Services.prefs.getBoolPref("privacy.
>     type: "view",
>     viewId: "PanelUI-panicView",
> 
>     forgetButtonCalled(aEvent) {
>       let doc = aEvent.target.ownerDocument;
>       let group = doc.getElementById("PanelUI-panic-timeSpan");
>       BrowserUITelemetry.countPanicEvent(group.selectedItem.id);
>       let itemsToClear = [
>-        "cookies", "history", "openWindows", "formdata", "sessions", "cache", "downloads"
>+        "cookies", "history", "openWindows", "formdata", "sessions", "cache", "downloads", "offlineApps"
>       ];
>       let newWindowPrivateState = PrivateBrowsingUtils.isWindowPrivate(doc.defaultView) ?
>                                   "private" : "non-private";
>       let promise = Sanitizer.sanitize(itemsToClear, {
>         ignoreTimespan: false,
>         range: Sanitizer.getClearRange(+group.value),
>         privateStateForNewWindow: newWindowPrivateState,
>       });
>diff --git a/browser/modules/Sanitizer.jsm b/browser/modules/Sanitizer.jsm
>--- a/browser/modules/Sanitizer.jsm
>+++ b/browser/modules/Sanitizer.jsm
>@@ -12,18 +12,22 @@ XPCOMUtils.defineLazyModuleGetters(this,
>   AppConstants: "resource://gre/modules/AppConstants.jsm",
>   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
>   FormHistory: "resource://gre/modules/FormHistory.jsm",
>   Downloads: "resource://gre/modules/Downloads.jsm",
>   DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
>   TelemetryStopwatch: "resource://gre/modules/TelemetryStopwatch.jsm",
>   setTimeout: "resource://gre/modules/Timer.jsm",
>   ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm",
>+  OfflineAppCacheHelper: "resource:///modules/offlineAppCache.jsm",
> });
> 
>+XPCOMUtils.defineLazyServiceGetter(this, "sas",
>+                                   "@mozilla.org/storage/activity-service;1",
>+                                   "nsIStorageActivityService");
> XPCOMUtils.defineLazyServiceGetter(this, "quotaManagerService",
>                                    "@mozilla.org/dom/quota-manager-service;1",
>                                    "nsIQuotaManagerService");
> 
> // Used as unique id for pending sanitizations.
> var gPendingSanitizationSerial = 0;
> 
> /**
>@@ -357,21 +361,50 @@ var Sanitizer = {
>         if (seenException) {
>           throw seenException;
>         }
>       },
>     },
> 
>     offlineApps: {
>       async clear(range) {
>-        // AppCache
>-        ChromeUtils.import("resource:///modules/offlineAppCache.jsm");
>-        // This doesn't wait for the cleanup to be complete.
>+        // AppCache: this doesn't wait for the cleanup to be complete.
>         OfflineAppCacheHelper.clear();
> 
>+        if (range) {
>+          let principals = sas.getActiveOrigins(range[0], range[1])
>+                              .QueryInterface(Ci.nsIArray);
>+
>+          let promises = [];
>+
>+          for (let i = 0; i < principals.length; ++i) {
>+            let principal = principals.queryElementAt(i, Ci.nsIPrincipal);
>+
>+            if (principal.URI.scheme != "http" &&
>+                principal.URI.scheme != "https" &&
>+                principal.URI.scheme != "file") {
>+              continue;
>+            }
>+
>+            // LocalStorage
>+            Services.obs.notifyObservers(null, "browser:purge-domain-data", principal.URI.host);
>+
>+            // ServiceWorkers
>+            await ServiceWorkerCleanUp.removeFromPrincipal(principal);
>+
>+            // QuotaManager
>+            promises.push(new Promise(r => {
>+              let req = quotaManagerService.clearStoragesForPrincipal(principal, null, false);
>+              req.callback = () => { r(); };
>+            }));
>+          }
>+
>+          return Promise.all(promises);
>+        }
>+
>         // LocalStorage
>         Services.obs.notifyObservers(null, "extension:purge-localStorage");
> 
>         // ServiceWorkers
>         await ServiceWorkerCleanUp.removeAll();
> 
>         // QuotaManager
>         let promises = [];
>diff --git a/dom/interfaces/storage/nsIStorageActivityService.idl b/dom/interfaces/storage/nsIStorageActivityService.idl
>--- a/dom/interfaces/storage/nsIStorageActivityService.idl
>+++ b/dom/interfaces/storage/nsIStorageActivityService.idl
>@@ -1,25 +1,34 @@
> /* -*- Mode: IDL; tab-width: 2; 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/. */
> 
> #include "domstubs.idl"
> 
>+interface nsIArray;
>+
> /**
>  * nsIStorageActivityService is a service that can be used to know which
>  * origins have been active in a time range. This information can be used to
>  * implement "Clear Recent History" or similar features.
>  *
>  * If you are implementing a new Storage component, you should use
>  * QuotaManager. But if you don't do it, remember to call
>  * StorageActivityService methods in order to inform this service about
>  * 'writing' operations executed by origins.
>  */
> [scriptable, builtinclass, uuid(fd1310ba-d1be-4327-988e-92b39fcff6f4)]
> interface nsIStorageActivityService : nsISupports
> {
>+  // This returns an array of nsIPrincipals, active between |from| and |to|
>+  // timestamps. Note activities older than 1 day are forgotten.
>+  // Activity details are not persisted, so this only covers activity since
>+  // Firefox was started.  All codebase principals are logged, which includes
>+  // non-system principals like "moz-extension://ID", "moz-safe-about:home",
>+  // "about:newtab", so principals may need to be filtered before being used.
>+  nsIArray getActiveOrigins(in PRTime from, in PRTime to);
> };
> 
> %{ C++
> #define STORAGE_ACTIVITY_SERVICE_CONTRACTID "@mozilla.org/storage/activity-service;1"
> %}
>diff --git a/dom/storage/StorageActivityService.cpp b/dom/storage/StorageActivityService.cpp
>--- a/dom/storage/StorageActivityService.cpp
>+++ b/dom/storage/StorageActivityService.cpp
>@@ -3,16 +3,18 @@
> /* 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/. */
> 
> #include "StorageActivityService.h"
> 
> #include "mozilla/ipc/BackgroundUtils.h"
> #include "mozilla/StaticPtr.h"
>+#include "nsIMutableArray.h"
>+#include "nsSupportsPrimitives.h"
> #include "nsXPCOM.h"
> 
> // This const is used to know when origin activities should be purged because
> // too old. This value should be in sync with what the UI needs.
> #define TIME_MAX_SECS 86400 /* 24 hours */
> 
> namespace mozilla {
> namespace dom {
>@@ -20,27 +22,39 @@ namespace dom {
> static StaticRefPtr<StorageActivityService> gStorageActivityService;
> static bool gStorageActivityShutdown = false;
> 
> /* static */ void
> StorageActivityService::SendActivity(nsIPrincipal* aPrincipal)
> {
>   MOZ_ASSERT(NS_IsMainThread());
> 
>+  if (!aPrincipal ||
>+      BasePrincipal::Cast(aPrincipal)->Kind() != BasePrincipal::eCodebasePrincipal) {
>+    // Only codebase principals.
>+    return;
>+  }
>+
>   RefPtr<StorageActivityService> service = GetOrCreate();
>   if (NS_WARN_IF(!service)) {
>     return;
>   }
> 
>   service->SendActivityInternal(aPrincipal);
> }
> 
> /* static */ void
> StorageActivityService::SendActivity(const mozilla::ipc::PrincipalInfo& aPrincipalInfo)
> {
>+  if (aPrincipalInfo.type() !=
>+      mozilla::ipc::PrincipalInfo::TContentPrincipalInfo) {
>+    // only content principal.
>+    return;
>+  }
>+
>   RefPtr<Runnable> r = NS_NewRunnableFunction(
>     "StorageActivityService::SendActivity",
>     [aPrincipalInfo] () {
>       MOZ_ASSERT(NS_IsMainThread());
> 
>       nsCOMPtr<nsIPrincipal> principal =
>         mozilla::ipc::PrincipalInfoToPrincipal(aPrincipalInfo);
> 
>@@ -86,29 +100,30 @@ StorageActivityService::~StorageActivity
>   MOZ_ASSERT(!mTimer);
> }
> 
> void
> StorageActivityService::SendActivityInternal(nsIPrincipal* aPrincipal)
> {
>   MOZ_ASSERT(NS_IsMainThread());
>   MOZ_ASSERT(aPrincipal);
>+  MOZ_ASSERT(BasePrincipal::Cast(aPrincipal)->Kind() == BasePrincipal::eCodebasePrincipal);
> 
>   if (!XRE_IsParentProcess()) {
>     SendActivityToParent(aPrincipal);
>     return;
>   }
> 
>   nsAutoCString origin;
>   nsresult rv = aPrincipal->GetOrigin(origin);
>   if (NS_WARN_IF(NS_FAILED(rv))) {
>     return;
>   }
> 
>-  mActivities.Put(origin, TimeStamp::NowLoRes());
>+  mActivities.Put(origin, PR_Now());
> 
>   MaybeStartTimer();
> }
> 
> void
> StorageActivityService::SendActivityToParent(nsIPrincipal* aPrincipal)
> {
>   MOZ_ASSERT(NS_IsMainThread());
>@@ -173,32 +188,66 @@ StorageActivityService::MaybeStopTimer()
> }
> 
> NS_IMETHODIMP
> StorageActivityService::Notify(nsITimer* aTimer)
> {
>   MOZ_ASSERT(NS_IsMainThread());
>   MOZ_ASSERT(mTimer == aTimer);
> 
>-  TimeStamp now = TimeStamp::NowLoRes();
>+  uint64_t now = PR_Now();
> 
>   for (auto iter = mActivities.Iter(); !iter.Done(); iter.Next()) {
>-    if ((now - iter.UserData()).ToSeconds() > TIME_MAX_SECS) {
>+    if ((now - iter.UserData()) / PR_USEC_PER_SEC > TIME_MAX_SECS) {
>       iter.Remove();
>     }
>   }
> 
>   // If no activities, let's stop the timer.
>   if (mActivities.Count() == 0) {
>     MaybeStopTimer();
>   }
> 
>   return NS_OK;
> }
> 
>+NS_IMETHODIMP
>+StorageActivityService::GetActiveOrigins(PRTime aFrom, PRTime aTo,
>+                                         nsIArray** aRetval)
>+{
>+  uint64_t now = PR_Now();
>+  if (((now - aFrom) / PR_USEC_PER_SEC) > TIME_MAX_SECS ||
>+       aFrom >= aTo) {
>+    return NS_ERROR_RANGE_ERR;
>+  }
>+
>+  nsresult rv = NS_OK;
>+  nsCOMPtr<nsIMutableArray> devices =
>+    do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
>+  if (NS_WARN_IF(NS_FAILED(rv))) {
>+    return rv;
>+  }
>+
>+  for (auto iter = mActivities.Iter(); !iter.Done(); iter.Next()) {
>+    if (iter.UserData() >= aFrom && iter.UserData() <= aTo) {
>+      RefPtr<BasePrincipal> principal =
>+        BasePrincipal::CreateCodebasePrincipal(iter.Key());
>+      MOZ_ASSERT(principal);
>+
>+      rv = devices->AppendElement(principal);
>+      if (NS_WARN_IF(NS_FAILED(rv))) {
>+        return rv;
>+      }
>+    }
>+  }
>+
>+  devices.forget(aRetval);
>+  return NS_OK;
>+}
>+
> NS_INTERFACE_MAP_BEGIN(StorageActivityService)
>   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStorageActivityService)
>   NS_INTERFACE_MAP_ENTRY(nsIStorageActivityService)
>   NS_INTERFACE_MAP_ENTRY(nsIObserver)
>   NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
>   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
> NS_INTERFACE_MAP_END
> 
>diff --git a/dom/storage/StorageActivityService.h b/dom/storage/StorageActivityService.h
>--- a/dom/storage/StorageActivityService.h
>+++ b/dom/storage/StorageActivityService.h
>@@ -55,17 +55,17 @@ private:
> 
>   void
>   MaybeStartTimer();
> 
>   void
>   MaybeStopTimer();
> 
>   // Activities grouped by origin (+OriginAttributes).
>-  nsDataHashtable<nsCStringHashKey, TimeStamp> mActivities;
>+  nsDataHashtable<nsCStringHashKey, PRTime> mActivities;
> 
>   nsCOMPtr<nsITimer> mTimer;
> };
> 
> } // namespace dom
> } // namespace mozilla
> 
> #endif // mozilla_dom_StorageActivityService_h
>diff --git a/toolkit/forgetaboutsite/ServiceWorkerCleanUp.jsm b/toolkit/forgetaboutsite/ServiceWorkerCleanUp.jsm
>--- a/toolkit/forgetaboutsite/ServiceWorkerCleanUp.jsm
>+++ b/toolkit/forgetaboutsite/ServiceWorkerCleanUp.jsm
>@@ -31,16 +31,28 @@ this.ServiceWorkerCleanUp = {
>       let sw = serviceWorkers.queryElementAt(i, Ci.nsIServiceWorkerRegistrationInfo);
>       if (sw.principal.URI.host == aHost) {
>         promises.push(unregisterServiceWorker(sw));
>       }
>     }
>     return Promise.all(promises);
>   },
> 
>+  removeFromPrincipal(aPrincipal) {
>+    let promises = [];
>+    let serviceWorkers = serviceWorkerManager.getAllRegistrations();
>+    for (let i = 0; i < serviceWorkers.length; i++) {
>+      let sw = serviceWorkers.queryElementAt(i, Ci.nsIServiceWorkerRegistrationInfo);
>+      if (sw.principal.equals(aPrincipal)) {
>+        promises.push(unregisterServiceWorker(sw));
>+      }
>+    }
>+    return Promise.all(promises);
>+  },
>+
>   removeAll() {
>     let promises = [];
>     let serviceWorkers = serviceWorkerManager.getAllRegistrations();
>     for (let i = 0; i < serviceWorkers.length; i++) {
>       let sw = serviceWorkers.queryElementAt(i, Ci.nsIServiceWorkerRegistrationInfo);
>       promises.push(unregisterServiceWorker(sw));
>     }
>     return Promise.all(promises);

Actions: View | Diff | Review

Attachments on bug 1252998: 8911778 | 8913139 | 8913140 | 8913144 | 8913145 | 8913147 | 8913148 | 8913149 | 8914251 | 8914252 | 8918247 | 8930435 | 8930447 | 8930448 | 8934131 | 8934499 | 8934500 | 8935039 | 8935709 | 8961741 | 8961743 | 8961744 | 8961745 | 8961746 | 8961748 | 8961750 | 8961751 | 8961752 | 8965246 | 8967560 | 8967563 | 8967658 | 8967659 | 8967660 | 8967661 | 8967663

Bugzilla

Quick Search

Attachment 8961744 Details for Bug 1252998