IndexedDB: Check content settings for access to GetDatabaseInfo

Bug: 995591
Change-Id: I3edba1148e9e03e1029713438189649a56dfe0c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761472
Commit-Queue: Chase Phillips <cmp@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Chase Phillips <cmp@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688663}

chrome/browser/content_settings/content_settings_browsertest.cc

@@ -490,25 +490,48 @@ IN_PROC_BROWSER_TEST_P(CookieSettingsTest, BlockCookiesAlsoBlocksIndexedDB) {
       "    });"
       "  }"
       "  try {"
-      "    await wrap(%s);"
+      "    let promiselike = indexedDB.%s%s;"
+      "    if (typeof promiselike.then !== 'undefined') {"
+      "      await promiselike;"
+      "    }"
+      "    await wrap(promiselike);"
       "  } catch(e) {"
       "    return `${name} - ${e.toString()}`;"
       "  }"
       "  return `${name} - success`;"
       "}())";
 
-  const std::vector<std::string> kTestOps({
-      "indexedDB.open('foo', 1)",
-      "indexedDB.deleteDatabase('foo')",
-  });
+  struct TestOp {
+    const char* cmd;
+    const char* args;
+  };
+
+  const TestOp kTestOps[] = {
+      {.cmd = "open", .args = "('foo', 1)"},
+      {.cmd = "deleteDatabase", .args = "('foo')"},
+  };
 
   const char kBaseExpected[] =
       "%s - UnknownError: The user denied permission to access the database.";
 
   for (auto& op : kTestOps) {
     EXPECT_EQ(
-        base::StringPrintf(kBaseExpected, op.data()),
-        EvalJs(tab, base::StringPrintf(kBaseScript, op.data(), op.data())));
+        base::StringPrintf(kBaseExpected, op.cmd),
+        EvalJs(tab, base::StringPrintf(kBaseScript, op.cmd, op.cmd, op.args)));
+  }
+
+  const TestOp kPromiseTestOps[] = {
+      {.cmd = "databases", .args = "()"},
+  };
+
+  const char kPromiseBaseExpected[] =
+      "%s - UnknownError: Failed to execute '%s' on 'IDBFactory': The user "
+      "denied permission to access the database.";
+
+  for (auto& op : kPromiseTestOps) {
+    EXPECT_EQ(
+        base::StringPrintf(kPromiseBaseExpected, op.cmd, op.cmd),
+        EvalJs(tab, base::StringPrintf(kBaseScript, op.cmd, op.cmd, op.args)));
   }
 }
 

third_party/blink/renderer/modules/indexeddb/idb_factory.cc

@@ -227,6 +227,11 @@ ScriptPromise IDBFactory::GetDatabaseInfo(ScriptState* script_state,
                                           ExceptionState& exception_state) {
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
 
+  if (!IsContextValid(ExecutionContext::From(script_state))) {
+    resolver->Reject();
+    return resolver->Promise();
+  }
+
   if (!ExecutionContext::From(script_state)
            ->GetSecurityOrigin()
            ->CanAccessDatabase()) {
@@ -236,6 +241,13 @@ ScriptPromise IDBFactory::GetDatabaseInfo(ScriptState* script_state,
     return resolver->Promise();
   }
 
+  if (!CachedAllowIndexedDB(script_state)) {
+    exception_state.ThrowDOMException(DOMExceptionCode::kUnknownError,
+                                      kPermissionDeniedErrorMessage);
+    resolver->Reject();
+    return resolver->Promise();
+  }
+
   ExecutionContext* execution_context = ExecutionContext::From(script_state);
   WebIDBFactory* factory = GetFactory(execution_context);
   if (!factory) {