Title: [214518] branches/safari-603-branch
- Revision
- 214518
- Author
- [email protected]
- Date
- 2017-03-28 20:28:15 -0700 (Tue, 28 Mar 2017)
Log Message
Merge r214237. rdar://problem/31178134
Modified Paths
Diff
Modified: branches/safari-603-branch/LayoutTests/ChangeLog (214517 => 214518)
--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-29 03:28:12 UTC (rev 214517)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-29 03:28:15 UTC (rev 214518)
@@ -1,5 +1,20 @@
2017-03-28 Jason Marcell <[email protected]>
+ Merge r214237. rdar://problem/31178134
+
+ 2017-03-21 Brady Eidson <[email protected]>
+
+ Disable all virtual tables.
+ <rdar://problem/31081972> and https://bugs.webkit.org/show_bug.cgi?id=169928
+
+ Reviewed by Jer Noble.
+
+ * storage/websql/test-authorizer-expected.txt:
+ * storage/websql/test-authorizer.js:
+ (createStatementsCallback):
+
+2017-03-28 Jason Marcell <[email protected]>
+
Merge r214232. rdar://problem/30922105
2017-03-21 Zalan Bujtas <[email protected]>
Modified: branches/safari-603-branch/LayoutTests/storage/websql/test-authorizer-expected.txt (214517 => 214518)
--- branches/safari-603-branch/LayoutTests/storage/websql/test-authorizer-expected.txt 2017-03-29 03:28:12 UTC (rev 214517)
+++ branches/safari-603-branch/LayoutTests/storage/websql/test-authorizer-expected.txt 2017-03-29 03:28:15 UTC (rev 214518)
@@ -7,6 +7,7 @@
SQLITE_CREATE_TRIGGER statement succeeded.
SQLITE_CREATE_VIEW statement succeeded.
SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
+SQLITE_CREATE_VTABLE (FTS3) statement failed: could not prepare statement (23 not authorized)
SQLITE_READ statement succeeded.
SQLITE_SELECT statement succeeded.
SQLITE_DELETE statement succeeded.
@@ -40,6 +41,7 @@
SQLITE_CREATE_TRIGGER statement failed: could not prepare statement (1 not authorized)
SQLITE_CREATE_VIEW statement failed: could not prepare statement (23 not authorized)
SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
+SQLITE_CREATE_VTABLE (FTS3) statement failed: could not prepare statement (23 not authorized)
SQLITE_CREATE_INDEX statement succeeded.
SQLITE_CREATE_TEMP_TABLE statement succeeded.
SQLITE_CREATE_TEMP_TRIGGER statement succeeded.
@@ -47,6 +49,7 @@
SQLITE_CREATE_TRIGGER statement succeeded.
SQLITE_CREATE_VIEW statement succeeded.
SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
+SQLITE_CREATE_VTABLE (FTS3) statement failed: could not prepare statement (23 not authorized)
SQLITE_READ statement succeeded.
SQLITE_SELECT statement succeeded.
SQLITE_DELETE statement failed: could not prepare statement (23 not authorized)
Modified: branches/safari-603-branch/LayoutTests/storage/websql/test-authorizer.js (214517 => 214518)
--- branches/safari-603-branch/LayoutTests/storage/websql/test-authorizer.js 2017-03-29 03:28:12 UTC (rev 214517)
+++ branches/safari-603-branch/LayoutTests/storage/websql/test-authorizer.js 2017-03-29 03:28:15 UTC (rev 214518)
@@ -58,6 +58,7 @@
executeStatement(tx, "CREATE TRIGGER TestTrigger INSERT ON Test BEGIN SELECT COUNT(*) FROM Test; END;", "SQLITE_CREATE_TRIGGER");
executeStatement(tx, "CREATE VIEW TestView AS SELECT COUNT(*) FROM Test;", "SQLITE_CREATE_VIEW");
executeStatement(tx, "CREATE VIRTUAL TABLE TestVirtualTable USING MissingModule;", "SQLITE_CREATE_VTABLE");
+ executeStatement(tx, "CREATE VIRTUAL TABLE TestVirtualTableFTS USING fts3;", "SQLITE_CREATE_VTABLE (FTS3)");
}
function otherStatementsCallback(tx)
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214517 => 214518)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-29 03:28:12 UTC (rev 214517)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-29 03:28:15 UTC (rev 214518)
@@ -1,5 +1,22 @@
2017-03-28 Jason Marcell <[email protected]>
+ Merge r214237. rdar://problem/31178134
+
+ 2017-03-21 Brady Eidson <[email protected]>
+
+ Disable all virtual tables.
+ <rdar://problem/31081972> and https://bugs.webkit.org/show_bug.cgi?id=169928
+
+ Reviewed by Jer Noble.
+
+ No new tests (Covered by changes to existing test).
+
+ * Modules/webdatabase/DatabaseAuthorizer.cpp:
+ (WebCore::DatabaseAuthorizer::createVTable):
+ (WebCore::DatabaseAuthorizer::dropVTable):
+
+2017-03-28 Jason Marcell <[email protected]>
+
Merge r214232. rdar://problem/30922105
2017-03-21 Zalan Bujtas <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.cpp (214517 => 214518)
--- branches/safari-603-branch/Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.cpp 2017-03-29 03:28:12 UTC (rev 214517)
+++ branches/safari-603-branch/Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.cpp 2017-03-29 03:28:15 UTC (rev 214518)
@@ -282,29 +282,14 @@
return SQLAuthAllow;
}
-int DatabaseAuthorizer::createVTable(const String& tableName, const String& moduleName)
+int DatabaseAuthorizer::createVTable(const String&, const String&)
{
- if (!allowWrite())
- return SQLAuthDeny;
-
- // Allow only the FTS3 extension
- if (!equalLettersIgnoringASCIICase(moduleName, "fts3"))
- return SQLAuthDeny;
-
- m_lastActionChangedDatabase = true;
- return denyBasedOnTableName(tableName);
+ return SQLAuthDeny;
}
-int DatabaseAuthorizer::dropVTable(const String& tableName, const String& moduleName)
+int DatabaseAuthorizer::dropVTable(const String&, const String&)
{
- if (!allowWrite())
- return SQLAuthDeny;
-
- // Allow only the FTS3 extension
- if (!equalLettersIgnoringASCIICase(moduleName, "fts3"))
- return SQLAuthDeny;
-
- return updateDeletesBasedOnTableName(tableName);
+ return SQLAuthDeny;
}
int DatabaseAuthorizer::allowDelete(const String& tableName)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
