Replicate Content-Security-Policy into remote frame proxies.

third_party/WebKit/Source/core/dom/RemoteSecurityContext.cpp

 // 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 "core/dom/RemoteSecurityContext.h"
 
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "platform/weborigin/SecurityOrigin.h"
+#include "wtf/Assertions.h"
 
 namespace blink {
 
 RemoteSecurityContext::RemoteSecurityContext()
     : SecurityContext()
 {
     // RemoteSecurityContext's origin is expected to stay uninitialized until
     // we set it using replicated origin data from the browser process.
     DCHECK(!getSecurityOrigin());
 
-    // CSP will not be replicated for RemoteSecurityContexts, as it is moving
-    // to the browser process.  For now, initialize CSP to a default
-    // locked-down policy.
-    setContentSecurityPolicy(ContentSecurityPolicy::create());
+    // Start with a clean slate.
+    resetReplicatedContentSecurityPolicy();
 
     // FIXME: Document::initSecurityContext has a few other things we may
     // eventually want here, such as enforcing a setting to
     // grantUniversalAccess().
 }
 
 RemoteSecurityContext* RemoteSecurityContext::create()
 {
     return new RemoteSecurityContext();
 }
 
 DEFINE_TRACE(RemoteSecurityContext)
 {
     SecurityContext::trace(visitor);
 }
 
 void RemoteSecurityContext::setReplicatedOrigin(PassRefPtr<SecurityOrigin> origin)
 {
+    DCHECK(origin);
     setSecurityOrigin(origin);
+    contentSecurityPolicy()->setupSelf(*getSecurityOrigin());
 }
 
+void RemoteSecurityContext::resetReplicatedContentSecurityPolicy()
+{
+    setContentSecurityPolicy(ContentSecurityPolicy::create());
+    if (getSecurityOrigin())

[dcheng, 2016/05/17 05:57:15]

Is it possible to call this when the security origin is null? I would expect
not, but I wonder if I'm missing something.

[Łukasz Anforowicz, 2016/05/17 17:01:23]

When this is called from the constructor, then the security origin is null.  I
guess it might be clearer if the constructor didn't call
resetReplicatedContentSecurityPolicy but kept calling setContentSecurityPolicy
as before.

Done?

+        contentSecurityPolicy()->setupSelf(*getSecurityOrigin());
+}
 
 } // namespace blink