Limiting the "Cookies and site data" form to "web safe" schemes.

chrome/browser/browsing_data_local_storage_helper.cc

 // Copyright (c) 2011 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 "chrome/browser/browsing_data_local_storage_helper.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/dom_storage_context.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"

[jochen (gone - plz use gerrit), 2012/04/03 09:41:21]

W > p

[Mike West, 2012/04/03 14:45:51]

Done.

 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DOMStorageContext;
 using WebKit::WebSecurityOrigin;
 
 BrowsingDataLocalStorageHelper::LocalStorageInfo::LocalStorageInfo()
     : port(0),
@@ skipping 62 matching lines @@
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(
           &BrowsingDataLocalStorageHelper::FetchLocalStorageInfo,
           this, files));
 }
 
 void BrowsingDataLocalStorageHelper::FetchLocalStorageInfo(
     const std::vector<FilePath>& files) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  content::ChildProcessSecurityPolicy* policy =
+      content::ChildProcessSecurityPolicy::GetInstance();
   for (size_t i = 0; i < files.size(); ++i) {
     FilePath file_path = files[i];
     WebSecurityOrigin web_security_origin =
         WebSecurityOrigin::createFromDatabaseIdentifier(
             webkit_glue::FilePathToWebString(file_path.BaseName()));
-    if (EqualsASCII(web_security_origin.protocol(), chrome::kExtensionScheme)) {
-      // Extension state is not considered browsing data.
-      continue;
-    }
+    if (!policy->IsWebSafeScheme(UTF16ToUTF8(web_security_origin.protocol())))
+      continue;  // Non-websafe state is not considered browsing data.
+
     base::PlatformFileInfo file_info;
     bool ret = file_util::GetFileInfo(file_path, &file_info);
     if (ret) {
       local_storage_info_.push_back(LocalStorageInfo(
           web_security_origin.protocol().utf8(),
           web_security_origin.host().utf8(),
           web_security_origin.port(),
           web_security_origin.databaseIdentifier().utf8(),
           web_security_origin.toString().utf8(),
           file_path,
@@ skipping 33 matching lines @@
   CannedBrowsingDataLocalStorageHelper* clone =
       new CannedBrowsingDataLocalStorageHelper(profile_);
 
   clone->pending_local_storage_info_ = pending_local_storage_info_;
   clone->local_storage_info_ = local_storage_info_;
   return clone;
 }
 
 void CannedBrowsingDataLocalStorageHelper::AddLocalStorage(
     const GURL& origin) {
   pending_local_storage_info_.insert(origin);

[jochen (gone - plz use gerrit), 2012/04/03 09:41:21]

why no check here?

[Mike West, 2012/04/03 14:45:51]

Because I didn't see it. You'll note also the lack of a test. Bleh.

Fixed both.

 }
 
 void CannedBrowsingDataLocalStorageHelper::Reset() {
   local_storage_info_.clear();
   pending_local_storage_info_.clear();
 }
 
 bool CannedBrowsingDataLocalStorageHelper::empty() const {
   return local_storage_info_.empty() && pending_local_storage_info_.empty();
 }
@@ skipping 47 matching lines @@
         0,
         base::Time()));
   }
   pending_local_storage_info_.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CannedBrowsingDataLocalStorageHelper::NotifyInUIThread,
                  this));
 }