Fix SRI bypass by loading same resource twice in same origin.

third_party/WebKit/Source/core/fetch/ScriptResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 16 matching lines @@
 #define ScriptResource_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/IntegrityMetadata.h"
 #include "core/fetch/ResourceClient.h"
 #include "core/fetch/TextResource.h"
 #include "platform/text/CompressibleString.h"
 
 namespace blink {
 
+enum ScriptIntegrityDisposition {

[dcheng, 2016/02/09 01:12:46]

Nit: use enum class? And just name the enum members NotChecked/Failed/Passed.

It'll make a few things more verbose, but having things in a real namespace is
nice so we don't have a situation like this: https://crbug.com/584543

[jww, 2016/02/09 04:38:50]

Done.

+    IntegrityNotChecked = 0,
+    IntegrityFailed,
+    IntegrityPassed
+};
+
 class FetchRequest;
 class ScriptResource;
 
 class CORE_EXPORT ScriptResourceClient : public ResourceClient {
 public:
     ~ScriptResourceClient() override {}
     static ResourceClientType expectedType() { return ScriptType; }
     ResourceClientType resourceClientType() const final { return expectedType(); }
 
     virtual void notifyAppendData(ScriptResource* resource) { }
@@ skipping 17 matching lines @@
     void destroyDecodedDataForFailedRevalidation() override;
 
     const CompressibleString& script();
 
     AtomicString mimeType() const;
 
     bool mimeTypeAllowedByNosniff() const;
 
     void setIntegrityMetadata(const IntegrityMetadataSet& metadata) { m_integrityMetadata = metadata; }
     const IntegrityMetadataSet& integrityMetadata() const { return m_integrityMetadata; }
-    void setIntegrityAlreadyChecked(bool checked) { m_integrityChecked = checked; }
-    bool integrityAlreadyChecked() { return m_integrityChecked; }
+    void setIntegrityAlreadyChecked(bool validIntegrity) { m_integrityDisposition =  (validIntegrity ? IntegrityPassed : IntegrityFailed); }
+    ScriptIntegrityDisposition integrityDisposition() { return m_integrityDisposition; }
     bool mustRefetchDueToIntegrityMetadata(const FetchRequest&) const override;
 
 private:
     class ScriptResourceFactory : public ResourceFactory {
     public:
         ScriptResourceFactory()
             : ResourceFactory(Resource::Script) { }
 
         Resource* create(const ResourceRequest& request, const String& charset) const override
         {
             return new ScriptResource(request, charset);
         }
     };
 
-    bool m_integrityChecked;
+    ScriptIntegrityDisposition m_integrityDisposition;
     IntegrityMetadataSet m_integrityMetadata;
 
     CompressibleString m_script;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Script);
 
 } // namespace blink
 
 #endif