[WIP] Synthetic repro for bug 693720

chrome/common/chrome_content_client.cc

 // Copyright (c) 2012 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/common/chrome_content_client.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
@@ skipping 23 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/common_resources.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/version_info/version_info.h"
 #include "content/public/common/cdm_info.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/user_agent.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/switches.h"
 #include "extensions/features/features.h"
 #include "gpu/config/gpu_info.h"
 #include "media/media_features.h"
 #include "net/http/http_util.h"
 #include "pdf/features.h"
 #include "ppapi/features/features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/url_constants.h"
@@ skipping 558 matching lines @@
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   if (extensions::feature_util::ExtensionServiceWorkersEnabled())
     schemes->service_worker_schemes.push_back(extensions::kExtensionScheme);
 
   // As far as Blink is concerned, they should be allowed to receive CORS
   // requests. At the Extensions layer, requests will actually be blocked unless
   // overridden by the web_accessible_resources manifest key.
   // TODO(kalman): See what happens with a service worker.
   schemes->cors_enabled_schemes.push_back(extensions::kExtensionScheme);
 
-  schemes->csp_bypassing_schemes.push_back(extensions::kExtensionScheme);
+  // Outside of extension processes, Content Security Policy cannot be used to
+  // block the chrome-extension:// scheme. This is to prevent a page from using
+  // CSP to block user scripts. Within app/extension processes, this bypass is
+  // not necessary. And within isolated app processes, we rely on a restrictive
+  // CSP to ensure isolation of the StoragePartition, so it's important that
+  // other extensions be blocked.
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          extensions::switches::kExtensionProcess)) {
+    schemes->csp_bypassing_schemes.push_back(extensions::kExtensionScheme);
+  }
 #endif
 
 #if defined(OS_CHROMEOS)
   schemes->local_schemes.push_back(content::kExternalFileScheme);
 #endif
 
 #if defined(OS_ANDROID)
   schemes->local_schemes.push_back(url::kContentScheme);
 #endif
 }
@@ skipping 76 matching lines @@
   if (!origin_trial_policy_)
     origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>();
   return origin_trial_policy_.get();
 }
 
 #if defined(OS_ANDROID)
 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
   return new ChromeMediaClientAndroid();
 }
 #endif  // OS_ANDROID