Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1641)

Unified Diff: content/child/site_isolation_stats_gatherer.h

Issue 1174323002: [Patch 5 of 6] Split out the site_isolation_policy files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rename_policy_to_sniffer3
Patch Set: Pull Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/child/site_isolation_stats_gatherer.h
diff --git a/content/child/site_isolation_policy.h b/content/child/site_isolation_stats_gatherer.h
similarity index 57%
copy from content/child/site_isolation_policy.h
copy to content/child/site_isolation_stats_gatherer.h
index acf24319729ab4549fdffcd3ac32016e15f00685..a94aa074625fea7ab6bac4325de149a916d91b94 100644
--- a/content/child/site_isolation_policy.h
+++ b/content/child/site_isolation_stats_gatherer.h
@@ -1,17 +1,17 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 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_CHILD_SITE_ISOLATION_POLICY_H_
-#define CONTENT_CHILD_SITE_ISOLATION_POLICY_H_
+#ifndef CONTENT_CHILD_SITE_ISOLATION_STATS_GATHERER_H_
+#define CONTENT_CHILD_SITE_ISOLATION_STATS_GATHERER_H_
-#include <map>
-#include <utility>
+#include <string>
#include "base/gtest_prod_util.h"
#include "base/memory/linked_ptr.h"
#include "base/strings/string_piece.h"
#include "content/common/content_export.h"
+#include "content/common/cross_site_document_classifier.h"
#include "content/public/common/resource_type.h"
#include "url/gurl.h"
@@ -19,11 +19,6 @@ namespace content {
struct ResourceResponseInfo;
-// CrossSiteDocumentClassifier implements the cross-site document blocking
-// policy (XSDP) for Site Isolation. XSDP will monitor network responses to a
-// renderer and block illegal responses so that a compromised renderer cannot
-// steal private information from other sites.
-//
// SiteIsolationStatsGatherer monitors responses to gather various UMA stats to
// see the compatibility impact of actual deployment of the policy. The UMA stat
// categories SiteIsolationStatsGatherer gathers are as follows:
@@ -54,16 +49,6 @@ struct ResourceResponseInfo;
// SiteIsolation.XSD.[%MIMETYPE].NotBlocked.MaybeJS :
// # of responses that are plausibly sniffed to be JavaScript.
-enum CrossSiteDocumentMimeType {
- // Note that these values are used in histograms, and must not change.
- CROSS_SITE_DOCUMENT_MIME_TYPE_HTML = 0,
- CROSS_SITE_DOCUMENT_MIME_TYPE_XML = 1,
- CROSS_SITE_DOCUMENT_MIME_TYPE_JSON = 2,
- CROSS_SITE_DOCUMENT_MIME_TYPE_PLAIN = 3,
- CROSS_SITE_DOCUMENT_MIME_TYPE_OTHERS = 4,
- CROSS_SITE_DOCUMENT_MIME_TYPE_MAX,
-};
-
struct SiteIsolationResponseMetaData {
SiteIsolationResponseMetaData();
@@ -75,7 +60,6 @@ struct SiteIsolationResponseMetaData {
bool no_sniff;
};
-// TODO(nick): Move this class into its own file.
class CONTENT_EXPORT SiteIsolationStatsGatherer {
public:
// Set activation flag for the UMA data collection for this renderer process.
@@ -110,44 +94,6 @@ class CONTENT_EXPORT SiteIsolationStatsGatherer {
DISALLOW_COPY_AND_ASSIGN(SiteIsolationStatsGatherer);
};
-// TODO(nick): Move this class into its own file.
-class CONTENT_EXPORT CrossSiteDocumentClassifier {
- public:
- // Returns the representative mime type enum value of the mime type of
- // response. For example, this returns the same value for all text/xml mime
- // type families such as application/xml, application/rss+xml.
- static CrossSiteDocumentMimeType GetCanonicalMimeType(
- const std::string& mime_type);
-
- // Returns whether this scheme is a target of cross-site document
- // policy(XSDP). This returns true only for http://* and https://* urls.
- static bool IsBlockableScheme(const GURL& frame_origin);
-
- // Returns whether the two urls belong to the same sites.
- static bool IsSameSite(const GURL& frame_origin, const GURL& response_url);
-
- // Returns whether there's a valid CORS header for frame_origin. This is
- // simliar to CrossOriginAccessControl::passesAccessControlCheck(), but we use
- // sites as our security domain, not origins.
- // TODO(dsjang): this must be improved to be more accurate to the actual CORS
- // specification. For now, this works conservatively, allowing XSDs that are
- // not allowed by actual CORS rules by ignoring 1) credentials and 2)
- // methods. Preflight requests don't matter here since they are not used to
- // decide whether to block a document or not on the client side.
- static bool IsValidCorsHeaderSet(const GURL& frame_origin,
- const GURL& website_origin,
- const std::string& access_control_origin);
-
- static bool SniffForHTML(base::StringPiece data);
- static bool SniffForXML(base::StringPiece data);
- static bool SniffForJSON(base::StringPiece data);
-
- private:
- CrossSiteDocumentClassifier(); // Not instantiable.
-
- DISALLOW_COPY_AND_ASSIGN(CrossSiteDocumentClassifier);
-};
-
} // namespace content
-#endif // CONTENT_CHILD_SITE_ISOLATION_POLICY_H_
+#endif // CONTENT_CHILD_SITE_ISOLATION_STATS_GATHERER_H_

Powered by Google App Engine
This is Rietveld 408576698