Stop CSP from matching independent scheme/port upgrades (content layer)

content/common/content_security_policy/csp_source.h

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_CONTENT_SECURITY_POLICY_CSP_SOURCE_H_
 #define CONTENT_COMMON_CONTENT_SECURITY_POLICY_CSP_SOURCE_H_
 
 #include <string>
 
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class CSPContext;
 
 // A CSPSource represents an expression that matches a set of urls.
 // Examples of CSPSource:
 // - domain.example.com
 // - *.example.com
 // - https://cdn.com
 // - data:
 // - 'none'
 // - 'self'
 // - *
 struct CONTENT_EXPORT CSPSource {
+  // NotMatching is the only negative member, the rest are different types of
+  // matches. NotMatching should always be 0 to let if statements work nicely
+  enum class PortMatchingResult {
+    NotMatching,
+    MatchingWildcard,
+    MatchingUpgrade,
+    MatchingExact
+  };
+  enum class SchemeMatchingResult {
+    NotMatching,
+    MatchingUpgrade,
+    MatchingExact
+  };
+

[arthursonzogni, 2017/04/07 09:20:27]

Can you please put these enums inside the implementation? It is not used in the
header and users of this struct doesn't need to know about our implementation.

[andypaicu, 2017/04/07 11:34:24]

Done

   CSPSource();
   CSPSource(const std::string& scheme,
             const std::string& host,
             bool is_host_wildcard,
             int port,
             bool is_port_wildcard,
             const std::string& path);
   CSPSource(const CSPSource& source);
   ~CSPSource();
 
@@ skipping 20 matching lines @@
 
   // Returns true if the |source| matches the |url| for a given |context|.
   static bool Allow(const CSPSource& source,
                     const GURL& url,
                     CSPContext* context,
                     bool is_redirect = false);
 };
 
 }  // namespace content
 #endif  // CONTENT_COMMON_CONTENT_SECURITY_POLICY_CSP_SOURCE_H_