IndexedDB: Restore access checks in inspector-only IDBFactory methods

third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 45 matching lines @@
 
 static bool IsContextValid(ExecutionContext* context) {
   DCHECK(context->IsDocument() || context->IsWorkerGlobalScope());
   if (context->IsDocument()) {
     Document* document = ToDocument(context);
     return document->GetFrame() && document->GetPage();
   }
   return true;
 }
 
-IDBRequest* IDBFactory::GetDatabaseNames(ScriptState* script_state) {
+IDBRequest* IDBFactory::GetDatabaseNames(ScriptState* script_state,
+                                         ExceptionState& exception_state) {
+  // TODO(jsbell): Used only by inspector; remove unneeded checks/exceptions?
+  if (!IsContextValid(ExecutionContext::From(script_state)))
+    return nullptr;
+  if (!ExecutionContext::From(script_state)
+           ->GetSecurityOrigin()
+           ->CanAccessDatabase()) {
+    exception_state.ThrowSecurityError(
+        "access to the Indexed Database API is denied in this context.");
+    return nullptr;
+  }
+
   IDBRequest* request =
       IDBRequest::Create(script_state, IDBAny::CreateNull(), nullptr);
+
+  if (!IndexedDBClient::From(ExecutionContext::From(script_state))
+           ->AllowIndexedDB(ExecutionContext::From(script_state),
+                            "Database Listing")) {
+    request->EnqueueResponse(
+        DOMException::Create(kUnknownError, kPermissionDeniedErrorMessage));
+    return request;
+  }
+
   Platform::Current()->IdbFactory()->GetDatabaseNames(
       request->CreateWebCallbacks().release(),
       WebSecurityOrigin(
           ExecutionContext::From(script_state)->GetSecurityOrigin()));
   return request;
 }
 
 IDBOpenDBRequest* IDBFactory::open(ScriptState* script_state,
                                    const String& name,
                                    unsigned long long version,
@@ skipping 46 matching lines @@
                                    const String& name,
                                    ExceptionState& exception_state) {
   IDB_TRACE("IDBFactory::open");
   return OpenInternal(script_state, name, IDBDatabaseMetadata::kNoVersion,
                       exception_state);
 }
 
 IDBOpenDBRequest* IDBFactory::deleteDatabase(ScriptState* script_state,
                                              const String& name,
                                              ExceptionState& exception_state) {
+  return DeleteDatabaseInternal(script_state, name, exception_state,
+                                /*force_close=*/false);
+}
+
+IDBOpenDBRequest* IDBFactory::CloseConnectionsAndDeleteDatabase(
+    ScriptState* script_state,
+    const String& name,
+    ExceptionState& exception_state) {
+  // TODO(jsbell): Used only by inspector; remove unneeded checks/exceptions?
+  return DeleteDatabaseInternal(script_state, name, exception_state,
+                                /*force_close=*/true);
+}
+
+IDBOpenDBRequest* IDBFactory::DeleteDatabaseInternal(
+    ScriptState* script_state,
+    const String& name,
+    ExceptionState& exception_state,
+    bool force_close) {
   IDB_TRACE("IDBFactory::deleteDatabase");
   IDBDatabase::RecordApiCallsHistogram(kIDBDeleteDatabaseCall);
   if (!IsContextValid(ExecutionContext::From(script_state)))
     return nullptr;
   if (!ExecutionContext::From(script_state)
            ->GetSecurityOrigin()
            ->CanAccessDatabase()) {
     exception_state.ThrowSecurityError(
         "access to the Indexed Database API is denied in this context.");
     return nullptr;
   }
 
-  return DeleteDatabaseInternal(script_state, name, /*force_close=*/false);
-}
-
-IDBOpenDBRequest* IDBFactory::CloseConnectionsAndDeleteDatabase(
-    ScriptState* script_state,
-    const String& name) {
-  return DeleteDatabaseInternal(script_state, name, /*force_close=*/true);
-}
-
-IDBOpenDBRequest* IDBFactory::DeleteDatabaseInternal(ScriptState* script_state,
-                                                     const String& name,
-                                                     bool force_close) {
   IDBOpenDBRequest* request = IDBOpenDBRequest::Create(
       script_state, nullptr, 0, IDBDatabaseMetadata::kDefaultVersion);
 
   if (!IndexedDBClient::From(ExecutionContext::From(script_state))
            ->AllowIndexedDB(ExecutionContext::From(script_state), name)) {
     request->EnqueueResponse(
         DOMException::Create(kUnknownError, kPermissionDeniedErrorMessage));
     return request;
   }
 
@@ skipping 28 matching lines @@
   if (!second->IsValid()) {
     exception_state.ThrowDOMException(kDataError,
                                       IDBDatabase::kNotValidKeyErrorMessage);
     return 0;
   }
 
   return static_cast<short>(first->Compare(second));
 }
 
 }  // namespace blink