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

Unified Diff: content/common/cross_site_document_classifier.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/common/cross_site_document_classifier.h
diff --git a/content/child/site_isolation_policy.h b/content/common/cross_site_document_classifier.h
similarity index 40%
rename from content/child/site_isolation_policy.h
rename to content/common/cross_site_document_classifier.h
index acf24319729ab4549fdffcd3ac32016e15f00685..5f20463518c7154fdf405c736237fde8f83e4f41 100644
--- a/content/child/site_isolation_policy.h
+++ b/content/common/cross_site_document_classifier.h
@@ -1,58 +1,21 @@
-// 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_COMMON_CROSS_SITE_DOCUMENT_CLASSIFIER_H_
+#define CONTENT_COMMON_CROSS_SITE_DOCUMENT_CLASSIFIER_H_
-#include <map>
-#include <utility>
-
-#include "base/gtest_prod_util.h"
-#include "base/memory/linked_ptr.h"
+#include "base/basictypes.h"
#include "base/strings/string_piece.h"
#include "content/common/content_export.h"
-#include "content/public/common/resource_type.h"
#include "url/gurl.h"
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:
-//
-// SiteIsolation.AllResponses : # of all network responses.
-// SiteIsolation.XSD.DataLength : the length of the first packet of a response.
-// SiteIsolation.XSD.MimeType (enum):
-// # of responses from other sites, tagged with a document mime type.
-// 0:HTML, 1:XML, 2:JSON, 3:Plain, 4:Others
-// SiteIsolation.XSD.[%MIMETYPE].Blocked :
-// blocked # of cross-site document responses grouped by sniffed MIME type.
-// SiteIsolation.XSD.[%MIMETYPE].Blocked.RenderableStatusCode :
-// # of responses with renderable status code,
-// out of SiteIsolation.XSD.[%MIMETYPE].Blocked.
-// SiteIsolation.XSD.[%MIMETYPE].Blocked.NonRenderableStatusCode :
-// # of responses with non-renderable status code,
-// out of SiteIsolation.XSD.[%MIMETYPE].Blocked.
-// SiteIsolation.XSD.[%MIMETYPE].NoSniffBlocked.RenderableStatusCode :
-// # of responses failed to be sniffed for its MIME type, but blocked by
-// "X-Content-Type-Options: nosniff" header, and with renderable status code
-// out of SiteIsolation.XSD.[%MIMETYPE].Blocked.
-// SiteIsolation.XSD.[%MIMETYPE].NoSniffBlocked.NonRenderableStatusCode :
-// # of responses failed to be sniffed for its MIME type, but blocked by
-// "X-Content-Type-Options: nosniff" header, and with non-renderable status
-// code out of SiteIsolation.XSD.[%MIMETYPE].Blocked.
-// SiteIsolation.XSD.[%MIMETYPE].NotBlocked :
-// # of responses, but not blocked due to failure of mime sniffing.
-// 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.
@@ -64,53 +27,6 @@ enum CrossSiteDocumentMimeType {
CROSS_SITE_DOCUMENT_MIME_TYPE_MAX,
};
-struct SiteIsolationResponseMetaData {
- SiteIsolationResponseMetaData();
-
- std::string frame_origin;
- GURL response_url;
- ResourceType resource_type;
- CrossSiteDocumentMimeType canonical_mime_type;
- int http_status_code;
- 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.
- static void SetEnabled(bool enabled);
-
- // Returns any bookkeeping data about the HTTP header information for the
- // request identified by |request_id|. Any data returned should then be
- // passed to OnReceivedFirstChunk() with the first data chunk.
- static linked_ptr<SiteIsolationResponseMetaData> OnReceivedResponse(
- const GURL& frame_origin,
- const GURL& response_url,
- ResourceType resource_type,
- int origin_pid,
- const ResourceResponseInfo& info);
-
- // Examines the first chunk of network data in case response_url is registered
- // as a cross-site document by OnReceivedResponse(). This records various
- // kinds of UMA data stats. This function is called only if the length of
- // received data is non-zero.
- static bool OnReceivedFirstChunk(
- const linked_ptr<SiteIsolationResponseMetaData>& resp_data,
- const char* payload,
- int length);
- private:
- FRIEND_TEST_ALL_PREFIXES(SiteIsolationStatsGathererTest, SniffForJS);
-
- SiteIsolationStatsGatherer(); // Not instantiable.
-
- // Imprecise JS sniffing; only appropriate for collecting UMA stat.
- static bool SniffForJS(base::StringPiece data);
-
- 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
@@ -150,4 +66,4 @@ class CONTENT_EXPORT CrossSiteDocumentClassifier {
} // namespace content
-#endif // CONTENT_CHILD_SITE_ISOLATION_POLICY_H_
+#endif // CONTENT_COMMON_CROSS_SITE_DOCUMENT_CLASSIFIER_H_

Powered by Google App Engine
This is Rietveld 408576698