wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1165263 - Part 3: Update mozprofile to support new moz_hosts schema, r=ahal

Browse Source
This commit is contained in:
Michael Layzell 2015-06-16 15:29:44 -04:00 committed by Ehsan Akhgari
parent 4933b84f3a
commit ef7ecffaad
3 changed files with 66 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
testing/mozbase/mozprofile/mozprofile/permissions.py
View File

@ -231,18 +231,26 @@ class Permissions(object):
# SQL copied from
# http://mxr.mozilla.org/mozilla-central/source/extensions/cookie/nsPermissionManager.cpp
cursor.execute("""CREATE TABLE IF NOT EXISTS moz_hosts (
id INTEGER PRIMARY KEY,
host TEXT,
type TEXT,
permission INTEGER,
expireType INTEGER,
expireTime INTEGER)""")
id INTEGER PRIMARY KEY
,origin TEXT
,type TEXT
,permission INTEGER
,expireType INTEGER
,expireTime INTEGER
,modificationTime INTEGER
)""")
rows = cursor.execute("PRAGMA table_info(moz_hosts)")
count = len(rows.fetchall())
using_origin = False
# if the db contains 7 columns, we're using user_version 5
if count == 7:
statement = "INSERT INTO moz_hosts values(NULL, ?, ?, ?, 0, 0, 0)"
cursor.execute("PRAGMA user_version=5;")
using_origin = True
# if the db contains 9 columns, we're using user_version 4
if count == 9:
elif count == 9:
statement = "INSERT INTO moz_hosts values(NULL, ?, ?, ?, 0, 0, 0, 0, 0)"
cursor.execute("PRAGMA user_version=4;")
# if the db contains 8 columns, we're using user_version 3
@ -262,8 +270,26 @@ class Permissions(object):
else:
permission_type = 2
cursor.execute(statement,
(location.host, perm, permission_type))
if using_origin:
# This is a crude approximation of the origin generation logic from
# nsPrincipal and nsStandardURL. It should suffice for the permissions
# which the test runners will want to insert into the system.
origin = location.scheme + "://" + location.host
if (location.scheme != 'http' or location.port != '80') and \
(location.scheme != 'https' or location.port != '443'):
origin += ':' + str(location.port)
cursor.execute(statement,
(origin, perm, permission_type))
else:
# The database is still using a legacy system based on hosts
# We can insert the permission as a host
#
# XXX This codepath should not be hit, as tests are run with
# fresh profiles. However, if it was hit, permissions would
# not be added to the database correctly (bug 1183185).
cursor.execute(statement,
(location.host, perm, permission_type))
# Commit and close
permDB.commit()

2
testing/mozbase/mozprofile/tests/bug785146.py
View File

@ -44,7 +44,7 @@ http://127.0.0.1:8888 privileged
entries = cur.fetchall()
schema_version = entries[0][0]
self.assertEqual(schema_version, 2)
self.assertEqual(schema_version, 5)
if __name__ == '__main__':
unittest.main()

41
testing/mozbase/mozprofile/tests/permissions.py
View File

@ -40,7 +40,16 @@ http://127.0.0.1:8888 privileged
cursor.execute("PRAGMA user_version=%d;" % version)
if version == 4:
if version == 5:
cursor.execute("""CREATE TABLE IF NOT EXISTS moz_hosts (
id INTEGER PRIMARY KEY,
origin TEXT,
type TEXT,
permission INTEGER,
expireType INTEGER,
expireTime INTEGER,
modificationTime INTEGER)""")
elif version == 4:
cursor.execute("""CREATE TABLE IF NOT EXISTS moz_hosts (
id INTEGER PRIMARY KEY,
host TEXT,
@ -70,7 +79,7 @@ http://127.0.0.1:8888 privileged
expireType INTEGER,
expireTime INTEGER)""")
else:
raise Exception("version must be 2, 3 or 4")
raise Exception("version must be 2, 3, 4 or 5")
permDB.commit()
cursor.close()
@ -79,7 +88,7 @@ http://127.0.0.1:8888 privileged
perms = Permissions(self.profile_dir, self.locations_file.name)
perms_db_filename = os.path.join(self.profile_dir, 'permissions.sqlite')
select_stmt = 'select host, type, permission from moz_hosts'
select_stmt = 'select origin, type, permission from moz_hosts'
con = sqlite3.connect(perms_db_filename)
cur = con.cursor()
@ -88,32 +97,32 @@ http://127.0.0.1:8888 privileged
self.assertEqual(len(entries), 3)
self.assertEqual(entries[0][0], 'mochi.test')
self.assertEqual(entries[0][0], 'http://mochi.test:8888')
self.assertEqual(entries[0][1], 'allowXULXBL')
self.assertEqual(entries[0][2], 1)
self.assertEqual(entries[1][0], '127.0.0.1')
self.assertEqual(entries[1][0], 'http://127.0.0.1')
self.assertEqual(entries[1][1], 'allowXULXBL')
self.assertEqual(entries[1][2], 2)
self.assertEqual(entries[2][0], '127.0.0.1')
self.assertEqual(entries[2][0], 'http://127.0.0.1:8888')
self.assertEqual(entries[2][1], 'allowXULXBL')
self.assertEqual(entries[2][2], 1)
perms._locations.add_host('a.b.c', options='noxul')
perms._locations.add_host('a.b.c', port='8081', scheme='https', options='noxul')
cur.execute(select_stmt)
entries = cur.fetchall()
self.assertEqual(len(entries), 4)
self.assertEqual(entries[3][0], 'a.b.c')
self.assertEqual(entries[3][0], 'https://a.b.c:8081')
self.assertEqual(entries[3][1], 'allowXULXBL')
self.assertEqual(entries[3][2], 2)
# when creating a DB we should default to user_version==2
# when creating a DB we should default to user_version==5
cur.execute('PRAGMA user_version')
entries = cur.fetchall()
self.assertEqual(entries[0][0], 2)
self.assertEqual(entries[0][0], 5)
perms.clean_db()
# table should be removed
@ -160,7 +169,14 @@ http://127.0.0.1:8888 privileged
self.assertEqual(len(entries), 3)
columns = 9 if version == 4 else (8 if version == 3 else 6)
columns = {
1: 6,
2: 6,
3: 8,
4: 9,
5: 7,
}[version]
self.assertEqual(len(entries[0]), columns)
for x in range(4, columns):
self.assertEqual(entries[0][x], 0)
@ -174,5 +190,8 @@ http://127.0.0.1:8888 privileged
def test_existing_permissions_db_v4(self):
self.verify_user_version(4)
def test_existing_permissions_db_v5(self):
self.verify_user_version(5)
if __name__ == '__main__':
unittest.main()