<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182356] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182356">182356</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-04-05 00:52:14 -0700 (Sun, 05 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Content Filtering] Blocked page is not always displayed when it should be
https://bugs.webkit.org/show_bug.cgi?id=143410
Source/WebCore:
rdar://problem/20211099
Reviewed by Andreas Kling.
These tests now pass: contentfiltering/block-after-add-data.html
contentfiltering/block-after-response.html
There were several problems with how ContentFilter loaded replacement data:
(1) Replacement data was delivered to DocumentLoader as if it were the original document's data. This assumes
that the original data was a UTF-8 encoded HTML document, which is not always true. We had a way to reset
the encoding, but not the content type.
(2) Replacement data was never delivered when the filter blocks in DocumentLoader::responseReceived().
(3) The main resource load was cancelled before the replacement data could be rendered when the filter blocks
in DocumentLoader::dataReceived().
The result was that only when the load was blocked after DocumentLoader::notifyFinished() would the replacement
data be shown properly, and only when problem (1) wasn't occurring.
This patch addresses these issues by using the substitute data mechanism to deliver replacement data. By using
substitute data, we can ensure that the original load is cancelled at the earliest opportunity and that the
replacement data is loaded with the proper content type and encoding.
Accomplishing this required changing the way ContentFilter interacts with DocumentLoader. Instead of placing
ContentFilter hooks throughout DocumentLoader, this patch makes ContentFilter itself the client of the
CachedRawResource for the duration of the filtering. If the filter decides to allow the load, DocumentLoader
adds itself as a client causing CachedRawResource to deliver to it the response and buffered data. If the
filter decides to block the load, DocumentLoader schedules a substitute data load. An added benefit of this
approach is that ContentFilter can reuse CachedRawResource's original data buffer instead of keeping its own.
* loader/ContentFilter.cpp:
(WebCore::ContentFilter::createIfNeeded): Changed to take a DecisionFunction rather than a ResourceResponse and DocumentLoader.
(WebCore::ContentFilter::ContentFilter): Ditto.
(WebCore::ContentFilter::~ContentFilter): Removed ourself as a CachedRawResource client if needed.
(WebCore::ContentFilter::startFilteringMainResource): Became the client of the CachedRawResource in order to start the filtering process.
(WebCore::ContentFilter::unblockHandler): Returned the unblock handler.
(WebCore::ContentFilter::replacementData): Returned the replacement data.
(WebCore::ContentFilter::unblockRequestDeniedScript): Returned the unblock request denied script.
(WebCore::ContentFilter::responseReceived): Called responseReceived() on each filter using forEachContentFilterUntilBlocked().
(WebCore::ContentFilter::dataReceived): Ditto for dataReceived().
(WebCore::ContentFilter::notifyFinished): Ditto for finishedLoading().
(WebCore::ContentFilter::forEachContentFilterUntilBlocked): For each filter that needs more data, called the function.
If the filter blocked the load, called didDecide() with State::Blocked.
If all filters allowed the load, called didDecide() with State::Allowed.
(WebCore::ContentFilter::didDecide): Set m_state and called m_decisionFunction().
(WebCore::ContentFilter::addData): Deleted.
(WebCore::ContentFilter::finishedAddingData): Deleted.
(WebCore::ContentFilter::needsMoreData): Deleted.
(WebCore::ContentFilter::didBlockData): Deleted.
(WebCore::ContentFilter::getReplacementData): Deleted.
* loader/ContentFilter.h:
(WebCore::ContentFilter::type):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::DocumentLoader): Called ContentFilter::createIfNeeded() if not loading substitute data.
(WebCore::DocumentLoader::finishedLoading): Removed old ContentFilter code.
(WebCore::DocumentLoader::responseReceived): Ditto.
(WebCore::DocumentLoader::commitData): Ditto.
(WebCore::DocumentLoader::dataReceived): Ditto.
(WebCore::DocumentLoader::detachFromFrame): Set m_contentFilter to nullptr.
(WebCore::DocumentLoader::startLoadingMainResource): Called becomeMainResourceClientIfFilterAllows() instead of
becoming m_mainResource's client.
(WebCore::DocumentLoader::clearMainResource): Set m_contentFilter to nullptr.
(WebCore::DocumentLoader::becomeMainResourceClientIfFilterAllows): If ContentFilter is initialized, called
ContentFilter::startFilteringMainResource(). Otherwise added ourself as a client of m_mainResource.
(WebCore::DocumentLoader::installContentFilterUnblockHandler): Added a helper for creating and notifying
FrameLoaderClient of the unblock handler.
(WebCore::DocumentLoader::contentFilterDidDecide): Set m_contentFilter to nullptr. If the content filter
allowed the load, then added ourself as the CachedRawResource's client. Otherwise, installed the unblock handler
and scheduled a substitute data load with the replacement data.
* loader/DocumentLoader.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::prepareForLoadStart): Removed call to PolicyChecker::prepareForLoadStart().
* loader/NavigationScheduler.cpp:
(WebCore::ScheduledSubstituteDataLoad::ScheduledSubstituteDataLoad): Added a ScheduledNavigation subclass that
calls FrameLoader::load() with a FrameLoadRequest containing substitute data.
(WebCore::NavigationScheduler::scheduleSubstituteDataLoad): Scheduled a substitute data load.
* loader/NavigationScheduler.h:
* loader/PolicyChecker.cpp:
(WebCore::PolicyChecker::checkNavigationPolicy): Reset m_contentFilterUnblockHandler if it couldn't handle the request.
(WebCore::PolicyChecker::prepareForLoadStart): Deleted.
* loader/PolicyChecker.h:
* platform/ContentFilterUnblockHandler.h:
(WebCore::ContentFilterUnblockHandler::unreachableURL):
(WebCore::ContentFilterUnblockHandler::setUnreachableURL):
(WebCore::ContentFilterUnblockHandler::unblockURLScheme): Renamed to ContentFilter::urlScheme().
* platform/PlatformContentFilter.h:
* platform/cocoa/ContentFilterUnblockHandlerCocoa.mm:
(WebCore::ContentFilterUnblockHandler::wrapWithDecisionHandler): Added a helper to wrap the unblock handler with an outer DecisionHandlerFunction.
(WebCore::ContentFilterUnblockHandler::encode): Added m_unreachableURL to the encoding.
(WebCore::ContentFilterUnblockHandler::decode): Ditto for the decoding.
(WebCore::ContentFilterUnblockHandler::canHandleRequest): Changed to call ContentFilter::urlScheme().
* platform/cocoa/NetworkExtensionContentFilter.h:
* platform/cocoa/NetworkExtensionContentFilter.mm:
(replacementDataFromDecisionInfo): Added a helper to extract replacement data from the decisionInfo dictionary.
(WebCore::NetworkExtensionContentFilter::enabled): Renamed from canHandleReponse(); only checks if the filter is enabled.
(WebCore::NetworkExtensionContentFilter::create): Created a new object.
(WebCore::NetworkExtensionContentFilter::NetworkExtensionContentFilter): Created a NEFilterSource immediately when using the modern API.
(WebCore::NetworkExtensionContentFilter::responseReceived): Created a NEFilterSource when using the legacy API.
Called -[NEFilterSource receivedResponse:decisionHandler:] when using the modern API.
(WebCore::NetworkExtensionContentFilter::addData): Stopped buffering the original data.
(WebCore::NetworkExtensionContentFilter::replacementData): Returned a SharedBuffer instead of a char* and int&.
(WebCore::NetworkExtensionContentFilter::canHandleResponse): Deleted.
(WebCore::createNEFilterSource): Deleted.
(WebCore::NetworkExtensionContentFilter::getReplacementData): Deleted.
* platform/cocoa/ParentalControlsContentFilter.h:
* platform/cocoa/ParentalControlsContentFilter.mm:
(WebCore::ParentalControlsContentFilter::enabled): Renamed from canHandleReponse(); only checks if the filter is enabled.
(WebCore::ParentalControlsContentFilter::create): Created a new object.
(WebCore::ParentalControlsContentFilter::ParentalControlsContentFilter): Initialized m_filterState to kWFEStateBuffering.
(WebCore::canHandleResponse): Added a helper to check if the response can be filtered.
(WebCore::ParentalControlsContentFilter::responseReceived): If !canHandleResponse(), set m_filterState to kWFEStateAllowed and return.
Otherwise created a new WebFilterEvaluator with the response.
(WebCore::ParentalControlsContentFilter::addData): Called updateFilterState().
(WebCore::ParentalControlsContentFilter::finishedAddingData): Ditto.
(WebCore::ParentalControlsContentFilter::needsMoreData): Changed to check m_filterState.
(WebCore::ParentalControlsContentFilter::didBlockData): Ditto.
(WebCore::ParentalControlsContentFilter::replacementData): Returned a SharedBuffer instead of a char* and int&.
(WebCore::ParentalControlsContentFilter::updateFilterState): Updated m_filterState by calling -[WebFilterEvaluator filterState].
(WebCore::ParentalControlsContentFilter::canHandleResponse): Deleted.
(WebCore::ParentalControlsContentFilter::getReplacementData): Deleted.
* platform/spi/cocoa/NEFilterSourceSPI.h:
* platform/spi/cocoa/WebFilterEvaluatorSPI.h:
* testing/MockContentFilter.cpp:
(WebCore::MockContentFilter::enabled): Renamed from canHandleReponse(); only checks if the filter is enabled.
(WebCore::MockContentFilter::create): Created a new object.
(WebCore::MockContentFilter::responseReceived): Called maybeDetermineStatus().
(WebCore::MockContentFilter::addData): Stopped buffering the original data.
(WebCore::MockContentFilter::replacementData): Returned a SharedBuffer instead of a char* and int&.
(WebCore::MockContentFilter::unblockHandler): Asserted that we blocked data.
(WebCore::MockContentFilter::canHandleResponse): Deleted.
(WebCore::MockContentFilter::MockContentFilter): Deleted.
(WebCore::MockContentFilter::getReplacementData): Deleted.
* testing/MockContentFilter.h:
* testing/MockContentFilterSettings.cpp:
(WebCore::MockContentFilterSettings::unblockRequestURL): Changed to use a StringBuilder.
Source/WebKit2:
Reviewed by Andreas Kling.
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::didStartProvisionalLoad): Stopped clearing m_contentFilterUnblockHandler here.
(WebKit::WebFrameProxy::didHandleContentFilterUnblockNavigation): Started doing it here instead.
LayoutTests:
Reviewed by Andreas Kling.
* TestExpectations: Unskipped block-after-add-data.html.
* contentfiltering/block-after-add-data-expected.html: Added a passing expectation.
* contentfiltering/block-after-response-expected.html: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafteradddataexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-add-data-expected.html</a></li>
<li><a href="#trunkLayoutTestscontentfilteringblockafterresponseexpectedhtml">trunk/LayoutTests/contentfiltering/block-after-response-expected.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderContentFiltercpp">trunk/Source/WebCore/loader/ContentFilter.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderContentFilterh">trunk/Source/WebCore/loader/ContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulerh">trunk/Source/WebCore/loader/NavigationScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreloaderPolicyCheckercpp">trunk/Source/WebCore/loader/PolicyChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPolicyCheckerh">trunk/Source/WebCore/loader/PolicyChecker.h</a></li>
<li><a href="#trunkSourceWebCoreplatformContentFilterUnblockHandlerh">trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformContentFilterh">trunk/Source/WebCore/platform/PlatformContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaContentFilterUnblockHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaNetworkExtensionContentFilterh">trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaNetworkExtensionContentFiltermm">trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaParentalControlsContentFilterh">trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaParentalControlsContentFiltermm">trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNEFilterSourceSPIh">trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaWebFilterEvaluatorSPIh">trunk/Source/WebCore/platform/spi/cocoa/WebFilterEvaluatorSPI.h</a></li>
<li><a href="#trunkSourceWebCoretestingMockContentFiltercpp">trunk/Source/WebCore/testing/MockContentFilter.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingMockContentFilterh">trunk/Source/WebCore/testing/MockContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoretestingMockContentFilterSettingscpp">trunk/Source/WebCore/testing/MockContentFilterSettings.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/LayoutTests/ChangeLog 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-04 Andy Estes <aestes@apple.com>
+
+ [Content Filtering] Blocked page is not always displayed when it should be
+ https://bugs.webkit.org/show_bug.cgi?id=143410
+
+ Reviewed by Andreas Kling.
+
+ * TestExpectations: Unskipped block-after-add-data.html.
+ * contentfiltering/block-after-add-data-expected.html: Added a passing expectation.
+ * contentfiltering/block-after-response-expected.html: Ditto.
+
</ins><span class="cx"> 2015-04-04 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Heuristic: Avoid exposing an element as clickable if mouse event delegation is handled on an AXElement with more than one descendant AXElement
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/LayoutTests/TestExpectations 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -497,9 +497,6 @@
</span><span class="cx"> webkit.org/b/114280 svg/animations/smil-leak-element-instances.svg [ Pass Failure ]
</span><span class="cx"> webkit.org/b/114280 svg/animations/smil-leak-elements.svg [ Pass Failure ]
</span><span class="cx">
</span><del>-# contentfiltering/block-after-add-data.html times out unexpectedly
-webkit.org/b/142894 contentfiltering/block-after-add-data.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/143085 media/track/track-mode.html [ Pass Timeout ]
</span><span class="cx">
</span><span class="cx"> # In ES6, Object type restrictions on a first parameter of several Object.* functions are relaxed.
</span></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafteradddataexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/contentfiltering/block-after-add-data-expected.html (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-add-data-expected.html 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/LayoutTests/contentfiltering/block-after-add-data-expected.html 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><span class="cx"> <!DOCTYPE html>
</span><del>-<iframe src="data:text/html,<!DOCTYPE html><body>"></iframe>
</del><ins>+<iframe src="data:text/html,<!DOCTYPE html><body>PASS"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestscontentfilteringblockafterresponseexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/contentfiltering/block-after-response-expected.html (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/contentfiltering/block-after-response-expected.html 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/LayoutTests/contentfiltering/block-after-response-expected.html 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><span class="cx"> <!DOCTYPE html>
</span><del>-<iframe src="data:text/html,<!DOCTYPE html><body>FAIL"></iframe>
</del><ins>+<iframe src="data:text/html,<!DOCTYPE html><body>PASS"></iframe>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/ChangeLog 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -1,3 +1,141 @@
</span><ins>+2015-04-04 Andy Estes <aestes@apple.com>
+
+ [Content Filtering] Blocked page is not always displayed when it should be
+ https://bugs.webkit.org/show_bug.cgi?id=143410
+ rdar://problem/20211099
+
+ Reviewed by Andreas Kling.
+
+ These tests now pass: contentfiltering/block-after-add-data.html
+ contentfiltering/block-after-response.html
+
+ There were several problems with how ContentFilter loaded replacement data:
+ (1) Replacement data was delivered to DocumentLoader as if it were the original document's data. This assumes
+ that the original data was a UTF-8 encoded HTML document, which is not always true. We had a way to reset
+ the encoding, but not the content type.
+ (2) Replacement data was never delivered when the filter blocks in DocumentLoader::responseReceived().
+ (3) The main resource load was cancelled before the replacement data could be rendered when the filter blocks
+ in DocumentLoader::dataReceived().
+ The result was that only when the load was blocked after DocumentLoader::notifyFinished() would the replacement
+ data be shown properly, and only when problem (1) wasn't occurring.
+
+ This patch addresses these issues by using the substitute data mechanism to deliver replacement data. By using
+ substitute data, we can ensure that the original load is cancelled at the earliest opportunity and that the
+ replacement data is loaded with the proper content type and encoding.
+
+ Accomplishing this required changing the way ContentFilter interacts with DocumentLoader. Instead of placing
+ ContentFilter hooks throughout DocumentLoader, this patch makes ContentFilter itself the client of the
+ CachedRawResource for the duration of the filtering. If the filter decides to allow the load, DocumentLoader
+ adds itself as a client causing CachedRawResource to deliver to it the response and buffered data. If the
+ filter decides to block the load, DocumentLoader schedules a substitute data load. An added benefit of this
+ approach is that ContentFilter can reuse CachedRawResource's original data buffer instead of keeping its own.
+
+ * loader/ContentFilter.cpp:
+ (WebCore::ContentFilter::createIfNeeded): Changed to take a DecisionFunction rather than a ResourceResponse and DocumentLoader.
+ (WebCore::ContentFilter::ContentFilter): Ditto.
+ (WebCore::ContentFilter::~ContentFilter): Removed ourself as a CachedRawResource client if needed.
+ (WebCore::ContentFilter::startFilteringMainResource): Became the client of the CachedRawResource in order to start the filtering process.
+ (WebCore::ContentFilter::unblockHandler): Returned the unblock handler.
+ (WebCore::ContentFilter::replacementData): Returned the replacement data.
+ (WebCore::ContentFilter::unblockRequestDeniedScript): Returned the unblock request denied script.
+ (WebCore::ContentFilter::responseReceived): Called responseReceived() on each filter using forEachContentFilterUntilBlocked().
+ (WebCore::ContentFilter::dataReceived): Ditto for dataReceived().
+ (WebCore::ContentFilter::notifyFinished): Ditto for finishedLoading().
+ (WebCore::ContentFilter::forEachContentFilterUntilBlocked): For each filter that needs more data, called the function.
+ If the filter blocked the load, called didDecide() with State::Blocked.
+ If all filters allowed the load, called didDecide() with State::Allowed.
+ (WebCore::ContentFilter::didDecide): Set m_state and called m_decisionFunction().
+ (WebCore::ContentFilter::addData): Deleted.
+ (WebCore::ContentFilter::finishedAddingData): Deleted.
+ (WebCore::ContentFilter::needsMoreData): Deleted.
+ (WebCore::ContentFilter::didBlockData): Deleted.
+ (WebCore::ContentFilter::getReplacementData): Deleted.
+ * loader/ContentFilter.h:
+ (WebCore::ContentFilter::type):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::DocumentLoader): Called ContentFilter::createIfNeeded() if not loading substitute data.
+ (WebCore::DocumentLoader::finishedLoading): Removed old ContentFilter code.
+ (WebCore::DocumentLoader::responseReceived): Ditto.
+ (WebCore::DocumentLoader::commitData): Ditto.
+ (WebCore::DocumentLoader::dataReceived): Ditto.
+ (WebCore::DocumentLoader::detachFromFrame): Set m_contentFilter to nullptr.
+ (WebCore::DocumentLoader::startLoadingMainResource): Called becomeMainResourceClientIfFilterAllows() instead of
+ becoming m_mainResource's client.
+ (WebCore::DocumentLoader::clearMainResource): Set m_contentFilter to nullptr.
+ (WebCore::DocumentLoader::becomeMainResourceClientIfFilterAllows): If ContentFilter is initialized, called
+ ContentFilter::startFilteringMainResource(). Otherwise added ourself as a client of m_mainResource.
+ (WebCore::DocumentLoader::installContentFilterUnblockHandler): Added a helper for creating and notifying
+ FrameLoaderClient of the unblock handler.
+ (WebCore::DocumentLoader::contentFilterDidDecide): Set m_contentFilter to nullptr. If the content filter
+ allowed the load, then added ourself as the CachedRawResource's client. Otherwise, installed the unblock handler
+ and scheduled a substitute data load with the replacement data.
+ * loader/DocumentLoader.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::prepareForLoadStart): Removed call to PolicyChecker::prepareForLoadStart().
+ * loader/NavigationScheduler.cpp:
+ (WebCore::ScheduledSubstituteDataLoad::ScheduledSubstituteDataLoad): Added a ScheduledNavigation subclass that
+ calls FrameLoader::load() with a FrameLoadRequest containing substitute data.
+ (WebCore::NavigationScheduler::scheduleSubstituteDataLoad): Scheduled a substitute data load.
+ * loader/NavigationScheduler.h:
+ * loader/PolicyChecker.cpp:
+ (WebCore::PolicyChecker::checkNavigationPolicy): Reset m_contentFilterUnblockHandler if it couldn't handle the request.
+ (WebCore::PolicyChecker::prepareForLoadStart): Deleted.
+ * loader/PolicyChecker.h:
+ * platform/ContentFilterUnblockHandler.h:
+ (WebCore::ContentFilterUnblockHandler::unreachableURL):
+ (WebCore::ContentFilterUnblockHandler::setUnreachableURL):
+ (WebCore::ContentFilterUnblockHandler::unblockURLScheme): Renamed to ContentFilter::urlScheme().
+ * platform/PlatformContentFilter.h:
+ * platform/cocoa/ContentFilterUnblockHandlerCocoa.mm:
+ (WebCore::ContentFilterUnblockHandler::wrapWithDecisionHandler): Added a helper to wrap the unblock handler with an outer DecisionHandlerFunction.
+ (WebCore::ContentFilterUnblockHandler::encode): Added m_unreachableURL to the encoding.
+ (WebCore::ContentFilterUnblockHandler::decode): Ditto for the decoding.
+ (WebCore::ContentFilterUnblockHandler::canHandleRequest): Changed to call ContentFilter::urlScheme().
+ * platform/cocoa/NetworkExtensionContentFilter.h:
+ * platform/cocoa/NetworkExtensionContentFilter.mm:
+ (replacementDataFromDecisionInfo): Added a helper to extract replacement data from the decisionInfo dictionary.
+ (WebCore::NetworkExtensionContentFilter::enabled): Renamed from canHandleReponse(); only checks if the filter is enabled.
+ (WebCore::NetworkExtensionContentFilter::create): Created a new object.
+ (WebCore::NetworkExtensionContentFilter::NetworkExtensionContentFilter): Created a NEFilterSource immediately when using the modern API.
+ (WebCore::NetworkExtensionContentFilter::responseReceived): Created a NEFilterSource when using the legacy API.
+ Called -[NEFilterSource receivedResponse:decisionHandler:] when using the modern API.
+ (WebCore::NetworkExtensionContentFilter::addData): Stopped buffering the original data.
+ (WebCore::NetworkExtensionContentFilter::replacementData): Returned a SharedBuffer instead of a char* and int&.
+ (WebCore::NetworkExtensionContentFilter::canHandleResponse): Deleted.
+ (WebCore::createNEFilterSource): Deleted.
+ (WebCore::NetworkExtensionContentFilter::getReplacementData): Deleted.
+ * platform/cocoa/ParentalControlsContentFilter.h:
+ * platform/cocoa/ParentalControlsContentFilter.mm:
+ (WebCore::ParentalControlsContentFilter::enabled): Renamed from canHandleReponse(); only checks if the filter is enabled.
+ (WebCore::ParentalControlsContentFilter::create): Created a new object.
+ (WebCore::ParentalControlsContentFilter::ParentalControlsContentFilter): Initialized m_filterState to kWFEStateBuffering.
+ (WebCore::canHandleResponse): Added a helper to check if the response can be filtered.
+ (WebCore::ParentalControlsContentFilter::responseReceived): If !canHandleResponse(), set m_filterState to kWFEStateAllowed and return.
+ Otherwise created a new WebFilterEvaluator with the response.
+ (WebCore::ParentalControlsContentFilter::addData): Called updateFilterState().
+ (WebCore::ParentalControlsContentFilter::finishedAddingData): Ditto.
+ (WebCore::ParentalControlsContentFilter::needsMoreData): Changed to check m_filterState.
+ (WebCore::ParentalControlsContentFilter::didBlockData): Ditto.
+ (WebCore::ParentalControlsContentFilter::replacementData): Returned a SharedBuffer instead of a char* and int&.
+ (WebCore::ParentalControlsContentFilter::updateFilterState): Updated m_filterState by calling -[WebFilterEvaluator filterState].
+ (WebCore::ParentalControlsContentFilter::canHandleResponse): Deleted.
+ (WebCore::ParentalControlsContentFilter::getReplacementData): Deleted.
+ * platform/spi/cocoa/NEFilterSourceSPI.h:
+ * platform/spi/cocoa/WebFilterEvaluatorSPI.h:
+ * testing/MockContentFilter.cpp:
+ (WebCore::MockContentFilter::enabled): Renamed from canHandleReponse(); only checks if the filter is enabled.
+ (WebCore::MockContentFilter::create): Created a new object.
+ (WebCore::MockContentFilter::responseReceived): Called maybeDetermineStatus().
+ (WebCore::MockContentFilter::addData): Stopped buffering the original data.
+ (WebCore::MockContentFilter::replacementData): Returned a SharedBuffer instead of a char* and int&.
+ (WebCore::MockContentFilter::unblockHandler): Asserted that we blocked data.
+ (WebCore::MockContentFilter::canHandleResponse): Deleted.
+ (WebCore::MockContentFilter::MockContentFilter): Deleted.
+ (WebCore::MockContentFilter::getReplacementData): Deleted.
+ * testing/MockContentFilter.h:
+ * testing/MockContentFilterSettings.cpp:
+ (WebCore::MockContentFilterSettings::unblockRequestURL): Changed to use a StringBuilder.
+
</ins><span class="cx"> 2015-04-04 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Heuristic: Avoid exposing an element as clickable if mouse event delegation is handled on an AXElement with more than one descendant AXElement
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderContentFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ContentFilter.cpp (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ContentFilter.cpp 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/ContentFilter.cpp 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -28,12 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">
</span><del>-#include "DocumentLoader.h"
-#include "Frame.h"
</del><ins>+#include "CachedRawResource.h"
+#include "ContentFilterUnblockHandler.h"
</ins><span class="cx"> #include "NetworkExtensionContentFilter.h"
</span><span class="cx"> #include "ParentalControlsContentFilter.h"
</span><del>-#include "ScriptController.h"
-#include <bindings/ScriptValue.h>
</del><ins>+#include "SharedBuffer.h"
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -52,107 +51,134 @@
</span><span class="cx"> return types;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<ContentFilter> ContentFilter::createIfNeeded(const ResourceResponse& response, DocumentLoader& documentLoader)
</del><ins>+std::unique_ptr<ContentFilter> ContentFilter::createIfNeeded(DecisionFunction decisionFunction)
</ins><span class="cx"> {
</span><span class="cx"> Container filters;
</span><span class="cx"> for (auto& type : types()) {
</span><del>- if (type.canHandleResponse(response))
- filters.append(type.create(response));
</del><ins>+ if (!type.enabled())
+ continue;
+
+ auto filter = type.create();
+ ASSERT(filter);
+ filters.append(WTF::move(filter));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (filters.isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return std::make_unique<ContentFilter>(WTF::move(filters), documentLoader);
</del><ins>+ return std::make_unique<ContentFilter>(WTF::move(filters), WTF::move(decisionFunction));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ContentFilter::ContentFilter(Container contentFilters, DocumentLoader& documentLoader)
</del><ins>+ContentFilter::ContentFilter(Container contentFilters, DecisionFunction decisionFunction)
</ins><span class="cx"> : m_contentFilters { WTF::move(contentFilters) }
</span><del>- , m_documentLoader { documentLoader }
</del><ins>+ , m_decisionFunction { WTF::move(decisionFunction) }
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_contentFilters.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ContentFilter::addData(const char* data, int length)
</del><ins>+ContentFilter::~ContentFilter()
</ins><span class="cx"> {
</span><del>- ASSERT(needsMoreData());
</del><ins>+ if (!m_mainResource)
+ return;
+ ASSERT(m_mainResource->hasClient(this));
+ m_mainResource->removeClient(this);
+}
</ins><span class="cx">
</span><del>- for (auto& contentFilter : m_contentFilters)
- contentFilter->addData(data, length);
</del><ins>+void ContentFilter::startFilteringMainResource(CachedRawResource& resource)
+{
+ ASSERT(m_state == State::Initialized);
+ m_state = State::Filtering;
+ ASSERT(!m_mainResource);
+ m_mainResource = &resource;
+ ASSERT(!m_mainResource->hasClient(this));
+ m_mainResource->addClient(this);
</ins><span class="cx"> }
</span><del>-
-void ContentFilter::finishedAddingData()
</del><ins>+
+ContentFilterUnblockHandler ContentFilter::unblockHandler() const
</ins><span class="cx"> {
</span><del>- ASSERT(needsMoreData());
</del><ins>+ ASSERT(m_state == State::Blocked);
+ ASSERT(m_blockingContentFilter);
+ ASSERT(m_blockingContentFilter->didBlockData());
+ return m_blockingContentFilter->unblockHandler();
+}
</ins><span class="cx">
</span><del>- for (auto& contentFilter : m_contentFilters)
- contentFilter->finishedAddingData();
</del><ins>+Ref<SharedBuffer> ContentFilter::replacementData() const
+{
+ ASSERT(m_state == State::Blocked);
+ ASSERT(m_blockingContentFilter);
+ ASSERT(m_blockingContentFilter->didBlockData());
+ return m_blockingContentFilter->replacementData();
+}
</ins><span class="cx">
</span><del>- ASSERT(!needsMoreData());
</del><ins>+String ContentFilter::unblockRequestDeniedScript() const
+{
+ ASSERT(m_state == State::Blocked);
+ ASSERT(m_blockingContentFilter);
+ ASSERT(m_blockingContentFilter->didBlockData());
+ return m_blockingContentFilter->unblockRequestDeniedScript();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ContentFilter::needsMoreData() const
</del><ins>+void ContentFilter::responseReceived(CachedResource* resource, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- for (auto& contentFilter : m_contentFilters) {
- if (contentFilter->needsMoreData())
- return true;
- }
</del><ins>+ ASSERT(m_state == State::Filtering);
+ ASSERT_UNUSED(resource, resource == m_mainResource.get());
+ forEachContentFilterUntilBlocked([&response](PlatformContentFilter& contentFilter) {
+ contentFilter.responseReceived(response);
+ });
+}
</ins><span class="cx">
</span><del>- return false;
</del><ins>+void ContentFilter::dataReceived(CachedResource* resource, const char* data, int length)
+{
+ ASSERT(m_state == State::Filtering);
+ ASSERT_UNUSED(resource, resource == m_mainResource.get());
+ forEachContentFilterUntilBlocked([data, length](PlatformContentFilter& contentFilter) {
+ contentFilter.addData(data, length);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ContentFilter::didBlockData() const
</del><ins>+void ContentFilter::notifyFinished(CachedResource* resource)
</ins><span class="cx"> {
</span><del>- for (auto& contentFilter : m_contentFilters) {
- if (contentFilter->didBlockData())
- return true;
- }
-
- return false;
</del><ins>+ ASSERT(m_state == State::Filtering);
+ ASSERT_UNUSED(resource, resource == m_mainResource.get());
+ forEachContentFilterUntilBlocked([](PlatformContentFilter& contentFilter) {
+ contentFilter.finishedAddingData();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const char* ContentFilter::getReplacementData(int& length) const
</del><ins>+void ContentFilter::forEachContentFilterUntilBlocked(std::function<void(PlatformContentFilter&)> function)
</ins><span class="cx"> {
</span><del>- ASSERT(!needsMoreData());
</del><ins>+ bool allFiltersAllowedLoad { true };
+ for (auto& contentFilter : m_contentFilters) {
+ if (!contentFilter->needsMoreData()) {
+ ASSERT(!contentFilter->didBlockData());
+ continue;
+ }
</ins><span class="cx">
</span><del>- for (auto& contentFilter : m_contentFilters) {
- if (contentFilter->didBlockData())
- return contentFilter->getReplacementData(length);
</del><ins>+ function(*contentFilter);
+
+ if (contentFilter->didBlockData()) {
+ ASSERT(!m_blockingContentFilter);
+ m_blockingContentFilter = contentFilter.get();
+ didDecide(State::Blocked);
+ return;
+ } else if (contentFilter->needsMoreData())
+ allFiltersAllowedLoad = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return m_contentFilters[0]->getReplacementData(length);
</del><ins>+ if (allFiltersAllowedLoad)
+ didDecide(State::Allowed);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ContentFilterUnblockHandler ContentFilter::unblockHandler() const
</del><ins>+void ContentFilter::didDecide(State state)
</ins><span class="cx"> {
</span><del>- ASSERT(didBlockData());
</del><ins>+ ASSERT(m_state != State::Allowed);
+ ASSERT(m_state != State::Blocked);
+ ASSERT(state == State::Allowed || state == State::Blocked);
+ m_state = state;
</ins><span class="cx">
</span><del>- PlatformContentFilter* blockingFilter = nullptr;
- for (auto& contentFilter : m_contentFilters) {
- if (contentFilter->didBlockData()) {
- blockingFilter = contentFilter.get();
- break;
- }
- }
- ASSERT(blockingFilter);
-
- StringCapture unblockRequestDeniedScript { blockingFilter->unblockRequestDeniedScript() };
- if (unblockRequestDeniedScript.string().isEmpty())
- return blockingFilter->unblockHandler();
-
- // It would be a layering violation for the unblock handler to access its frame,
- // so we will execute the unblock denied script on its behalf.
- ContentFilterUnblockHandler unblockHandler { blockingFilter->unblockHandler() };
- RefPtr<Frame> frame { m_documentLoader.frame() };
- return ContentFilterUnblockHandler {
- unblockHandler.unblockURLHost(), [unblockHandler, frame, unblockRequestDeniedScript](ContentFilterUnblockHandler::DecisionHandlerFunction decisionHandler) {
- unblockHandler.requestUnblockAsync([decisionHandler, frame, unblockRequestDeniedScript](bool unblocked) {
- decisionHandler(unblocked);
- if (!unblocked && frame)
- frame->script().executeScript(unblockRequestDeniedScript.string());
- });
- }
- };
</del><ins>+ // Calling m_decisionFunction might delete |this|.
+ if (m_decisionFunction)
+ m_decisionFunction();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ContentFilter.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ContentFilter.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/ContentFilter.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -28,47 +28,78 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">
</span><del>-#include "PlatformContentFilter.h"
</del><ins>+#include "CachedRawResourceClient.h"
+#include "CachedResourceHandle.h"
+#include <functional>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DocumentLoader;
-class ResourceResponse;
</del><ins>+class CachedRawResource;
+class ContentFilterUnblockHandler;
+class PlatformContentFilter;
+class SharedBuffer;
</ins><span class="cx">
</span><del>-class ContentFilter final : public PlatformContentFilter {
</del><ins>+class ContentFilter final : private CachedRawResourceClient {
+ WTF_MAKE_FAST_ALLOCATED;
+ WTF_MAKE_NONCOPYABLE(ContentFilter);
+
</ins><span class="cx"> public:
</span><span class="cx"> template <typename T> static void addType() { types().append(type<T>()); }
</span><del>- static std::unique_ptr<ContentFilter> createIfNeeded(const ResourceResponse&, DocumentLoader&);
</del><span class="cx">
</span><del>- void addData(const char* data, int length) override;
- void finishedAddingData() override;
- bool needsMoreData() const override;
- bool didBlockData() const override;
- const char* getReplacementData(int& length) const override;
- ContentFilterUnblockHandler unblockHandler() const override;
</del><ins>+ using DecisionFunction = std::function<void()>;
+ static std::unique_ptr<ContentFilter> createIfNeeded(DecisionFunction);
+ ~ContentFilter() override;
</ins><span class="cx">
</span><ins>+ static const char* urlScheme() { return "x-apple-content-filter"; }
+
+ void startFilteringMainResource(CachedRawResource&);
+
+ enum class State {
+ Initialized,
+ Filtering,
+ Allowed,
+ Blocked
+ };
+ State state() const { return m_state; }
+ ContentFilterUnblockHandler unblockHandler() const;
+ Ref<SharedBuffer> replacementData() const;
+ String unblockRequestDeniedScript() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> struct Type {
</span><del>- const std::function<bool(const ResourceResponse&)> canHandleResponse;
- const std::function<std::unique_ptr<PlatformContentFilter>(const ResourceResponse&)> create;
</del><ins>+ const std::function<bool()> enabled;
+ const std::function<std::unique_ptr<PlatformContentFilter>()> create;
</ins><span class="cx"> };
</span><span class="cx"> template <typename T> static Type type();
</span><span class="cx"> WEBCORE_EXPORT static Vector<Type>& types();
</span><span class="cx">
</span><span class="cx"> using Container = Vector<std::unique_ptr<PlatformContentFilter>>;
</span><del>- friend std::unique_ptr<ContentFilter> std::make_unique<ContentFilter>(Container&&, DocumentLoader&);
- explicit ContentFilter(Container, DocumentLoader&);
</del><ins>+ friend std::unique_ptr<ContentFilter> std::make_unique<ContentFilter>(Container&&, DecisionFunction&&);
+ ContentFilter(Container, DecisionFunction);
</ins><span class="cx">
</span><del>- Container m_contentFilters;
- DocumentLoader& m_documentLoader;
</del><ins>+ // CachedRawResourceClient
+ void responseReceived(CachedResource*, const ResourceResponse&) override;
+ void dataReceived(CachedResource*, const char* data, int length) override;
+
+ // CachedResourceClient
+ void notifyFinished(CachedResource*) override;
+
+ void forEachContentFilterUntilBlocked(std::function<void(PlatformContentFilter&)>);
+ void didDecide(State);
+
+ const Container m_contentFilters;
+ const DecisionFunction m_decisionFunction;
+ CachedResourceHandle<CachedRawResource> m_mainResource;
+ PlatformContentFilter* m_blockingContentFilter { nullptr };
+ State m_state { State::Initialized };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><span class="cx"> ContentFilter::Type ContentFilter::type()
</span><span class="cx"> {
</span><span class="cx"> static_assert(std::is_base_of<PlatformContentFilter, T>::value, "Type must be a PlatformContentFilter.");
</span><del>- return { T::canHandleResponse, T::create };
</del><ins>+ return { T::enabled, T::create };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #include "ProgressTracker.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "SchemeRegistry.h"
</span><ins>+#include "ScriptController.h"
</ins><span class="cx"> #include "SecurityPolicy.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SubresourceLoader.h"
</span><span class="lines">@@ -140,6 +141,9 @@
</span><span class="cx"> , m_waitingForContentPolicy(false)
</span><span class="cx"> , m_subresourceLoadersArePageCacheAcceptable(false)
</span><span class="cx"> , m_applicationCacheHost(adoptPtr(new ApplicationCacheHost(*this)))
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+ , m_contentFilter(!substituteData.isValid() ? ContentFilter::createIfNeeded(std::bind(&DocumentLoader::contentFilterDidDecide, this)) : nullptr)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -401,21 +405,6 @@
</span><span class="cx"> frameLoader()->notifier().dispatchDidFinishLoading(this, identifier, finishTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_FILTERING)
- if (m_contentFilter && m_contentFilter->needsMoreData()) {
- m_contentFilter->finishedAddingData();
- int length;
- const char* data = m_contentFilter->getReplacementData(length);
- if (data)
- dataReceived(m_mainResource.get(), data, length);
-
- if (m_contentFilter->didBlockData()) {
- frameLoader()->client().contentFilterDidBlockLoad(m_contentFilter->unblockHandler());
- m_contentFilter = nullptr;
- }
- }
-#endif
-
</del><span class="cx"> maybeFinishLoadingMultipartContent();
</span><span class="cx">
</span><span class="cx"> double responseEndTime = finishTime;
</span><span class="lines">@@ -662,10 +651,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_FILTERING)
- m_contentFilter = ContentFilter::createIfNeeded(response, *this);
-#endif
-
</del><span class="cx"> frameLoader()->policyChecker().checkContentPolicy(m_response, [this](PolicyAction policy) {
</span><span class="cx"> continueAfterContentPolicy(policy);
</span><span class="cx"> });
</span><span class="lines">@@ -818,14 +803,6 @@
</span><span class="cx">
</span><span class="cx"> bool userChosen;
</span><span class="cx"> String encoding;
</span><del>-#if ENABLE(CONTENT_FILTERING)
- // The content filter's replacement data has a known encoding that might
- // differ from the response's encoding.
- if (m_contentFilter && m_contentFilter->didBlockData()) {
- ASSERT(!m_contentFilter->needsMoreData());
- userChosen = false;
- } else
-#endif
</del><span class="cx"> if (overrideEncoding().isNull()) {
</span><span class="cx"> userChosen = false;
</span><span class="cx"> encoding = response().textEncodingName();
</span><span class="lines">@@ -870,26 +847,6 @@
</span><span class="cx"> ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_FILTERING)
- bool loadWasBlockedBeforeFinishing = false;
- if (m_contentFilter && m_contentFilter->needsMoreData()) {
- m_contentFilter->addData(data, length);
-
- if (m_contentFilter->needsMoreData()) {
- // Since the filter still needs more data to make a decision,
- // avoid committing this data to prevent partial rendering of
- // content that might later be blocked.
- return;
- }
-
- data = m_contentFilter->getReplacementData(length);
- loadWasBlockedBeforeFinishing = m_contentFilter->didBlockData();
-
- if (loadWasBlockedBeforeFinishing)
- frameLoader()->client().contentFilterDidBlockLoad(m_contentFilter->unblockHandler());
- }
-#endif
-
</del><span class="cx"> if (m_identifierForLoadWithoutResourceLoader)
</span><span class="cx"> frameLoader()->notifier().dispatchDidReceiveData(this, m_identifierForLoadWithoutResourceLoader, data, length, -1);
</span><span class="cx">
</span><span class="lines">@@ -898,13 +855,6 @@
</span><span class="cx">
</span><span class="cx"> if (!isMultipartReplacingLoad())
</span><span class="cx"> commitLoad(data, length);
</span><del>-
-#if ENABLE(CONTENT_FILTERING)
- if (loadWasBlockedBeforeFinishing) {
- cancelMainResourceLoad(frameLoader()->cancelledError(m_request));
- m_contentFilter = nullptr;
- }
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::setupForReplace()
</span><span class="lines">@@ -960,6 +910,9 @@
</span><span class="cx"> stopLoading();
</span><span class="cx"> if (m_mainResource && m_mainResource->hasClient(this))
</span><span class="cx"> m_mainResource->removeClient(this);
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+ m_contentFilter = nullptr;
+#endif
</ins><span class="cx">
</span><span class="cx"> m_applicationCacheHost->setDOMApplicationCache(nullptr);
</span><span class="cx"> InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
</span><span class="lines">@@ -1471,7 +1424,12 @@
</span><span class="cx"> frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifierForLoadWithoutResourceLoader, this, request);
</span><span class="cx"> frameLoader()->notifier().dispatchWillSendRequest(this, m_identifierForLoadWithoutResourceLoader, request, ResourceResponse());
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(CONTENT_FILTERING)
+ becomeMainResourceClientIfFilterAllows();
+#else
</ins><span class="cx"> m_mainResource->addClient(this);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // A bunch of headers are set when the underlying ResourceLoader is created, and m_request needs to include those.
</span><span class="cx"> if (mainResourceLoader())
</span><span class="lines">@@ -1507,6 +1465,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_mainResource && m_mainResource->hasClient(this))
</span><span class="cx"> m_mainResource->removeClient(this);
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+ m_contentFilter = nullptr;
+#endif
</ins><span class="cx">
</span><span class="cx"> m_mainResource = 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1600,4 +1561,56 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+void DocumentLoader::becomeMainResourceClientIfFilterAllows()
+{
+ ASSERT(m_mainResource);
+ if (m_contentFilter) {
+ ASSERT(m_contentFilter->state() == ContentFilter::State::Initialized);
+ m_contentFilter->startFilteringMainResource(*m_mainResource);
+ } else
+ m_mainResource->addClient(this);
+}
+
+void DocumentLoader::installContentFilterUnblockHandler(ContentFilter& contentFilter)
+{
+ ContentFilterUnblockHandler unblockHandler { contentFilter.unblockHandler() };
+ unblockHandler.setUnreachableURL(documentURL());
+ RefPtr<Frame> frame { this->frame() };
+ String unblockRequestDeniedScript { contentFilter.unblockRequestDeniedScript() };
+ if (!unblockRequestDeniedScript.isEmpty() && frame) {
+ static_assert(std::is_base_of<ThreadSafeRefCounted<Frame>, Frame>::value, "Frame must be ThreadSafeRefCounted.");
+ StringCapture capturedScript { unblockRequestDeniedScript };
+ unblockHandler.wrapWithDecisionHandler([frame, capturedScript](bool unblocked) {
+ if (!unblocked)
+ frame->script().executeScript(capturedScript.string());
+ });
+ }
+ frameLoader()->client().contentFilterDidBlockLoad(WTF::move(unblockHandler));
+}
+
+void DocumentLoader::contentFilterDidDecide()
+{
+ using State = ContentFilter::State;
+ ASSERT(m_contentFilter);
+ ASSERT(m_contentFilter->state() == State::Blocked || m_contentFilter->state() == State::Allowed);
+ std::unique_ptr<ContentFilter> contentFilter;
+ std::swap(contentFilter, m_contentFilter);
+ if (contentFilter->state() == State::Allowed) {
+ if (m_mainResource)
+ m_mainResource->addClient(this);
+ return;
+ }
+
+ installContentFilterUnblockHandler(*contentFilter);
+
+ URL blockedURL;
+ blockedURL.setProtocol(ContentFilter::urlScheme());
+ blockedURL.setHost(ASCIILiteral("blocked-page"));
+ SubstituteData substituteData { contentFilter->replacementData(), ASCIILiteral("text/html"), ASCIILiteral("UTF-8"), documentURL() };
+ frame()->navigationScheduler().scheduleSubstituteDataLoad(blockedURL, substituteData);
+}
+#endif
+
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> class ArchiveResourceCollection;
</span><span class="cx"> class CachedRawResource;
</span><span class="cx"> class CachedResourceLoader;
</span><del>- class ContentFilter;
</del><span class="cx"> class FormState;
</span><span class="cx"> class Frame;
</span><span class="cx"> class FrameLoader;
</span><span class="lines">@@ -73,6 +72,10 @@
</span><span class="cx"> class SharedBuffer;
</span><span class="cx"> class SubstituteResource;
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+ class ContentFilter;
+#endif
+
</ins><span class="cx"> typedef HashMap<unsigned long, RefPtr<ResourceLoader>> ResourceLoaderMap;
</span><span class="cx"> typedef Vector<ResourceResponse> ResponseVector;
</span><span class="cx">
</span><span class="lines">@@ -330,6 +333,12 @@
</span><span class="cx">
</span><span class="cx"> void clearMainResource();
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+ void becomeMainResourceClientIfFilterAllows();
+ void installContentFilterUnblockHandler(ContentFilter&);
+ void contentFilterDidDecide();
+#endif
+
</ins><span class="cx"> Frame* m_frame;
</span><span class="cx"> Ref<CachedResourceLoader> m_cachedResourceLoader;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -1124,7 +1124,6 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::prepareForLoadStart()
</span><span class="cx"> {
</span><del>- policyChecker().prepareForLoadStart();
</del><span class="cx"> m_progressTracker->progressStarted();
</span><span class="cx"> m_client.dispatchDidStartProvisionalLoad();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -278,6 +278,26 @@
</span><span class="cx"> bool m_haveToldClient;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class ScheduledSubstituteDataLoad : public ScheduledNavigation {
+public:
+ ScheduledSubstituteDataLoad(const URL& baseURL, const SubstituteData& substituteData)
+ : ScheduledNavigation { 0, LockHistory::No, LockBackForwardList::No, false, false }
+ , m_baseURL { baseURL }
+ , m_substituteData { substituteData }
+ {
+ }
+
+ void fire(Frame& frame) override
+ {
+ UserGestureIndicator gestureIndicator { wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture };
+ frame.loader().load(FrameLoadRequest { &frame, m_baseURL, m_substituteData });
+ }
+
+private:
+ URL m_baseURL;
+ SubstituteData m_substituteData;
+};
+
</ins><span class="cx"> NavigationScheduler::NavigationScheduler(Frame& frame)
</span><span class="cx"> : m_frame(frame)
</span><span class="cx"> , m_timer(*this, &NavigationScheduler::timerFired)
</span><span class="lines">@@ -430,6 +450,12 @@
</span><span class="cx"> schedule(std::make_unique<ScheduledHistoryNavigation>(steps));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NavigationScheduler::scheduleSubstituteDataLoad(const URL& baseURL, const SubstituteData& substituteData)
+{
+ if (shouldScheduleNavigation())
+ schedule(std::make_unique<ScheduledSubstituteDataLoad>(baseURL, substituteData));
+}
+
</ins><span class="cx"> void NavigationScheduler::timerFired()
</span><span class="cx"> {
</span><span class="cx"> if (!m_frame.page())
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/NavigationScheduler.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class ScheduledNavigation;
</span><span class="cx"> class SecurityOrigin;
</span><ins>+class SubstituteData;
</ins><span class="cx"> class URL;
</span><span class="cx">
</span><span class="cx"> class NavigationDisablerForBeforeUnload {
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> void scheduleFormSubmission(PassRefPtr<FormSubmission>);
</span><span class="cx"> void scheduleRefresh();
</span><span class="cx"> void scheduleHistoryNavigation(int steps);
</span><ins>+ void scheduleSubstituteDataLoad(const URL& baseURL, const SubstituteData&);
</ins><span class="cx">
</span><span class="cx"> void startTimer();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPolicyCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PolicyChecker.cpp (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PolicyChecker.cpp 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/PolicyChecker.cpp 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -56,13 +56,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PolicyChecker::prepareForLoadStart()
-{
-#if ENABLE(CONTENT_FILTERING)
- m_contentFilterUnblockHandler = { };
-#endif
-}
-
</del><span class="cx"> void PolicyChecker::checkNavigationPolicy(const ResourceRequest& newRequest, NavigationPolicyDecisionFunction function)
</span><span class="cx"> {
</span><span class="cx"> checkNavigationPolicy(newRequest, m_frame.loader().activeDocumentLoader(), nullptr, WTF::move(function));
</span><span class="lines">@@ -120,7 +113,9 @@
</span><span class="cx"> frame->loader().reload();
</span><span class="cx"> });
</span><span class="cx"> continueAfterNavigationPolicy(PolicyIgnore);
</span><ins>+ return;
</ins><span class="cx"> }
</span><ins>+ m_contentFilterUnblockHandler = { };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_delegateIsDecidingNavigationPolicy = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPolicyCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PolicyChecker.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PolicyChecker.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/loader/PolicyChecker.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit PolicyChecker(Frame&);
</span><span class="cx">
</span><del>- void prepareForLoadStart();
</del><span class="cx"> void checkNavigationPolicy(const ResourceRequest&, DocumentLoader*, PassRefPtr<FormState>, NavigationPolicyDecisionFunction);
</span><span class="cx"> void checkNavigationPolicy(const ResourceRequest&, NavigationPolicyDecisionFunction);
</span><span class="cx"> void checkNewWindowPolicy(const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String& frameName, NewWindowPolicyDecisionFunction);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContentFilterUnblockHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -47,8 +48,6 @@
</span><span class="cx"> using DecisionHandlerFunction = std::function<void(bool unblocked)>;
</span><span class="cx"> using UnblockRequesterFunction = std::function<void(DecisionHandlerFunction)>;
</span><span class="cx">
</span><del>- static const char* unblockURLScheme() { return "x-apple-content-filter"; }
-
</del><span class="cx"> ContentFilterUnblockHandler() = default;
</span><span class="cx"> WEBCORE_EXPORT ContentFilterUnblockHandler(String unblockURLHost, UnblockRequesterFunction);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -60,11 +59,15 @@
</span><span class="cx"> WEBCORE_EXPORT static bool decode(NSCoder *, ContentFilterUnblockHandler&);
</span><span class="cx"> WEBCORE_EXPORT bool canHandleRequest(const ResourceRequest&) const;
</span><span class="cx"> WEBCORE_EXPORT void requestUnblockAsync(DecisionHandlerFunction) const;
</span><ins>+ void wrapWithDecisionHandler(const DecisionHandlerFunction&);
</ins><span class="cx">
</span><span class="cx"> const String& unblockURLHost() const { return m_unblockURLHost; }
</span><ins>+ const URL& unreachableURL() const { return m_unreachableURL; }
+ void setUnreachableURL(const URL& url) { m_unreachableURL = url; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String m_unblockURLHost;
</span><ins>+ URL m_unreachableURL;
</ins><span class="cx"> UnblockRequesterFunction m_unblockRequester;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RetainPtr<WebFilterEvaluator> m_webFilterEvaluator;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformContentFilter.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformContentFilter.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/PlatformContentFilter.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -26,12 +26,14 @@
</span><span class="cx"> #ifndef PlatformContentFilter_h
</span><span class="cx"> #define PlatformContentFilter_h
</span><span class="cx">
</span><del>-#include "ContentFilterUnblockHandler.h"
</del><ins>+#include <wtf/Ref.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class ContentFilterUnblockHandler;
</ins><span class="cx"> class ResourceResponse;
</span><ins>+class SharedBuffer;
</ins><span class="cx">
</span><span class="cx"> class PlatformContentFilter {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -42,11 +44,12 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> virtual ~PlatformContentFilter() { }
</span><ins>+ virtual void responseReceived(const ResourceResponse&) = 0;
</ins><span class="cx"> virtual void addData(const char* data, int length) = 0;
</span><span class="cx"> virtual void finishedAddingData() = 0;
</span><span class="cx"> virtual bool needsMoreData() const = 0;
</span><span class="cx"> virtual bool didBlockData() const = 0;
</span><del>- virtual const char* getReplacementData(int& length) const = 0;
</del><ins>+ virtual Ref<SharedBuffer> replacementData() const = 0;
</ins><span class="cx"> virtual ContentFilterUnblockHandler unblockHandler() const = 0;
</span><span class="cx"> virtual String unblockRequestDeniedScript() const { return emptyString(); }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaContentFilterUnblockHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">
</span><span class="cx"> #import "BlockExceptions.h"
</span><ins>+#import "ContentFilter.h"
</ins><span class="cx"> #import "ResourceRequest.h"
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -43,6 +44,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static NSString * const unblockURLHostKey { @"unblockURLHost" };
</span><ins>+static NSString * const unreachableURLKey { @"unreachableURL" };
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -60,6 +62,21 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void ContentFilterUnblockHandler::wrapWithDecisionHandler(const DecisionHandlerFunction& decisionHandler)
+{
+ ContentFilterUnblockHandler wrapped { *this };
+ UnblockRequesterFunction wrappedRequester { [wrapped, decisionHandler](DecisionHandlerFunction wrappedDecisionHandler) {
+ wrapped.requestUnblockAsync([wrappedDecisionHandler, decisionHandler](bool unblocked) {
+ wrappedDecisionHandler(unblocked);
+ decisionHandler(unblocked);
+ });
+ }};
+#if PLATFORM(IOS)
+ m_webFilterEvaluator = nullptr;
+#endif
+ std::swap(m_unblockRequester, wrappedRequester);
+}
+
</ins><span class="cx"> bool ContentFilterUnblockHandler::needsUIProcess() const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -74,6 +91,7 @@
</span><span class="cx"> ASSERT_ARG(coder, coder.allowsKeyedCoding && coder.requiresSecureCoding);
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> [coder encodeObject:m_unblockURLHost forKey:unblockURLHostKey];
</span><ins>+ [coder encodeObject:(NSURL *)m_unreachableURL forKey:unreachableURLKey];
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> [coder encodeObject:m_webFilterEvaluator.get() forKey:webFilterEvaluatorKey];
</span><span class="cx"> #endif
</span><span class="lines">@@ -85,6 +103,7 @@
</span><span class="cx"> ASSERT_ARG(coder, coder.allowsKeyedCoding && coder.requiresSecureCoding);
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> unblockHandler.m_unblockURLHost = [coder decodeObjectOfClass:[NSString class] forKey:unblockURLHostKey];
</span><ins>+ unblockHandler.m_unreachableURL = [coder decodeObjectOfClass:[NSURL class] forKey:unreachableURLKey];
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> unblockHandler.m_webFilterEvaluator = [coder decodeObjectOfClass:getWebFilterEvaluatorClass() forKey:webFilterEvaluatorKey];
</span><span class="cx"> #endif
</span><span class="lines">@@ -104,7 +123,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return request.url().protocolIs(unblockURLScheme()) && equalIgnoringCase(request.url().host(), m_unblockURLHost);
</del><ins>+ return request.url().protocolIs(ContentFilter::urlScheme()) && equalIgnoringCase(request.url().host(), m_unblockURLHost);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void dispatchToMainThread(void (^block)())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaNetworkExtensionContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -27,11 +27,9 @@
</span><span class="cx"> #define NetworkExtensionContentFilter_h
</span><span class="cx">
</span><span class="cx"> #include "PlatformContentFilter.h"
</span><del>-#include "SharedBuffer.h"
</del><span class="cx"> #include <objc/NSObjCRuntime.h>
</span><span class="cx"> #include <wtf/Compiler.h>
</span><span class="cx"> #include <wtf/OSObjectPtr.h>
</span><del>-#include <wtf/Ref.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #define HAVE_NETWORK_EXTENSION PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 && CPU(X86_64))
</span><span class="lines">@@ -42,31 +40,31 @@
</span><span class="cx"> OBJC_CLASS NSData;
</span><span class="cx"> OBJC_CLASS NSDictionary;
</span><span class="cx"> OBJC_CLASS NSMutableData;
</span><del>-
</del><ins>+OBJC_CLASS NSString;
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class NetworkExtensionContentFilter final : public PlatformContentFilter {
</span><del>- friend std::unique_ptr<NetworkExtensionContentFilter> std::make_unique<NetworkExtensionContentFilter>(const ResourceResponse&);
</del><ins>+ friend std::unique_ptr<NetworkExtensionContentFilter> std::make_unique<NetworkExtensionContentFilter>();
</ins><span class="cx">
</span><span class="cx"> public:
</span><del>- static bool canHandleResponse(const ResourceResponse&);
- static std::unique_ptr<NetworkExtensionContentFilter> create(const ResourceResponse&);
</del><ins>+ static bool enabled();
+ static std::unique_ptr<NetworkExtensionContentFilter> create();
</ins><span class="cx">
</span><ins>+ void responseReceived(const ResourceResponse&) override;
</ins><span class="cx"> void addData(const char* data, int length) override;
</span><span class="cx"> void finishedAddingData() override;
</span><span class="cx"> bool needsMoreData() const override;
</span><span class="cx"> bool didBlockData() const override;
</span><del>- const char* getReplacementData(int& length) const override;
</del><ins>+ Ref<SharedBuffer> replacementData() const override;
</ins><span class="cx"> ContentFilterUnblockHandler unblockHandler() const override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit NetworkExtensionContentFilter(const ResourceResponse&);
</del><ins>+ NetworkExtensionContentFilter();
</ins><span class="cx"> void handleDecision(NEFilterSourceStatus, NSData *replacementData);
</span><span class="cx">
</span><span class="cx"> NEFilterSourceStatus m_status;
</span><span class="cx"> OSObjectPtr<dispatch_queue_t> m_queue;
</span><span class="cx"> OSObjectPtr<dispatch_semaphore_t> m_semaphore;
</span><del>- Ref<SharedBuffer> m_originalData;
</del><span class="cx"> RetainPtr<NSData> m_replacementData;
</span><span class="cx"> RetainPtr<NEFilterSource> m_neFilterSource;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaNetworkExtensionContentFiltermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -28,21 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(NETWORK_EXTENSION)
</span><span class="cx">
</span><ins>+#import "ContentFilterUnblockHandler.h"
</ins><span class="cx"> #import "NEFilterSourceSPI.h"
</span><span class="cx"> #import "ResourceResponse.h"
</span><ins>+#import "SharedBuffer.h"
</ins><span class="cx"> #import "SoftLinking.h"
</span><ins>+#import "URL.h"
</ins><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(NetworkExtension);
</span><span class="cx"> SOFT_LINK_CLASS(NetworkExtension, NEFilterSource);
</span><span class="cx">
</span><span class="cx"> #if HAVE(MODERN_NE_FILTER_SOURCE)
</span><del>-// FIXME: <rdar://problem/20165664> Expose decisionHandler dictionary keys as NSString constants in NEFilterSource.h
-static NSString * const optionsPageData = @"PageData";
-
</del><span class="cx"> static inline NSData *replacementDataFromDecisionInfo(NSDictionary *decisionInfo)
</span><span class="cx"> {
</span><del>- id replacementData = decisionInfo[optionsPageData];
</del><ins>+ id replacementData = decisionInfo[NEFilterSourceOptionsPageData];
</ins><span class="cx"> ASSERT(!replacementData || [replacementData isKindOfClass:[NSData class]]);
</span><span class="cx"> return replacementData;
</span><span class="cx"> }
</span><span class="lines">@@ -50,37 +50,38 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool NetworkExtensionContentFilter::canHandleResponse(const ResourceResponse& response)
</del><ins>+bool NetworkExtensionContentFilter::enabled()
</ins><span class="cx"> {
</span><del>- return response.url().protocolIsInHTTPFamily() && [getNEFilterSourceClass() filterRequired];
</del><ins>+ return [getNEFilterSourceClass() filterRequired];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<NetworkExtensionContentFilter> NetworkExtensionContentFilter::create(const ResourceResponse& response)
</del><ins>+std::unique_ptr<NetworkExtensionContentFilter> NetworkExtensionContentFilter::create()
</ins><span class="cx"> {
</span><del>- return std::make_unique<NetworkExtensionContentFilter>(response);
</del><ins>+ return std::make_unique<NetworkExtensionContentFilter>();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RetainPtr<NEFilterSource> createNEFilterSource(const URL& url, dispatch_queue_t decisionQueue)
-{
-#if HAVE(MODERN_NE_FILTER_SOURCE)
- UNUSED_PARAM(url);
- return adoptNS([allocNEFilterSourceInstance() initWithDecisionQueue:decisionQueue]);
-#else
- UNUSED_PARAM(decisionQueue);
- return adoptNS([allocNEFilterSourceInstance() initWithURL:url direction:NEFilterSourceDirectionInbound socketIdentifier:0]);
-#endif
-}
-
-NetworkExtensionContentFilter::NetworkExtensionContentFilter(const ResourceResponse& response)
</del><ins>+NetworkExtensionContentFilter::NetworkExtensionContentFilter()
</ins><span class="cx"> : m_status { NEFilterSourceStatusNeedsMoreData }
</span><span class="cx"> , m_queue { adoptOSObject(dispatch_queue_create("com.apple.WebCore.NEFilterSourceQueue", DISPATCH_QUEUE_SERIAL)) }
</span><span class="cx"> , m_semaphore { adoptOSObject(dispatch_semaphore_create(0)) }
</span><del>- , m_originalData { *SharedBuffer::create() }
- , m_neFilterSource { createNEFilterSource(response.url(), m_queue.get()) }
</del><ins>+#if HAVE(MODERN_NE_FILTER_SOURCE)
+ , m_neFilterSource { adoptNS([allocNEFilterSourceInstance() initWithDecisionQueue:m_queue.get()]) }
+#endif
</ins><span class="cx"> {
</span><span class="cx"> ASSERT([getNEFilterSourceClass() filterRequired]);
</span><ins>+}
</ins><span class="cx">
</span><del>-#if HAVE(MODERN_NE_FILTER_SOURCE)
</del><ins>+void NetworkExtensionContentFilter::responseReceived(const ResourceResponse& response)
+{
+ if (!response.url().protocolIsInHTTPFamily()) {
+ m_status = NEFilterSourceStatusPass;
+ return;
+ }
+
+#if !HAVE(MODERN_NE_FILTER_SOURCE)
+ ASSERT(!m_neFilterSource);
+ m_neFilterSource = adoptNS([allocNEFilterSourceInstance() initWithURL:response.url() direction:NEFilterSourceDirectionInbound socketIdentifier:0]);
+#else
</ins><span class="cx"> [m_neFilterSource receivedResponse:response.nsURLResponse() decisionHandler:[this](NEFilterSourceStatus status, NSDictionary *decisionInfo) {
</span><span class="cx"> handleDecision(status, replacementDataFromDecisionInfo(decisionInfo));
</span><span class="cx"> }];
</span><span class="lines">@@ -96,12 +97,6 @@
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSData> copiedData { [NSData dataWithBytes:(void*)data length:length] };
</span><span class="cx">
</span><del>- // FIXME: NEFilterSource doesn't buffer data like WebFilterEvaluator does,
- // so we need to do it ourselves so getReplacementData() can return the
- // original bytes back to the loader. We should find a way to remove this
- // additional copy.
- m_originalData->append((CFDataRef)copiedData.get());
-
</del><span class="cx"> #if HAVE(MODERN_NE_FILTER_SOURCE)
</span><span class="cx"> [m_neFilterSource receivedData:copiedData.get() decisionHandler:[this](NEFilterSourceStatus status, NSDictionary *decisionInfo) {
</span><span class="cx"> handleDecision(status, replacementDataFromDecisionInfo(decisionInfo));
</span><span class="lines">@@ -148,15 +143,10 @@
</span><span class="cx"> return m_status == NEFilterSourceStatusBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const char* NetworkExtensionContentFilter::getReplacementData(int& length) const
</del><ins>+Ref<SharedBuffer> NetworkExtensionContentFilter::replacementData() const
</ins><span class="cx"> {
</span><del>- if (didBlockData()) {
- length = [m_replacementData length];
- return static_cast<const char*>([m_replacementData bytes]);
- }
-
- length = m_originalData->size();
- return m_originalData->data();
</del><ins>+ ASSERT(didBlockData());
+ return adoptRef(*SharedBuffer::wrapNSData(m_replacementData.get()).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ContentFilterUnblockHandler NetworkExtensionContentFilter::unblockHandler() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaParentalControlsContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -36,22 +36,25 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ParentalControlsContentFilter final : public PlatformContentFilter {
</span><del>- friend std::unique_ptr<ParentalControlsContentFilter> std::make_unique<ParentalControlsContentFilter>(const ResourceResponse&);
</del><ins>+ friend std::unique_ptr<ParentalControlsContentFilter> std::make_unique<ParentalControlsContentFilter>();
</ins><span class="cx">
</span><span class="cx"> public:
</span><del>- static bool canHandleResponse(const ResourceResponse&);
- static std::unique_ptr<ParentalControlsContentFilter> create(const ResourceResponse&);
</del><ins>+ static bool enabled();
+ static std::unique_ptr<ParentalControlsContentFilter> create();
</ins><span class="cx">
</span><ins>+ void responseReceived(const ResourceResponse&) override;
</ins><span class="cx"> void addData(const char* data, int length) override;
</span><span class="cx"> void finishedAddingData() override;
</span><span class="cx"> bool needsMoreData() const override;
</span><span class="cx"> bool didBlockData() const override;
</span><del>- const char* getReplacementData(int& length) const override;
</del><ins>+ Ref<SharedBuffer> replacementData() const override;
</ins><span class="cx"> ContentFilterUnblockHandler unblockHandler() const override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit ParentalControlsContentFilter(const ResourceResponse&);
</del><ins>+ ParentalControlsContentFilter();
+ void updateFilterState();
</ins><span class="cx">
</span><ins>+ OSStatus m_filterState;
</ins><span class="cx"> RetainPtr<WebFilterEvaluator> m_webFilterEvaluator;
</span><span class="cx"> RetainPtr<NSData> m_replacementData;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaParentalControlsContentFiltermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -26,7 +26,9 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "ParentalControlsContentFilter.h"
</span><span class="cx">
</span><ins>+#import "ContentFilterUnblockHandler.h"
</ins><span class="cx"> #import "ResourceResponse.h"
</span><ins>+#import "SharedBuffer.h"
</ins><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import "WebFilterEvaluatorSPI.h"
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="lines">@@ -36,36 +38,49 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool ParentalControlsContentFilter::canHandleResponse(const ResourceResponse& response)
</del><ins>+bool ParentalControlsContentFilter::enabled()
</ins><span class="cx"> {
</span><del>- if (!response.url().protocolIsInHTTPFamily())
- return false;
</del><ins>+ return [getWebFilterEvaluatorClass() isManagedSession];
+}
</ins><span class="cx">
</span><del>- if ([getWebFilterEvaluatorClass() isManagedSession]) {
-#if PLATFORM(MAC)
- if (response.url().protocolIs("https"))
-#endif
- return true;
- }
</del><ins>+std::unique_ptr<ParentalControlsContentFilter> ParentalControlsContentFilter::create()
+{
+ return std::make_unique<ParentalControlsContentFilter>();
+}
</ins><span class="cx">
</span><del>- return false;
</del><ins>+ParentalControlsContentFilter::ParentalControlsContentFilter()
+ : m_filterState { kWFEStateBuffering }
+{
+ ASSERT([getWebFilterEvaluatorClass() isManagedSession]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<ParentalControlsContentFilter> ParentalControlsContentFilter::create(const ResourceResponse& response)
</del><ins>+static inline bool canHandleResponse(const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- return std::make_unique<ParentalControlsContentFilter>(response);
</del><ins>+#if PLATFORM(MAC)
+ return response.url().protocolIs("https");
+#else
+ return response.url().protocolIsInHTTPFamily();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ParentalControlsContentFilter::ParentalControlsContentFilter(const ResourceResponse& response)
- : m_webFilterEvaluator { adoptNS([allocWebFilterEvaluatorInstance() initWithResponse:response.nsURLResponse()]) }
</del><ins>+void ParentalControlsContentFilter::responseReceived(const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT([getWebFilterEvaluatorClass() isManagedSession]);
</del><ins>+ ASSERT(!m_webFilterEvaluator);
+
+ if (!canHandleResponse(response)) {
+ m_filterState = kWFEStateAllowed;
+ return;
+ }
+
+ m_webFilterEvaluator = adoptNS([allocWebFilterEvaluatorInstance() initWithResponse:response.nsURLResponse()]);
+ updateFilterState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ParentalControlsContentFilter::addData(const char* data, int length)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(![m_replacementData.get() length]);
</span><span class="cx"> m_replacementData = [m_webFilterEvaluator addData:[NSData dataWithBytesNoCopy:(void*)data length:length freeWhenDone:NO]];
</span><ins>+ updateFilterState();
</ins><span class="cx"> ASSERT(needsMoreData() || [m_replacementData.get() length]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -73,22 +88,23 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(![m_replacementData.get() length]);
</span><span class="cx"> m_replacementData = [m_webFilterEvaluator dataComplete];
</span><ins>+ updateFilterState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ParentalControlsContentFilter::needsMoreData() const
</span><span class="cx"> {
</span><del>- return [m_webFilterEvaluator filterState] == kWFEStateBuffering;
</del><ins>+ return m_filterState == kWFEStateBuffering;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ParentalControlsContentFilter::didBlockData() const
</span><span class="cx"> {
</span><del>- return [m_webFilterEvaluator wasBlocked];
</del><ins>+ return m_filterState == kWFEStateBlocked;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const char* ParentalControlsContentFilter::getReplacementData(int& length) const
</del><ins>+Ref<SharedBuffer> ParentalControlsContentFilter::replacementData() const
</ins><span class="cx"> {
</span><del>- length = [m_replacementData length];
- return static_cast<const char*>([m_replacementData bytes]);
</del><ins>+ ASSERT(didBlockData());
+ return adoptRef(*SharedBuffer::wrapNSData(m_replacementData.get()).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ContentFilterUnblockHandler ParentalControlsContentFilter::unblockHandler() const
</span><span class="lines">@@ -100,4 +116,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ParentalControlsContentFilter::updateFilterState()
+{
+ m_filterState = [m_webFilterEvaluator filterState];
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNEFilterSourceSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> - (void)finishedLoadingWithDecisionHandler:(NEFilterSourceDecisionHandler)decisionHandler;
</span><span class="cx"> - (void)remediateWithDecisionHandler:(NEFilterSourceDecisionHandler)decisionHandler;
</span><span class="cx"> @end
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaWebFilterEvaluatorSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/WebFilterEvaluatorSPI.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/WebFilterEvaluatorSPI.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/platform/spi/cocoa/WebFilterEvaluatorSPI.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -32,7 +32,10 @@
</span><span class="cx"> #import <TargetConditionals.h>
</span><span class="cx">
</span><span class="cx"> enum {
</span><del>- kWFEStateBuffering = 2
</del><ins>+ kWFEStateAllowed = 0,
+ kWFEStateBlocked = 1,
+ kWFEStateBuffering = 2,
+ kWFEStateEvaluating = 3
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> @interface WebFilterEvaluator : NSObject
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockContentFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockContentFilter.cpp (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockContentFilter.cpp 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/testing/MockContentFilter.cpp 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -29,8 +29,11 @@
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">
</span><span class="cx"> #include "ContentFilter.h"
</span><ins>+#include "ContentFilterUnblockHandler.h"
+#include "SharedBuffer.h"
</ins><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -50,24 +53,23 @@
</span><span class="cx"> return MockContentFilterSettings::singleton();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MockContentFilter::canHandleResponse(const ResourceResponse&)
</del><ins>+bool MockContentFilter::enabled()
</ins><span class="cx"> {
</span><span class="cx"> return settings().enabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<MockContentFilter> MockContentFilter::create(const ResourceResponse& response)
</del><ins>+std::unique_ptr<MockContentFilter> MockContentFilter::create()
</ins><span class="cx"> {
</span><del>- return std::make_unique<MockContentFilter>(response);
</del><ins>+ return std::make_unique<MockContentFilter>();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-MockContentFilter::MockContentFilter(const ResourceResponse&)
</del><ins>+void MockContentFilter::responseReceived(const ResourceResponse&)
</ins><span class="cx"> {
</span><span class="cx"> maybeDetermineStatus(DecisionPoint::AfterResponse);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MockContentFilter::addData(const char* data, int length)
</del><ins>+void MockContentFilter::addData(const char*, int)
</ins><span class="cx"> {
</span><del>- m_replacementData.append(data, length);
</del><span class="cx"> maybeDetermineStatus(DecisionPoint::AfterAddData);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -86,14 +88,15 @@
</span><span class="cx"> return m_status == Status::Blocked;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const char* MockContentFilter::getReplacementData(int& length) const
</del><ins>+Ref<SharedBuffer> MockContentFilter::replacementData() const
</ins><span class="cx"> {
</span><del>- length = m_replacementData.size();
- return m_replacementData.data();
</del><ins>+ ASSERT(didBlockData());
+ return adoptRef(*SharedBuffer::create(m_replacementData.data(), m_replacementData.size()).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ContentFilterUnblockHandler MockContentFilter::unblockHandler() const
</span><span class="cx"> {
</span><ins>+ ASSERT(didBlockData());
</ins><span class="cx"> using DecisionHandlerFunction = ContentFilterUnblockHandler::DecisionHandlerFunction;
</span><span class="cx">
</span><span class="cx"> return ContentFilterUnblockHandler {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockContentFilter.h (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockContentFilter.h 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/testing/MockContentFilter.h 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -32,18 +32,19 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MockContentFilter final : public PlatformContentFilter {
</span><del>- friend std::unique_ptr<MockContentFilter> std::make_unique<MockContentFilter>(const ResourceResponse&);
</del><ins>+ friend std::unique_ptr<MockContentFilter> std::make_unique<MockContentFilter>();
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> static void ensureInstalled();
</span><del>- static bool canHandleResponse(const ResourceResponse&);
- static std::unique_ptr<MockContentFilter> create(const ResourceResponse&);
</del><ins>+ static bool enabled();
+ static std::unique_ptr<MockContentFilter> create();
</ins><span class="cx">
</span><ins>+ void responseReceived(const ResourceResponse&) override;
</ins><span class="cx"> void addData(const char* data, int length) override;
</span><span class="cx"> void finishedAddingData() override;
</span><span class="cx"> bool needsMoreData() const override;
</span><span class="cx"> bool didBlockData() const override;
</span><del>- const char* getReplacementData(int& length) const override;
</del><ins>+ Ref<SharedBuffer> replacementData() const override;
</ins><span class="cx"> ContentFilterUnblockHandler unblockHandler() const override;
</span><span class="cx"> String unblockRequestDeniedScript() const override;
</span><span class="cx">
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> Blocked
</span><span class="cx"> };
</span><span class="cx">
</span><del>- explicit MockContentFilter(const ResourceResponse&);
</del><ins>+ MockContentFilter() = default;
</ins><span class="cx"> void maybeDetermineStatus(MockContentFilterSettings::DecisionPoint);
</span><span class="cx">
</span><span class="cx"> Vector<char> m_replacementData;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockContentFilterSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockContentFilterSettings.cpp (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockContentFilterSettings.cpp 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebCore/testing/MockContentFilterSettings.cpp 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -28,9 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">
</span><ins>+#include "ContentFilter.h"
</ins><span class="cx"> #include "ContentFilterUnblockHandler.h"
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -50,9 +52,11 @@
</span><span class="cx"> static LazyNeverDestroyed<String> unblockRequestURL;
</span><span class="cx"> static std::once_flag onceFlag;
</span><span class="cx"> std::call_once(onceFlag, [] {
</span><del>- unblockRequestURL.construct(ContentFilterUnblockHandler::unblockURLScheme());
- unblockRequestURL.get().append("://");
- unblockRequestURL.get().append(unblockURLHost());
</del><ins>+ StringBuilder unblockRequestURLBuilder;
+ unblockRequestURLBuilder.append(ContentFilter::urlScheme());
+ unblockRequestURLBuilder.append("://");
+ unblockRequestURLBuilder.append(unblockURLHost());
+ unblockRequestURL.construct(unblockRequestURLBuilder.toString());
</ins><span class="cx"> });
</span><span class="cx"> return unblockRequestURL;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-04 Andy Estes <aestes@apple.com>
+
+ [Content Filtering] Blocked page is not always displayed when it should be
+ https://bugs.webkit.org/show_bug.cgi?id=143410
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::didStartProvisionalLoad): Stopped clearing m_contentFilterUnblockHandler here.
+ (WebKit::WebFrameProxy::didHandleContentFilterUnblockNavigation): Started doing it here instead.
+
</ins><span class="cx"> 2015-04-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Cocoa] Add a way to temporarily disable the WebKit Network Cache for testing
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (182355 => 182356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2015-04-05 06:51:15 UTC (rev 182355)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2015-04-05 07:52:14 UTC (rev 182356)
</span><span class="lines">@@ -127,9 +127,6 @@
</span><span class="cx"> void WebFrameProxy::didStartProvisionalLoad(const String& url)
</span><span class="cx"> {
</span><span class="cx"> m_frameLoadState.didStartProvisionalLoad(url);
</span><del>-#if ENABLE(CONTENT_FILTERING)
- m_contentFilterUnblockHandler = { };
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameProxy::didReceiveServerRedirectForProvisionalLoad(const String& url)
</span><span class="lines">@@ -236,8 +233,10 @@
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx"> bool WebFrameProxy::didHandleContentFilterUnblockNavigation(const WebCore::ResourceRequest& request)
</span><span class="cx"> {
</span><del>- if (!m_contentFilterUnblockHandler.canHandleRequest(request))
</del><ins>+ if (!m_contentFilterUnblockHandler.canHandleRequest(request)) {
+ m_contentFilterUnblockHandler = { };
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebPageProxy> page { m_page };
</span><span class="cx"> ASSERT(page);
</span></span></pre>
</div>
</div>
</body>
</html>