CSP Suborigins

Source/core/dom/ExecutionContext.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2012 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 48 matching lines @@
     String m_errorMessage;
     int m_lineNumber;
     int m_columnNumber;
     String m_sourceURL;
     RefPtrWillBeMember<ScriptCallStack> m_callStack;
 };
 
 ExecutionContext::ExecutionContext()
     : m_client(0)
     , m_sandboxFlags(SandboxNone)
+    , m_suboriginName("")

[abarth-chromium, 2014/07/31 04:56:47]

We should just let this automatically initialize to the null string.

[jww, 2014/10/21 23:51:06]

No longer relevant (m_suboriginName is gone).

     , m_circularSequentialID(0)
     , m_inDispatchErrorEvent(false)
     , m_activeDOMObjectsAreSuspended(false)
     , m_activeDOMObjectsAreStopped(false)
 {
 }
 
 ExecutionContext::~ExecutionContext()
 {
 }
@@ skipping 250 matching lines @@
     m_sandboxFlags |= mask;
 
     RELEASE_ASSERT(m_client);
     // The SandboxOrigin is stored redundantly in the security origin.
     if (isSandboxed(SandboxOrigin) && m_client->securityContext().securityOrigin() && !m_client->securityContext().securityOrigin()->isUnique()) {
         m_client->securityContext().setSecurityOrigin(SecurityOrigin::createUnique());
         m_client->didUpdateSecurityOrigin();
     }
 }
 
+void ExecutionContext::enforceSuborigin(const String& name)
+{
+    RELEASE_ASSERT(m_client);
+    SecurityOrigin* origin = m_client->securityContext().securityOrigin();
+    ASSERT(origin);
+    if (!origin->hasSuborigin()) {
+        origin->addSuborigin(name);
+        m_client->didUpdateSecurityOrigin();
+    }
+}
+
 void ExecutionContext::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingExceptions);
 #endif
     Supplementable<WebCore::ExecutionContext>::trace(visitor);
 }
 
 } // namespace WebCore