Make Document::isSecureContext() work for OOPIFs

third_party/WebKit/Source/core/dom/SecurityContext.h

 /*
  * Copyright (C) 2011 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 65 matching lines @@
 
     void setInsecureRequestsPolicy(InsecureRequestsPolicy policy) { m_insecureRequestsPolicy = policy; }
     InsecureRequestsPolicy insecureRequestsPolicy() const { return m_insecureRequestsPolicy; }
 
     void addInsecureNavigationUpgrade(unsigned hashedHost) { m_insecureNavigationsToUpgrade.add(hashedHost); }
     InsecureNavigationsSet* insecureNavigationsToUpgrade() { return &m_insecureNavigationsToUpgrade; }
 
     void setShouldEnforceStrictMixedContentChecking(bool shouldEnforce) { m_enforceStrictMixedContentChecking = shouldEnforce; }
     bool shouldEnforceStrictMixedContentChecking() { return m_enforceStrictMixedContentChecking; }
 
+    void setIsPotentiallyTrustworthySandboxedOrigin() { m_isPotentiallyTrustworthySandboxedOrigin = true; }
+    // Returns true if this context is a sandboxed unique origin that should be considered potentially trustworthy.
+    bool isPotentiallyTrustworthySandboxedOrigin() const { return m_isPotentiallyTrustworthySandboxedOrigin; }

[Mike West, 2016/02/24 08:40:59]

Did you consider putting this information into SecurityOrigin instead? Since
that's the object responsible for determining trustworthyness, it might makes
sense for it to take responsibility for this kind of calculation.

[estark, 2016/02/24 21:59:52]

That seems reasonable. I moved these same flags on to SecurityOrigin and made a
version of createUnique() that takes the flag values as input; let me know what
you think of this version.

+
+    // Returns true if this context is a sandboxed unique origin for which the secure context check should be bypassed.
+    bool bypassSecureContextCheckForSandboxedOrigin() const { return m_bypassSecureContextCheckForSandboxedOrigin; }
+
 protected:
     SecurityContext();
     virtual ~SecurityContext();
 
     void setContentSecurityPolicy(PassRefPtrWillBeRawPtr<ContentSecurityPolicy>);
 
     void didFailToInitializeSecurityOrigin() { m_haveInitializedSecurityOrigin = false; }
     bool haveInitializedSecurityOrigin() const { return m_haveInitializedSecurityOrigin; }
 
 private:
     bool m_haveInitializedSecurityOrigin;
     RefPtr<SecurityOrigin> m_securityOrigin;
     RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy;
 
     SandboxFlags m_sandboxFlags;
 
     bool m_hostedInReservedIPRange;
     InsecureRequestsPolicy m_insecureRequestsPolicy;
     InsecureNavigationsSet m_insecureNavigationsToUpgrade;
     bool m_enforceStrictMixedContentChecking;
+    bool m_isPotentiallyTrustworthySandboxedOrigin;
+    bool m_bypassSecureContextCheckForSandboxedOrigin;
 };
 
 } // namespace blink
 
 #endif // SecurityContext_h