ServiceWorker: Ensure that a resource list contains the main script

content/browser/service_worker/service_worker_database.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_database.h"
 
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 443 matching lines @@
       if (status != STATUS_OK) {
         registrations->clear();
         if (opt_resources_list)
           opt_resources_list->clear();
         break;
       }
       registrations->push_back(registration);
 
       if (opt_resources_list) {
         std::vector<ResourceRecord> resources;
-        status = ReadResourceRecords(registration.version_id, &resources);
+        status = ReadResourceRecords(registration, &resources);
         if (status != STATUS_OK) {
           registrations->clear();
           opt_resources_list->clear();
           break;
         }
         opt_resources_list->push_back(resources);
       }
     }
   }
 
@@ skipping 52 matching lines @@
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_ERROR_NOT_FOUND;
   if (status != STATUS_OK)
     return status;
 
   RegistrationData value;
   status = ReadRegistrationData(registration_id, origin, &value);
   if (status != STATUS_OK)
     return status;
 
-  status = ReadResourceRecords(value.version_id, resources);
+  status = ReadResourceRecords(value, resources);
   if (status != STATUS_OK)
     return status;
 
   // ResourceRecord must contain the ServiceWorker's main script.
   if (resources->empty())
     return ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED;
 
   *registration = value;
   return STATUS_OK;
 }
@@ skipping 710 matching lines @@
     data.add_foreign_fetch_origin(origin.Serialize());
 
   std::string value;
   bool success = data.SerializeToString(&value);
   DCHECK(success);
   GURL origin = registration.scope.GetOrigin();
   batch->Put(CreateRegistrationKey(data.registration_id(), origin), value);
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadResourceRecords(
-    int64_t version_id,
+    const RegistrationData& registration,
     std::vector<ResourceRecord>* resources) {
   DCHECK(resources->empty());
 
   Status status = STATUS_OK;
-  const std::string prefix = CreateResourceRecordKeyPrefix(version_id);
-
+  bool has_main_resource = false;
+  const std::string prefix =
+      CreateResourceRecordKeyPrefix(registration.version_id);
   {
     std::unique_ptr<leveldb::Iterator> itr(
         db_->NewIterator(leveldb::ReadOptions()));
     for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
       Status status = LevelDBStatusToStatus(itr->status());
       if (status != STATUS_OK) {
         resources->clear();
         break;
       }
 
       if (!RemovePrefix(itr->key().ToString(), prefix, NULL))
         break;
 
       ResourceRecord resource;
       status = ParseResourceRecord(itr->value().ToString(), &resource);
       if (status != STATUS_OK) {
         resources->clear();
         break;
       }
+
+      if (registration.script == resource.url) {
+        DCHECK(!has_main_resource);
+        has_main_resource = true;
+      }
+
       resources->push_back(resource);
     }
   }
 
+  // |resources| should contain the main script.
+  if (!has_main_resource) {
+    resources->clear();
+    status = STATUS_ERROR_CORRUPTED;
+  }
+
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ParseResourceRecord(
     const std::string& serialized,
     ServiceWorkerDatabase::ResourceRecord* out) {
   DCHECK(out);
   ServiceWorkerResourceRecord record;
   if (!record.ParseFromString(serialized))
@@ skipping 313 matching lines @@
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 bool ServiceWorkerDatabase::IsDatabaseInMemory() const {
   return path_.empty();
 }
 
 }  // namespace content