Chromium Code Reviews| Index: content/browser/frame_host/mixed_content_navigation_throttle.h | 
| diff --git a/content/browser/frame_host/mixed_content_navigation_throttle.h b/content/browser/frame_host/mixed_content_navigation_throttle.h | 
| new file mode 100644 | 
| index 0000000000000000000000000000000000000000..bf890c6de2c55604bd886daa159c37cbd18cae05 | 
| --- /dev/null | 
| +++ b/content/browser/frame_host/mixed_content_navigation_throttle.h | 
| @@ -0,0 +1,101 @@ | 
| +// Copyright 2016 The Chromium Authors. All rights reserved. | 
| 
 
nasko
2017/01/12 18:32:37
nit: We are now 2017 ;).
 
carlosk
2017/01/21 02:54:59
Done for all added files.
 
 | 
| +// Use of this source code is governed by a BSD-style license that can be | 
| +// found in the LICENSE file. | 
| + | 
| +#ifndef CONTENT_BROWSER_FRAME_HOST_MIXED_CONTENT_NAVIGATION_THROTTLE_H_ | 
| +#define CONTENT_BROWSER_FRAME_HOST_MIXED_CONTENT_NAVIGATION_THROTTLE_H_ | 
| + | 
| +#include <set> | 
| + | 
| +#include "base/gtest_prod_util.h" | 
| +#include "base/macros.h" | 
| +#include "content/common/content_export.h" | 
| +#include "content/public/browser/navigation_handle.h" | 
| +#include "content/public/browser/navigation_throttle.h" | 
| +#include "content/public/common/request_context_type.h" | 
| +#include "third_party/WebKit/public/platform/WebMixedContentContextType.h" | 
| + | 
| +namespace content { | 
| + | 
| +class FrameTreeNode; | 
| +struct WebPreferences; | 
| + | 
| +using ThrottleCheckResult = NavigationThrottle::ThrottleCheckResult; | 
| + | 
| +// Responsible for browser-process-side mixed-content security. It is only | 
| 
 
nasko
2017/01/12 18:32:37
nit: security checks.
 
carlosk
2017/01/21 02:54:59
Done.
 
 | 
| +// enabled if PlzNavigate is and checks only for frame-level resource loads (aka | 
| +// navigation loads). Sub-resources fetches are checked in the renderer process | 
| +// by MixedContentChecker. Changes to this class might need to be reflected on | 
| +// its renderer counterpart. | 
| +// | 
| +// Current mixed content W3C draft that drives this implementation: | 
| +// https://w3c.github.io/webappsec-mixed-content/ | 
| +class MixedContentNavigationThrottle : public NavigationThrottle { | 
| + public: | 
| + MixedContentNavigationThrottle(NavigationHandle* navigation_handle); | 
| + ~MixedContentNavigationThrottle() override; | 
| + | 
| + ThrottleCheckResult WillStartRequest() override; | 
| + | 
| 
 
nasko
2017/01/12 18:32:37
nit: No need for empty spaces, can cluster all thr
 
carlosk
2017/01/21 02:54:58
Done.
 
 | 
| + ThrottleCheckResult WillRedirectRequest() override; | 
| + | 
| + ThrottleCheckResult WillProcessResponse() override; | 
| + | 
| + private: | 
| + FRIEND_TEST_ALL_PREFIXES(MixedContentNavigationThrottleTest, IsMixedContent); | 
| + | 
| + // Copy of all mixed content related values from the blink::UseCounter enum. | 
| + enum UseCounterFeature { | 
| + MIXED_CONTENT_FORMS_SUBMITTED = 441, | 
| 
 
nasko
2017/01/12 18:32:37
Can we use static_assert to ensure we don't accide
 
carlosk
2017/01/21 02:54:58
See: https://codereview.chromium.org/1905033002/di
 
 | 
| + MIXED_CONTENT_PRIVATE_HOSTNAME_IN_PUBLIC_HOSTNAME = 530, | 
| + MIXED_CONTENT_PRESENT = 609, | 
| + MIXED_CONTENT_BLOCKABLE = 610, | 
| + MIXED_CONTENT_AUDIO = 611, | 
| + MIXED_CONTENT_DOWNLOAD = 612, | 
| + MIXED_CONTENT_FAVICON = 613, | 
| + MIXED_CONTENT_IMAGE = 614, | 
| + MIXED_CONTENT_INTERNAL = 615, | 
| + MIXED_CONTENT_PLUGIN = 616, | 
| + MIXED_CONTENT_PREFETCH = 617, | 
| + MIXED_CONTENT_VIDEO = 618, | 
| + MIXED_CONTENT_IN_NON_HTTPS_FRAME_THAT_RESTRICTS_MIXED_CONTENT = 661, | 
| + MIXED_CONTENT_IN_SECURE_FRAME_THAT_DOES_NOT_RESTRICT_MIXED_CONTENT = 662, | 
| + MIXED_CONTENT_WEB_SOCKET = 663, | 
| + MIXED_CONTENT_FORM_PRESENT = 665, | 
| + MIXED_CONTENT_BLOCKABLE_ALLOWED = 896, | 
| + BLOCKABLE_MIXED_CONTENT_IN_SUBFRAME_BLOCKED = 966, | 
| + }; | 
| 
 
Mike West
2017/01/13 13:20:00
I know we talked about this a while ago, but looki
 
carlosk
2017/01/21 02:54:59
Why do you think this triggers only on redirects?
 
Mike West
2017/01/25 11:37:30
Because I think you should remove the early-exit f
 
carlosk
2017/02/08 02:59:02
I trimmed down the constants list to only contain
 
 | 
| + | 
| + // Checks if a navigation should be blocked or not due to mixed content. | 
| + bool ShouldBlockNavigation(bool for_redirect); | 
| + | 
| + // Returns the parent frame where mixed content exists for the provided data | 
| + // or nullptr if there is no mixed content. | 
| + FrameTreeNode* InWhichFrameIsContentMixed(FrameTreeNode* node, | 
| + const GURL& url); | 
| + | 
| + // Updates the renderer about any Blink feature usage. | 
| + void MaybeSendBlinkFeatureUsageReport(); | 
| + | 
| + // Records basic mixed content "feature" usage when any kind of mixed is | 
| 
 
nasko
2017/01/12 18:32:37
nit: s/mixed/mixed content/
 
carlosk
2017/01/21 02:54:59
Done.
 
 | 
| + // found. | 
| + void ReportBasicMixedContentFeatures( | 
| + RequestContextType request_context_type, | 
| + blink::WebMixedContentContextType mixed_content_context_type, | 
| + const WebPreferences& prefs); | 
| + | 
| + static bool CONTENT_EXPORT IsMixedContentForTesting(const GURL& origin_url, | 
| 
 
nasko
2017/01/12 18:32:37
Why is this method CONTENT_EXPORT and private at t
 
carlosk
2017/01/21 02:54:59
Because its unit test friend-ed in line 45 needs t
 
 | 
| + const GURL& url); | 
| + | 
| + // Keeps track of mixed content features (as defined in blink::UseCounter) | 
| + // encountered while running one of the navigation throttling steps. These | 
| + // values are reported to the respective renderer process after each mixed | 
| + // content check is finished. | 
| + std::set<int> mixed_content_features_; | 
| + | 
| + DISALLOW_COPY_AND_ASSIGN(MixedContentNavigationThrottle); | 
| +}; | 
| + | 
| +} // namespace content | 
| + | 
| +#endif // CONTENT_BROWSER_FRAME_HOST_MIXED_CONTENT_NAVIGATION_THROTTLE_H_ |