CSP: Adding the 'upgrade-insecure-requests' directive.

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 22 matching lines @@
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class SecurityOrigin;
 class ContentSecurityPolicy;
 class KURL;
 
 class SecurityContext {
 public:
+    // The ordering here is important: 'upgrade' overrides 'monitor', which overrides 'ignore'.
+    enum InsecureContentPolicy {
+        InsecureContentIgnore = 0,

[Yoav Weiss, 2015/02/05 13:25:36]

Excuse the bikeshedding but is "ignore" the best name here? If we're not
upgrading, we're still blocking, right?

[Mike West, 2015/02/05 13:39:34]

No, it certainly isn't. InsecureContentDefault, maybe? Idunno.

[Yoav Weiss, 2015/02/05 13:49:13]

Yeah, "InsecureContentDefault" works for me

+        InsecureContentMonitor,
+        InsecureContentUpgrade
+    };
+
     SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
     ContentSecurityPolicy* contentSecurityPolicy() const { return m_contentSecurityPolicy.get(); }
 
     bool isSecureTransitionTo(const KURL&) const;
 
     // Explicitly override the security origin for this security context.
     // Note: It is dangerous to change the security origin of a script context
     //       that already contains content.
     void setSecurityOrigin(PassRefPtr<SecurityOrigin>);
     virtual void didUpdateSecurityOrigin() = 0;
 
     SandboxFlags sandboxFlags() const { return m_sandboxFlags; }
     bool isSandboxed(SandboxFlags mask) const { return m_sandboxFlags & mask; }
     void enforceSandboxFlags(SandboxFlags mask);
 
     void setHostedInReservedIPRange() { m_hostedInReservedIPRange = true; }
     bool isHostedInReservedIPRange() const { return m_hostedInReservedIPRange; }
 
+    void setInsecureContentPolicy(InsecureContentPolicy policy) { m_insecureContentPolicy = policy; }
+    InsecureContentPolicy insecureContentPolicy() const { return m_insecureContentPolicy; }
+
 protected:
     SecurityContext();
     virtual ~SecurityContext();
 
     void setContentSecurityPolicy(PassRefPtr<ContentSecurityPolicy>);
 
     void didFailToInitializeSecurityOrigin() { m_haveInitializedSecurityOrigin = false; }
     bool haveInitializedSecurityOrigin() const { return m_haveInitializedSecurityOrigin; }
 
 private:
     bool m_haveInitializedSecurityOrigin;
     RefPtr<SecurityOrigin> m_securityOrigin;
     RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy;
 
     SandboxFlags m_sandboxFlags;
 
     bool m_hostedInReservedIPRange;
+    InsecureContentPolicy m_insecureContentPolicy;
 };
 
 } // namespace blink
 
 #endif // SecurityContext_h