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 246 matching lines @@
 {
     m_sandboxFlags |= mask;
 
     // The SandboxOrigin is stored redundantly in the security origin.
     if (isSandboxed(SandboxOrigin) && securityContext().securityOrigin() && !securityContext().securityOrigin()->isUnique()) {
         securityContext().setSecurityOrigin(SecurityOrigin::createUnique());
         didUpdateSecurityOrigin();
     }
 }
 
+void ExecutionContext::enforceSuborigin(const String& name)
+{
+    if (name.isNull())

[Mike West, 2014/10/23 12:59:18]

isNull or isEmpty? Does enforcing an empty suborigin have a reasonable effect?

[jww, 2015/03/20 22:50:02]

You're right, the proposed spec requires at least one character, which should be
taken care of by parsing. Thus I'll add an ASSERT that this isn't empty.

+        return;
+    SecurityOrigin* origin = securityContext().securityOrigin();
+    ASSERT(origin);
+    if (!origin->hasSuborigin()) {

[Mike West, 2014/10/23 12:59:18]

Should we do something other than fail silently if a suborigin is already set?

[jww, 2015/03/20 22:50:02]

This should probably be an assert that there either isn't a suborigin or that
the new and old ones are the same.

+        origin->addSuborigin(name);
+        didUpdateSecurityOrigin();
+    }
+}
+
 void ExecutionContext::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingExceptions);
     HeapSupplementable<ExecutionContext>::trace(visitor);
 #endif
     LifecycleContext<ExecutionContext>::trace(visitor);
 }
 
 } // namespace blink