Add origins argument to registerForeignFetchScopes.

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"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/service_worker/service_worker_database.pb.h"
 #include "content/browser/service_worker/service_worker_metrics.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "third_party/leveldatabase/env_chromium.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
+#include "url/origin.h"
 
 // LevelDB database schema
 // =======================
 //
 // NOTE
 // - int64_t value is serialized as a string by base::Int64ToString().
 // - GURL value is serialized as a string by GURL::spec().
 //
 // Version 1 (in sorted order)
 //   key: "INITDATA_DB_VERSION"
@@ skipping 1148 matching lines @@
     GURL sub_scope_url(data.foreign_fetch_scope(i));
     if (!sub_scope_url.is_valid() ||
         !ServiceWorkerUtils::ScopeMatches(scope_url, sub_scope_url)) {
       DLOG(ERROR) << "Foreign fetch scope '" << data.foreign_fetch_scope(i)
                   << "' is not valid or does not match Scope URL '" << scope_url
                   << "'.";
       return ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED;
     }
     out->foreign_fetch_scopes.push_back(sub_scope_url);
   }
+  for (int i = 0; i < data.foreign_fetch_origin_size(); ++i) {
+    url::Origin parsed_origin(GURL(data.foreign_fetch_origin(i)));
+    if (parsed_origin.unique()) {
+      DLOG(ERROR) << "Foreign fetch origin '" << data.foreign_fetch_origin(i)
+                  << "' is not valid.";
+      return ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED;
+    }
+    out->foreign_fetch_origins.push_back(parsed_origin);
+  }
 
   return ServiceWorkerDatabase::STATUS_OK;
 }
 
 void ServiceWorkerDatabase::WriteRegistrationDataInBatch(
     const RegistrationData& registration,
     leveldb::WriteBatch* batch) {
   DCHECK(batch);
 
   // The registration id and version id should be bumped before this.
@@ skipping 11 matching lines @@
   data.set_last_update_check_time(
       registration.last_update_check.ToInternalValue());
   data.set_resources_total_size_bytes(registration.resources_total_size_bytes);
   for (const GURL& url : registration.foreign_fetch_scopes) {
     DCHECK(ServiceWorkerUtils::ScopeMatches(registration.scope, url))
         << "Foreign fetch scope '" << url
         << "' does not match service worker scope '" << registration.scope
         << "'.";
     data.add_foreign_fetch_scope(url.spec());
   }
+  for (const url::Origin& origin : registration.foreign_fetch_origins)
+    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,
@@ skipping 348 matching lines @@
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 bool ServiceWorkerDatabase::IsDatabaseInMemory() const {
   return path_.empty();
 }
 
 }  // namespace content