Bug 1165267 - Part 1: Replace appId and inBrowser by originAttributes…

… v2. r=honzab
dothq · Sep 3, 2015 · bb095c0 · bb095c0
1 parent 583b700
commit bb095c0
Show file tree

Hide file tree

Showing 6 changed files with 269 additions and 142 deletions.
diff --git a/extensions/cookie/test/unit/test_cookies_sync_failure.js b/extensions/cookie/test/unit/test_cookies_sync_failure.js
@@ -18,7 +18,7 @@
 //    c) Schema 3: the 'creationTime' column already exists; or the
 //       'moz_uniqueid' index already exists.
 
-var COOKIE_DATABASE_SCHEMA_CURRENT = 5;
+var COOKIE_DATABASE_SCHEMA_CURRENT = 6;
 
 var test_generator = do_run_test();
 

diff --git a/netwerk/cookie/CookieServiceParent.cpp b/netwerk/cookie/CookieServiceParent.cpp
@@ -27,15 +27,13 @@ namespace {
 // Ignore failures from this function, as they only affect whether we do or
 // don't show a dialog box in private browsing mode if the user sets a pref.
 void
-CreateDummyChannel(nsIURI* aHostURI, uint32_t aAppId, bool aInMozBrowser,
-                   bool aIsPrivate, nsIChannel **aChannel)
+CreateDummyChannel(nsIURI* aHostURI, OriginAttributes &aAttrs, bool aIsPrivate,
+                   nsIChannel **aChannel)
 {
-  MOZ_ASSERT(aAppId != nsIScriptSecurityManager::UNKNOWN_APP_ID);
+  MOZ_ASSERT(aAttrs.mAppId != nsIScriptSecurityManager::UNKNOWN_APP_ID);
 
-  // TODO: Bug 1165267 - Use OriginAttributes for nsCookieService 
-  OriginAttributes attrs(aAppId, aInMozBrowser);
   nsCOMPtr<nsIPrincipal> principal =
-    BasePrincipal::CreateCodebasePrincipal(aHostURI, attrs);
+    BasePrincipal::CreateCodebasePrincipal(aHostURI, aAttrs);
   if (!principal) {
     return;
   }
@@ -66,28 +64,22 @@ namespace net {
 
 MOZ_WARN_UNUSED_RESULT
 bool
-CookieServiceParent::GetAppInfoFromParams(const IPC::SerializedLoadContext &aLoadContext,
-                                          uint32_t& aAppId,
-                                          bool& aIsInBrowserElement,
-                                          bool& aIsPrivate)
+CookieServiceParent::GetOriginAttributesFromParams(const IPC::SerializedLoadContext &aLoadContext,
+                                                   OriginAttributes& aAttrs,
+                                                   bool& aIsPrivate)
 {
-  aAppId = NECKO_NO_APP_ID;
-  aIsInBrowserElement = false;
   aIsPrivate = false;
 
-  OriginAttributes attrs;
   const char* error = NeckoParent::GetValidatedAppInfo(aLoadContext,
                                                        Manager()->Manager(),
-                                                       attrs);
+                                                       aAttrs);
   if (error) {
-    NS_WARNING(nsPrintfCString("CookieServiceParent: GetAppInfoFromParams: "
+    NS_WARNING(nsPrintfCString("CookieServiceParent: GetOriginAttributesFromParams: "
                                "FATAL error: %s: KILLING CHILD PROCESS\n",
                                error).get());
     return false;
   }
 
-  aAppId = attrs.mAppId;
-  aIsInBrowserElement = attrs.mInBrowser;
   if (aLoadContext.IsPrivateBitValid()) {
     aIsPrivate = aLoadContext.mUsePrivateBrowsing;
   }
@@ -133,16 +125,15 @@ CookieServiceParent::RecvGetCookieString(const URIParams& aHost,
   if (!hostURI)
     return false;
 
-  uint32_t appId;
-  bool isInBrowserElement, isPrivate;
-  bool valid = GetAppInfoFromParams(aLoadContext, appId,
-                                    isInBrowserElement, isPrivate);
+  OriginAttributes attrs;
+  bool isPrivate;
+  bool valid = GetOriginAttributesFromParams(aLoadContext, attrs, isPrivate);
   if (!valid) {
     return false;
   }
 
-  mCookieService->GetCookieStringInternal(hostURI, aIsForeign, aFromHttp, appId,
-                                          isInBrowserElement, isPrivate, *aResult);
+  mCookieService->GetCookieStringInternal(hostURI, aIsForeign, aFromHttp, attrs,
+                                          isPrivate, *aResult);
   return true;
 }
 
@@ -164,10 +155,9 @@ CookieServiceParent::RecvSetCookieString(const URIParams& aHost,
   if (!hostURI)
     return false;
 
-  uint32_t appId;
-  bool isInBrowserElement, isPrivate;
-  bool valid = GetAppInfoFromParams(aLoadContext, appId,
-                                    isInBrowserElement, isPrivate);
+  OriginAttributes attrs;
+  bool isPrivate;
+  bool valid = GetOriginAttributesFromParams(aLoadContext, attrs, isPrivate);
   if (!valid) {
     return false;
   }
@@ -180,14 +170,13 @@ CookieServiceParent::RecvSetCookieString(const URIParams& aHost,
   // with aIsForeign before we have to worry about nsCookiePermission trying
   // to use the channel to inspect it.
   nsCOMPtr<nsIChannel> dummyChannel;
-  CreateDummyChannel(hostURI, appId, isInBrowserElement,
-                     isPrivate, getter_AddRefs(dummyChannel));
+  CreateDummyChannel(hostURI, attrs, isPrivate, getter_AddRefs(dummyChannel));
 
   // NB: dummyChannel could be null if something failed in CreateDummyChannel.
   nsDependentCString cookieString(aCookieString, 0);
   mCookieService->SetCookieStringInternal(hostURI, aIsForeign, cookieString,
-                                          aServerTime, aFromHttp, appId,
-                                          isInBrowserElement, isPrivate, dummyChannel);
+                                          aServerTime, aFromHttp, attrs,
+                                          isPrivate, dummyChannel);
   return true;
 }
 

diff --git a/netwerk/cookie/CookieServiceParent.h b/netwerk/cookie/CookieServiceParent.h
@@ -10,6 +10,7 @@
 #include "SerializedLoadContext.h"
 
 class nsCookieService;
+namespace mozilla { class OriginAttributes; }
 
 namespace mozilla {
 namespace net {
@@ -22,10 +23,9 @@ class CookieServiceParent : public PCookieServiceParent
 
 protected:
   MOZ_WARN_UNUSED_RESULT bool
-  GetAppInfoFromParams(const IPC::SerializedLoadContext &aLoadContext,
-                       uint32_t& aAppId,
-                       bool& aIsInBrowserElement,
-                       bool& aIsPrivate);
+  GetOriginAttributesFromParams(const IPC::SerializedLoadContext &aLoadContext,
+                                OriginAttributes& aAttrs,
+                                bool& aIsPrivate);
 
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;