Changeset 184020 in webkit

Timestamp:

May 8, 2015, 3:56:33 PM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r183646. rdar://problem/20840031

Location:

branches/safari-600.1.4.16-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/websql/alter-to-info-table-expected.txt (copied) (copied from trunk/LayoutTests/storage/websql/alter-to-info-table-expected.txt )
• LayoutTests/storage/websql/alter-to-info-table.html (copied) (copied from trunk/LayoutTests/storage/websql/alter-to-info-table.html )
• LayoutTests/storage/websql/alter-to-info-table.js (copied) (copied from trunk/LayoutTests/storage/websql/alter-to-info-table.js )
• LayoutTests/storage/websql/test-authorizer-expected.txt (modified) (2 diffs)
• LayoutTests/storage/websql/test-authorizer.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (modified) (6 diffs)

branches/safari-600.1.4.16-branch/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-08  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r183646.
+
+    2015-04-30  Brady Eidson  <beidson@apple.com>
+
+            Javascript using WebSQL can create their own WebKit info table.
+            <rdar://problem/20688792> and https://bugs.webkit.org/show_bug.cgi?id=144466
+
+            Reviewed by Alex Christensen.
+
+            * storage/websql/alter-to-info-table-expected.txt: Added.
+            * storage/websql/alter-to-info-table.html: Added.
+            * storage/websql/alter-to-info-table.js: Added.
+
 2015-04-28  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-600.1.4.16-branch/LayoutTests/storage/websql/test-authorizer-expected.txt

@@ -16 +16 @@
 SQLITE_ALTER_TABLE statement succeeded.
 SQLITE_ALTER_TABLE statement succeeded.
+SQLITE_ALTER_INFO_TABLE statement failed: could not prepare statement (23 not authorized)
+SQLITE_ALTER_INFO_TABLE statement failed: could not prepare statement (23 not authorized)
+SQLITE_ALTER_INFO_TABLE statement failed: could not prepare statement (1 there is already another table or index with this name: __WebKitDatabaseInfoTable__)
 SQLITE_TRANSACTION statement failed: could not prepare statement (23 not authorized)
 SQLITE_ATTACH statement failed: could not prepare statement (23 not authorized)
@@ -53 +56 @@
 SQLITE_ALTER_TABLE statement failed: could not prepare statement (23 not authorized)
 SQLITE_ALTER_TABLE statement failed: could not prepare statement (1 no such table: TestTable)
+SQLITE_ALTER_INFO_TABLE statement failed: could not prepare statement (23 not authorized)
+SQLITE_ALTER_INFO_TABLE statement failed: could not prepare statement (23 not authorized)
+SQLITE_ALTER_INFO_TABLE statement failed: could not prepare statement (1 there is already another table or index with this name: __WebKitDatabaseInfoTable__)
 SQLITE_TRANSACTION statement failed: could not prepare statement (23 not authorized)
 SQLITE_ATTACH statement failed: could not prepare statement (23 not authorized)

branches/safari-600.1.4.16-branch/LayoutTests/storage/websql/test-authorizer.js

@@ -73 +73 @@
     // Rename the table back to its original name
     executeStatement(tx, "ALTER TABLE TestTable RENAME To Test;", "SQLITE_ALTER_TABLE");
+
+    // These should always fail, as nobody gets to mess with the info table.
+    executeStatement(tx, "ALTER TABLE __WebKitDatabaseInfoTable__ RENAME TO TestTable;", "SQLITE_ALTER_INFO_TABLE");
+    executeStatement(tx, "ALTER TABLE main.__WebKitDatabaseInfoTable__ RENAME TO TestTable;", "SQLITE_ALTER_INFO_TABLE");
+    executeStatement(tx, "ALTER TABLE Test RENAME TO __WebKitDatabaseInfoTable__;", "SQLITE_ALTER_INFO_TABLE");
 
     executeStatement(tx, "BEGIN TRANSACTION;", "SQLITE_TRANSACTION");

branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-08  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r183646.
+
+    2015-04-30  Brady Eidson  <beidson@apple.com>
+
+            Javascript using WebSQL can create their own WebKit info table.
+            <rdar://problem/20688792> and https://bugs.webkit.org/show_bug.cgi?id=144466
+
+            Reviewed by Alex Christensen.
+
+            Test: storage/websql/alter-to-info-table.html
+
+            * Modules/webdatabase/DatabaseBackendBase.cpp:
+            (WebCore::DatabaseBackendBase::databaseInfoTableName): Return the info table name.
+            (WebCore::fullyQualifiedInfoTableName): Append "main." to the info table name.
+            (WebCore::DatabaseBackendBase::DatabaseBackendBase): Use the fully qualified name.
+            (WebCore::DatabaseBackendBase::performOpenAndVerify): Ditto.
+            (WebCore::DatabaseBackendBase::getVersionFromDatabase): Ditto.
+            (WebCore::DatabaseBackendBase::setVersionInDatabase): Ditto.
+
 2015-04-28  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-600.1.4.16-branch/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp

@@ -86 +86 @@
 
 static const char versionKey[] = "WebKitDatabaseVersionKey";
-static const char infoTableName[] = "__WebKitDatabaseInfoTable__";
+static const char unqualifiedInfoTableName[] = "__WebKitDatabaseInfoTable__";
+
+const char* DatabaseBackendBase::databaseInfoTableName()
+{
+    return unqualifiedInfoTableName;
+}
+
+static const char* fullyQualifiedInfoTableName()
+{
+    static const char qualifier[] = "main.";
+    static char qualifiedName[sizeof(qualifier) + sizeof(unqualifiedInfoTableName) - 1];
+
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, []{
+        char* newDestination = stpcpy(qualifiedName, qualifier);
+        strcpy(newDestination, unqualifiedInfoTableName);
+    });
+
+    return qualifiedName;
+}
 
 static String formatErrorMessage(const char* message, int sqliteErrorCode, const char* sqliteErrorMessage)
@@ -193 +212 @@
 
     return guid;
-}
-
-// static
-const char* DatabaseBackendBase::databaseInfoTableName()
-{
-    return infoTableName;
 }
 
@@ -221 +234 @@
     m_contextThreadSecurityOrigin = m_databaseContext->securityOrigin()->isolatedCopy();
 
-    m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName);
+    m_databaseAuthorizer = DatabaseAuthorizer::create(unqualifiedInfoTableName);
 
     if (m_name.isNull())
@@ -351 +364 @@
             }
 
-            String tableName(infoTableName);
+            String tableName(unqualifiedInfoTableName);
             if (!m_sqliteDatabase.tableExists(tableName)) {
                 m_new = true;
@@ -450 +463 @@
 bool DatabaseBackendBase::getVersionFromDatabase(String& version, bool shouldCacheVersion)
 {
-    String query(String("SELECT value FROM ") + infoTableName +  " WHERE key = '" + versionKey + "';");
+    String query(String("SELECT value FROM ") + fullyQualifiedInfoTableName() +  " WHERE key = '" + versionKey + "';");
 
     m_databaseAuthorizer->disable();
@@ -470 +483 @@
     // The INSERT will replace an existing entry for the database with the new version number, due to the UNIQUE ON CONFLICT REPLACE
     // clause in the CREATE statement (see Database::performOpenAndVerify()).
-    String query(String("INSERT INTO ") + infoTableName +  " (key, value) VALUES ('" + versionKey + "', ?);");
+    String query(String("INSERT INTO ") + fullyQualifiedInfoTableName() +  " (key, value) VALUES ('" + versionKey + "', ?);");
 
     m_databaseAuthorizer->disable();