Commit 83c78896 authored by Nika Layzell's avatar Nika Layzell
Browse files

Bug 1345573 - Part 2: Remove old tests for permissions syncing, and add test for new logic, r=baku 

MozReview-Commit-ID: A2vYqdCpeu6
parent 3ffc5e3e

extensions/cookie/test/browser.ini

+2 −0
Original line number Diff line number Diff line 
[DEFAULT]



[browser_test_favicon.js]

[browser_permmgr_sync.js]

skip-if = !e10s # This tests e10s specific behavior

extensions/cookie/test/browser_permmgr_sync.js

0 → 100644
+149 −0
Original line number Diff line number Diff line 
function addPerm(aURI, aName) {

  Services.perms.add(Services.io.newURI(aURI), aName, Services.perms.ALLOW_ACTION);

}



function hasPerm(aURI, aName) {

  return Services.perms.testPermission(Services.io.newURI(aURI), aName)

    == Services.perms.ALLOW_ACTION;

}



add_task(function* () {

  // Make sure that we get a new process for the tab which we create. This is

  // important, becuase we wanto to assert information about the initial state

  // of the local permissions cache.

  //

  // We use the same approach here as was used in the e10s-multi localStorage

  // tests (dom/tests/browser/browser_localStorage_e10s.js (bug )). This ensures

  // that our tab has its own process.

  //

  // Bug 1345990 tracks implementing a better tool for ensuring this.

  let keepAliveCount = 0;

  try {

    keepAliveCount = SpecialPowers.getIntPref("dom.ipc.keepProcessesAlive.web");

  } catch (ex) {

    // Then zero is correct.

  }

  let safeProcessCount = keepAliveCount + 2;

  info("dom.ipc.keepProcessesAlive.web is " + keepAliveCount + ", boosting " +

       "process count temporarily to " + safeProcessCount);

  yield SpecialPowers.pushPrefEnv({

    set: [

      ["dom.ipc.processCount", safeProcessCount],

      ["dom.ipc.processCount.web", safeProcessCount]

    ]

  });



  addPerm("http://example.com", "perm1");

  addPerm("http://foo.bar.example.com", "perm2");

  addPerm("about:home", "perm3");

  addPerm("https://example.com", "perm4");



  yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, function* (aBrowser) {

    yield ContentTask.spawn(aBrowser, null, function* () {

      // Before the load http URIs shouldn't have been sent down yet

      is(Services.perms.testPermission(Services.io.newURI("http://example.com"),

                                       "perm1"),

         Services.perms.UNKNOWN_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("http://foo.bar.example.com"),

                                       "perm2"),

         Services.perms.UNKNOWN_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("about:home"),

                                       "perm3"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("https://example.com"),

                                       "perm4"),

         Services.perms.UNKNOWN_ACTION);



      // Perform a load of example.com

      yield new Promise(resolve => {

        let iframe = content.document.createElement('iframe');

        iframe.setAttribute('src', 'http://example.com');

        iframe.onload = resolve;

        content.document.body.appendChild(iframe);

      });



      // After the load finishes, we should know about example.com, but not foo.bar.example.com

      is(Services.perms.testPermission(Services.io.newURI("http://example.com"),

                                       "perm1"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("http://foo.bar.example.com"),

                                       "perm2"),

         Services.perms.UNKNOWN_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("about:home"),

                                       "perm3"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("https://example.com"),

                                       "perm4"),

         Services.perms.UNKNOWN_ACTION);

    });



    addPerm("http://example.com", "newperm1");

    addPerm("http://foo.bar.example.com", "newperm2");

    addPerm("about:home", "newperm3");

    addPerm("https://example.com", "newperm4");



    yield ContentTask.spawn(aBrowser, null, function* () {

      // The new permissions should be avaliable, but only for

      // http://example.com, and about:home

      is(Services.perms.testPermission(Services.io.newURI("http://example.com"),

                                       "perm1"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("http://example.com"),

                                       "newperm1"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("http://foo.bar.example.com"),

                                       "perm2"),

         Services.perms.UNKNOWN_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("http://foo.bar.example.com"),

                                       "newperm2"),

         Services.perms.UNKNOWN_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("about:home"),

                                       "perm3"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("about:home"),

                                       "newperm3"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("https://example.com"),

                                       "perm4"),

         Services.perms.UNKNOWN_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("https://example.com"),

                                       "newperm4"),

         Services.perms.UNKNOWN_ACTION);



      // Loading a subdomain now, on https

      yield new Promise(resolve => {

        let iframe = content.document.createElement('iframe');

        iframe.setAttribute('src', 'https://sub1.test1.example.com');

        iframe.onload = resolve;

        content.document.body.appendChild(iframe);

      });



      // Now that the https subdomain has loaded, we want to make sure that the

      // permissions are also avaliable for its parent domain, https://example.com!

      is(Services.perms.testPermission(Services.io.newURI("http://example.com"),

                                       "perm1"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("http://example.com"),

                                       "newperm1"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("http://foo.bar.example.com"),

                                       "perm2"),

         Services.perms.UNKNOWN_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("http://foo.bar.example.com"),

                                       "newperm2"),

         Services.perms.UNKNOWN_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("about:home"),

                                       "perm3"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("about:home"),

                                       "newperm3"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("https://example.com"),

                                       "perm4"),

         Services.perms.ALLOW_ACTION);

      is(Services.perms.testPermission(Services.io.newURI("https://example.com"),

                                       "newperm4"),

         Services.perms.ALLOW_ACTION);

    });

  });

});

extensions/cookie/test/moz.build

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


XPCSHELL_TESTS_MANIFESTS += [

    'unit/xpcshell.ini',

    'unit_ipc/xpcshell.ini',

]



MOCHITEST_MANIFESTS += ['mochitest.ini']

extensions/cookie/test/unit_ipc/test_child.js

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
var Ci = Components.interfaces;

var Cc = Components.classes;

var Cr = Components.results;



var gIoService = Components.classes["@mozilla.org/network/io-service;1"]

                           .getService(Components.interfaces.nsIIOService);



function isParentProcess() {

    let appInfo = Cc["@mozilla.org/xre/app-info;1"];

    return (!appInfo || appInfo.getService(Ci.nsIXULRuntime).processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);

}



function getPrincipalForURI(aURI) {

  var uri =  gIoService.newURI(aURI);

  var ssm = Cc["@mozilla.org/scriptsecuritymanager;1"]

              .getService(Ci.nsIScriptSecurityManager);

  return ssm.createCodebasePrincipal(uri, {});

}



function run_test() {

  if (!isParentProcess()) {

    const Ci = Components.interfaces;

    const Cc = Components.classes;



    var mM = Cc["@mozilla.org/childprocessmessagemanager;1"].

                         getService(Ci.nsISyncMessageSender);



    var messageListener = {

      receiveMessage: function(aMessage) {

        switch(aMessage.name) {

          case "TESTING:Stage2A":

            // Permissions created after the child is present

            do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://mozilla.org"), "cookie1"), pm.ALLOW_ACTION);

            do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://mozilla.com"), "cookie2"), pm.DENY_ACTION);

            do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://mozilla.net"), "cookie3"), pm.ALLOW_ACTION);

            do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://firefox.org"), "cookie1"), pm.ALLOW_ACTION);

            do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://firefox.com"), "cookie2"), pm.DENY_ACTION);

            do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://firefox.net"), "cookie3"), pm.ALLOW_ACTION);



            mM.sendAsyncMessage("TESTING:Stage3");

            break;



        }

        return true;

      },

    };



    mM.addMessageListener("TESTING:Stage2A", messageListener);



    // Permissions created before the child is present

    var pm = Cc["@mozilla.org/permissionmanager;1"].getService(Ci.nsIPermissionManager);

    do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://mozilla.org"), "cookie1"), pm.ALLOW_ACTION);

    do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://mozilla.com"), "cookie2"), pm.DENY_ACTION);

    do_check_eq(pm.testPermissionFromPrincipal(getPrincipalForURI("http://mozilla.net"), "cookie3"), pm.ALLOW_ACTION);



    mM.sendAsyncMessage("TESTING:Stage2");

  }

}

extensions/cookie/test/unit_ipc/test_parent.js

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
var Ci = Components.interfaces;

var Cc = Components.classes;

var Cr = Components.results;



var gIoService = Components.classes["@mozilla.org/network/io-service;1"]

                           .getService(Components.interfaces.nsIIOService);



function isParentProcess() {

    let appInfo = Cc["@mozilla.org/xre/app-info;1"];

    return (!appInfo || appInfo.getService(Ci.nsIXULRuntime).processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);

}



function getPrincipalForURI(aURI) {

  var uri = gIoService.newURI(aURI);

  var ssm = Cc["@mozilla.org/scriptsecuritymanager;1"]

              .getService(Ci.nsIScriptSecurityManager);

  return ssm.createCodebasePrincipal(uri, {});

}



function run_test() {

  if (isParentProcess()) {

    var pm = Cc["@mozilla.org/permissionmanager;1"].getService(Ci.nsIPermissionManager);



    // Permissions created before the child is present

    pm.addFromPrincipal(getPrincipalForURI("http://mozilla.org"), "cookie1", pm.ALLOW_ACTION, pm.EXPIRE_NEVER, 0);

    pm.addFromPrincipal(getPrincipalForURI("http://mozilla.com"), "cookie2", pm.DENY_ACTION, pm.EXPIRE_SESSION, 0);

    pm.addFromPrincipal(getPrincipalForURI("http://mozilla.net"), "cookie3", pm.ALLOW_ACTION, pm.EXPIRE_TIME, Date.now() + 1000*60*60*24);



    var mM = Cc["@mozilla.org/parentprocessmessagemanager;1"].

             getService(Ci.nsIMessageBroadcaster);



    var messageListener = {

      receiveMessage: function(aMessage) {

        switch(aMessage.name) {

          case "TESTING:Stage2":

            // Permissions created after the child is present

            pm.addFromPrincipal(getPrincipalForURI("http://firefox.org"), "cookie1", pm.ALLOW_ACTION, pm.EXPIRE_NEVER, 0);

            pm.addFromPrincipal(getPrincipalForURI("http://firefox.com"), "cookie2", pm.DENY_ACTION, pm.EXPIRE_SESSION, 0);

            pm.addFromPrincipal(getPrincipalForURI("http://firefox.net"), "cookie3", pm.ALLOW_ACTION, pm.EXPIRE_TIME, Date.now() + 1000*60*60*24);

            mM.broadcastAsyncMessage("TESTING:Stage2A");

            break;



          case "TESTING:Stage3":

            do_test_finished();

            break;

        }

        return true;

      },

    };



    mM.addMessageListener("TESTING:Stage2", messageListener);

    mM.addMessageListener("TESTING:Stage3", messageListener);



    do_test_pending();

    do_load_child_test_harness();

    run_test_in_child("test_child.js");

  }

}