Bug 1347817 - Principal must always have a valid origin - part 6 - fixing tests, r=ehsan

browser/components/originattributes/test/browser/browser_firstPartyIsolation_aboutPages.js

@@ -33,7 +33,7 @@ add_task(function* test_remote_window_open_aboutBlank() {
 
 /**
  * For loading the initial about:blank in non-e10s mode, it will be loaded with
- * codebase principal. So we test if it has correct firstPartyDomain set.
+ * a null principal. So we test if it has correct firstPartyDomain set.
  */
 add_task(function* test_nonremote_window_open_aboutBlank() {
   let win = yield BrowserTestUtils.openNewBrowserWindow({remote: false});
@@ -43,8 +43,8 @@ add_task(function* test_nonremote_window_open_aboutBlank() {
 
   let attrs = { firstPartyDomain: "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla" };
   yield ContentTask.spawn(browser, attrs, function* (expectAttrs) {
-    Assert.ok(content.document.nodePrincipal.isCodebasePrincipal,
-              "The principal of non-remote about:blank should be a codebase principal.");
+    Assert.ok(!content.document.nodePrincipal.isCodebasePrincipal,
+              "The principal of non-remote about:blank should not be a codebase principal.");
     Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain,
                  expectAttrs.firstPartyDomain,
                  "non-remote about:blank should have firstPartyDomain set");

browser/components/preferences/permissions.js

@@ -95,8 +95,9 @@ var gPermissionManager = {
       try {
         uri = Services.io.newURI(input_url);
         principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
-        // If we have ended up with an unknown scheme, the following will throw.
-        principal.origin;
+        if (principal.origin.startsWith("moz-nullprincipal:")) {
+          throw "Null principal";
+        }
       } catch (ex) {
         uri = Services.io.newURI("http://" + input_url);
         principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});

caps/tests/unit/test_origin.js

@@ -300,12 +300,5 @@ function run_test() {
 
   var aboutBlankURI = makeURI('about:blank');
   var aboutBlankPrin = ssm.createCodebasePrincipal(aboutBlankURI, {});
-  var thrown = false;
-  try {
-    aboutBlankPrin.origin;
-  } catch (e) {
-    thrown = true;
-  }
-  do_check_true(thrown);
-
+  do_check_true(/^moz-nullprincipal:\{([0-9]|[a-z]|\-){36}\}$/.test(aboutBlankPrin.origin));
 }

dom/base/WebSocket.cpp

@@ -1634,14 +1634,13 @@ WebSocketImpl::Init(JSContext* aCx,
       nsCOMPtr<nsPIDOMWindowInner> innerWindow;
 
       while (true) {
-        bool isNullPrincipal = true;
         if (principal) {
+          bool isNullPrincipal = true;
           isNullPrincipal = principal->GetIsNullPrincipal();
-        }
-
-        if (!isNullPrincipal) {
+          if (isNullPrincipal || nsContentUtils::IsSystemPrincipal(principal)) {
             break;
           }
+        }
 
         if (!innerWindow) {
           innerWindow = do_QueryInterface(globalObject);

dom/base/nsGlobalWindow.cpp

@@ -2551,12 +2551,11 @@ nsGlobalWindow::SetInitialPrincipalToSubject()
 
 #ifdef DEBUG
     // If we have a document loaded at this point, it had better be about:blank.
-    // Otherwise, something is really weird.
-    nsCOMPtr<nsIURI> uri;
-    mDoc->NodePrincipal()->GetURI(getter_AddRefs(uri));
-    NS_ASSERTION(uri && NS_IsAboutBlank(uri) &&
-                 NS_IsAboutBlank(mDoc->GetDocumentURI()),
-                 "Unexpected original document");
+    // Otherwise, something is really weird. An about:blank page has a
+    // NullPrincipal.
+    bool isNullPrincipal;
+    MOZ_ASSERT(NS_SUCCEEDED(mDoc->NodePrincipal()->GetIsNullPrincipal(&isNullPrincipal)) &&
+               isNullPrincipal);
 #endif
   }
 

dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js

@@ -30,11 +30,9 @@ add_task(function* test_isOriginPotentiallyTrustworthy() {
     ["http://127.0.0.1/", true],
     ["file:///", true],
     ["resource:///", true],
-    ["app://", true],
     ["moz-extension://", true],
     ["wss://example.com/", true],
     ["about:config", false],
-    ["urn:generic", false],
     ["http://example.net/", true],
     ["ws://example.org/", true],
     ["chrome://example.net/content/messenger.xul", false],