forked from mozilla/gecko-dev
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 1731739 part 3 - Migrate permissions for 3rdPartyStorage to site …
…keys, r=pbz,timhuang - Increment permissions database schema version - Apply GetSite to origin keys with type prefixed by "3rdPartyStorage^" - Done in a transaction - Add unit test for migration Differential Revision: https://phabricator.services.mozilla.com/D130676
- Loading branch information
1 parent
83bac9d
commit d507f12
Showing
4 changed files
with
315 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
232 changes: 232 additions & 0 deletions
232
extensions/permissions/test/unit/test_permmanager_migrate_11-12.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,232 @@ | ||
| /* Any copyright is dedicated to the Public Domain. | ||
| http://creativecommons.org/publicdomain/zero/1.0/ */ | ||
|
|
||
| ChromeUtils.defineModuleGetter( | ||
| this, | ||
| "PlacesTestUtils", | ||
| "resource://testing-common/PlacesTestUtils.jsm" | ||
| ); | ||
|
|
||
| var PERMISSIONS_FILE_NAME = "permissions.sqlite"; | ||
|
|
||
| function GetPermissionsFile(profile) { | ||
| let file = profile.clone(); | ||
| file.append(PERMISSIONS_FILE_NAME); | ||
| return file; | ||
| } | ||
|
|
||
| add_task(async function test() { | ||
| // Create and set up the permissions database. | ||
| Services.prefs.setCharPref("permissions.manager.defaultsUrl", ""); | ||
| let profile = do_get_profile(); | ||
|
|
||
| // We need to execute a pm method to be sure that the DB is fully | ||
| // initialized. | ||
| var pm = Services.perms; | ||
| Assert.equal(pm.all.length, 0, "No cookies"); | ||
|
|
||
| let db = Services.storage.openDatabase(GetPermissionsFile(profile)); | ||
| db.schemaVersion = 11; | ||
|
|
||
| let stmt6Insert = db.createStatement( | ||
| "INSERT INTO moz_perms (" + | ||
| "id, origin, type, permission, expireType, expireTime, modificationTime" + | ||
| ") VALUES (" + | ||
| ":id, :origin, :type, :permission, :expireType, :expireTime, :modificationTime" + | ||
| ")" | ||
| ); | ||
|
|
||
| let id = 0; | ||
|
|
||
| function insertOrigin( | ||
| origin, | ||
| type, | ||
| permission, | ||
| expireType, | ||
| expireTime, | ||
| modificationTime | ||
| ) { | ||
| let thisId = id++; | ||
|
|
||
| stmt6Insert.bindByName("id", thisId); | ||
| stmt6Insert.bindByName("origin", origin); | ||
| stmt6Insert.bindByName("type", type); | ||
| stmt6Insert.bindByName("permission", permission); | ||
| stmt6Insert.bindByName("expireType", expireType); | ||
| stmt6Insert.bindByName("expireTime", expireTime); | ||
| stmt6Insert.bindByName("modificationTime", modificationTime); | ||
|
|
||
| try { | ||
| stmt6Insert.execute(); | ||
| } finally { | ||
| stmt6Insert.reset(); | ||
| } | ||
|
|
||
| return { | ||
| id: thisId, | ||
| origin, | ||
| type, | ||
| permission, | ||
| expireType, | ||
| expireTime, | ||
| modificationTime, | ||
| }; | ||
| } | ||
|
|
||
| insertOrigin("https://a.com", "3rdPartyStorage^https://b.com", 2, 0, 0, 0); | ||
| insertOrigin( | ||
| "https://www.a.com", | ||
| "3rdPartyStorage^https://www.c.com", | ||
| 2, | ||
| 0, | ||
| 0, | ||
| 0 | ||
| ); | ||
| insertOrigin( | ||
| "https://localhost", | ||
| "3rdPartyStorage^http://www.c.com", | ||
| 2, | ||
| 0, | ||
| 0, | ||
| 0 | ||
| ); | ||
|
|
||
| insertOrigin( | ||
| "https://www.b.co.uk", | ||
| "3rdPartyStorage^https://www.a.co.uk", | ||
| 2, | ||
| 0, | ||
| 0, | ||
| 0 | ||
| ); | ||
|
|
||
| insertOrigin( | ||
| "https://sub.www.b.co.uk", | ||
| "3rdPartyStorage^https://sub.www.a.co.uk", | ||
| 2, | ||
| 0, | ||
| 0, | ||
| 0 | ||
| ); | ||
|
|
||
| insertOrigin( | ||
| "https://example.b.co.uk", | ||
| "3rdPartyStorage^https://www.a.co.uk", | ||
| 2, | ||
| 0, | ||
| 0, | ||
| 0 | ||
| ); | ||
|
|
||
| insertOrigin( | ||
| "https://[::1]", | ||
| "3rdPartyStorage^https://www.a.co.uk", | ||
| 2, | ||
| 0, | ||
| 0, | ||
| 0 | ||
| ); | ||
| // Close the db connection | ||
| stmt6Insert.finalize(); | ||
| db.close(); | ||
| db = null; | ||
| info(Services.perms.all); | ||
|
|
||
| let expected = [ | ||
| ["https://a.com", "3rdPartyStorage^https://b.com", 2, 0, 0, 0], | ||
| ["https://a.com", "3rdPartyStorage^https://www.c.com", 2, 0, 0, 0], | ||
| ["https://localhost", "3rdPartyStorage^http://www.c.com", 2, 0, 0, 0], | ||
| ["https://b.co.uk", "3rdPartyStorage^https://www.a.co.uk", 2, 0, 0, 0], | ||
| ["https://b.co.uk", "3rdPartyStorage^https://sub.www.a.co.uk", 2, 0, 0, 0], | ||
| ["https://[::1]", "3rdPartyStorage^https://www.a.co.uk", 2, 0, 0, 0], | ||
| ]; | ||
|
|
||
| let found = expected.map(it => 0); | ||
|
|
||
| // Add some places to the places database | ||
| await PlacesTestUtils.addVisits( | ||
| Services.io.newURI("https://foo.com/some/other/subdirectory") | ||
| ); | ||
| await PlacesTestUtils.addVisits( | ||
| Services.io.newURI("ftp://some.subdomain.of.foo.com:8000/some/subdirectory") | ||
| ); | ||
| await PlacesTestUtils.addVisits(Services.io.newURI("ftp://127.0.0.1:8080")); | ||
| await PlacesTestUtils.addVisits(Services.io.newURI("https://localhost:8080")); | ||
|
|
||
| // This will force the permission-manager to reload the data. | ||
| Services.obs.notifyObservers(null, "testonly-reload-permissions-from-disk"); | ||
|
|
||
| info(Services.perms.all); | ||
|
|
||
| // Force initialization of the PermissionManager | ||
| for (let permission of Services.perms.all) { | ||
| let isExpected = false; | ||
|
|
||
| expected.forEach((it, i) => { | ||
| if ( | ||
| permission.principal.origin == it[0] && | ||
| permission.type == it[1] && | ||
| permission.capability == it[2] && | ||
| permission.expireType == it[3] && | ||
| permission.expireTime == it[4] | ||
| ) { | ||
| isExpected = true; | ||
| found[i]++; | ||
| } | ||
| }); | ||
|
|
||
| Assert.ok( | ||
| isExpected, | ||
| "Permission " + | ||
| (isExpected ? "should" : "shouldn't") + | ||
| " be in permission database: " + | ||
| permission.principal.origin + | ||
| ", " + | ||
| permission.type + | ||
| ", " + | ||
| permission.capability + | ||
| ", " + | ||
| permission.expireType + | ||
| ", " + | ||
| permission.expireTime | ||
| ); | ||
| } | ||
| info(expected); | ||
| info(found); | ||
|
|
||
| found.forEach((count, i) => { | ||
| Assert.ok( | ||
| count == 1, | ||
| "Expected count = 1, got count = " + | ||
| count + | ||
| " for permission " + | ||
| expected[i] | ||
| ); | ||
| }); | ||
|
|
||
| // Check to make sure that all of the tables which we care about are present | ||
| { | ||
| db = Services.storage.openDatabase(GetPermissionsFile(profile)); | ||
| Assert.ok(db.tableExists("moz_perms")); | ||
| Assert.ok(db.tableExists("moz_hosts")); | ||
| Assert.ok(!db.tableExists("moz_perms_v6")); | ||
|
|
||
| let mozHostsCount = db.createStatement("SELECT count(*) FROM moz_hosts"); | ||
| try { | ||
| mozHostsCount.executeStep(); | ||
| Assert.equal(mozHostsCount.getInt64(0), 0); | ||
| } finally { | ||
| mozHostsCount.finalize(); | ||
| } | ||
|
|
||
| let mozPermsCount = db.createStatement("SELECT count(*) FROM moz_perms"); | ||
| try { | ||
| mozPermsCount.executeStep(); | ||
| Assert.equal(mozPermsCount.getInt64(0), expected.length); | ||
| } finally { | ||
| mozPermsCount.finalize(); | ||
| } | ||
|
|
||
| db.close(); | ||
| } | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters