Changeset 214776 in webkit


Ignore:
Timestamp:
Apr 3, 2017 5:35:30 AM (7 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r214237 - Disable all virtual tables.
<rdar://problem/31081972> and ​https://bugs.webkit.org/show_bug.cgi?id=169928
Source/WebCore:

Reviewed by Jer Noble.

No new tests (Covered by changes to existing test).

  • Modules/webdatabase/DatabaseAuthorizer.cpp:

(WebCore::DatabaseAuthorizer::createVTable):
(WebCore::DatabaseAuthorizer::dropVTable):

LayoutTests:

Reviewed by Jer Noble.

  • storage/websql/test-authorizer-expected.txt:
  • storage/websql/test-authorizer.js:

(createStatementsCallback):

Location:
releases/WebKitGTK/webkit-2.16
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog

    r214775 r214776  
     12017-03-21  Brady Eidson  <beidson@apple.com>
     2
     3        Disable all virtual tables.
     4        <rdar://problem/31081972> and https://bugs.webkit.org/show_bug.cgi?id=169928
     5
     6        Reviewed by Jer Noble.
     7
     8        * storage/websql/test-authorizer-expected.txt:
     9        * storage/websql/test-authorizer.js:
     10        (createStatementsCallback):
     11
    1122017-03-21  Zalan Bujtas  <zalan@apple.com>
    213

  • releases/WebKitGTK/webkit-2.16/LayoutTests/storage/websql/test-authorizer-expected.txt

    r183646 r214776  
    88SQLITE_CREATE_VIEW statement succeeded.
    99SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
     10SQLITE_CREATE_VTABLE (FTS3) statement failed: could not prepare statement (23 not authorized)
    1011SQLITE_READ statement succeeded.
    1112SQLITE_SELECT statement succeeded.
    … …  
    4142SQLITE_CREATE_VIEW statement failed: could not prepare statement (23 not authorized)
    4243SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
     44SQLITE_CREATE_VTABLE (FTS3) statement failed: could not prepare statement (23 not authorized)
    4345SQLITE_CREATE_INDEX statement succeeded.
    4446SQLITE_CREATE_TEMP_TABLE statement succeeded.
    … …  
    4850SQLITE_CREATE_VIEW statement succeeded.
    4951SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
     52SQLITE_CREATE_VTABLE (FTS3) statement failed: could not prepare statement (23 not authorized)
    5053SQLITE_READ statement succeeded.
    5154SQLITE_SELECT statement succeeded.

  • releases/WebKitGTK/webkit-2.16/LayoutTests/storage/websql/test-authorizer.js

    r183646 r214776  
    5959    executeStatement(tx, "CREATE VIEW TestView AS SELECT COUNT(*) FROM Test;", "SQLITE_CREATE_VIEW");
    6060    executeStatement(tx, "CREATE VIRTUAL TABLE TestVirtualTable USING MissingModule;", "SQLITE_CREATE_VTABLE");
     61    executeStatement(tx, "CREATE VIRTUAL TABLE TestVirtualTableFTS USING fts3;", "SQLITE_CREATE_VTABLE (FTS3)");
    6162}
    6263

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog

    r214775 r214776  
     12017-03-21  Brady Eidson  <beidson@apple.com>
     2
     3        Disable all virtual tables.
     4        <rdar://problem/31081972> and https://bugs.webkit.org/show_bug.cgi?id=169928
     5       
     6        Reviewed by Jer Noble.
     7
     8        No new tests (Covered by changes to existing test).
     9
     10        * Modules/webdatabase/DatabaseAuthorizer.cpp:
     11        (WebCore::DatabaseAuthorizer::createVTable):
     12        (WebCore::DatabaseAuthorizer::dropVTable):
     13
    1142017-03-21  Zalan Bujtas  <zalan@apple.com>
    215

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.cpp

    r203146 r214776  
    283283}
    284284
    285 int DatabaseAuthorizer::createVTable(const String& tableName, const String& moduleName)
    286 {
    287     if (!allowWrite())
    288         return SQLAuthDeny;
    289 
    290     // Allow only the FTS3 extension
    291     if (!equalLettersIgnoringASCIICase(moduleName, "fts3"))
    292         return SQLAuthDeny;
    293 
    294     m_lastActionChangedDatabase = true;
    295     return denyBasedOnTableName(tableName);
    296 }
    297 
    298 int DatabaseAuthorizer::dropVTable(const String& tableName, const String& moduleName)
    299 {
    300     if (!allowWrite())
    301         return SQLAuthDeny;
    302 
    303     // Allow only the FTS3 extension
    304     if (!equalLettersIgnoringASCIICase(moduleName, "fts3"))
    305         return SQLAuthDeny;
    306 
    307     return updateDeletesBasedOnTableName(tableName);
     285int DatabaseAuthorizer::createVTable(const String&, const String&)
     286{
     287    return SQLAuthDeny;
     288}
     289
     290int DatabaseAuthorizer::dropVTable(const String&, const String&)
     291{
     292    return SQLAuthDeny;
    308293}
    309294
Note: See TracChangeset for help on using the changeset viewer.