⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 185714 in webkit


Ignore:
Timestamp:
Jun 18, 2015, 11:38:13 AM (11 years ago)
Author:
achristensen@apple.com
Message:

[Content Extensions] Log blocked loads to the WebInspector console
​https://bugs.webkit.org/show_bug.cgi?id=146089

Reviewed by Joseph Pecoraro.

Source/JavaScriptCore:

  • inspector/ConsoleMessage.cpp:

(Inspector::messageSourceValue):

  • inspector/protocol/Console.json:
  • runtime/ConsoleTypes.h:

Add content blocker message source.

Source/WebCore:

  • contentextensions/ContentExtensionsBackend.cpp:

(WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
(WebCore::ContentExtensions::ContentExtensionsBackend::displayNoneCSSRule):
Log which URLs are blocked and the URL of the page they are blocked from.

Source/WebKit/mac:

  • WebCoreSupport/WebChromeClient.mm:

(stringForMessageSource):
Added content blocker message source.

LayoutTests:

  • http/tests/contentextensions/basic-filter-expected.txt:
  • http/tests/contentextensions/character-set-basic-support-expected.txt:
  • http/tests/contentextensions/domain-rules-expected.txt:
  • http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt:
  • http/tests/contentextensions/main-resource-redirect-blocked-expected.txt:
  • http/tests/contentextensions/media-filtered-expected.txt:
  • http/tests/contentextensions/subresource-redirect-blocked-expected.txt:
  • http/tests/contentextensions/text-track-blocked-expected.txt:

Add new logs.

Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r185702 r185714  
     12015-06-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        [Content Extensions] Log blocked loads to the WebInspector console
     4        https://bugs.webkit.org/show_bug.cgi?id=146089
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * http/tests/contentextensions/basic-filter-expected.txt:
     9        * http/tests/contentextensions/character-set-basic-support-expected.txt:
     10        * http/tests/contentextensions/domain-rules-expected.txt:
     11        * http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt:
     12        * http/tests/contentextensions/main-resource-redirect-blocked-expected.txt:
     13        * http/tests/contentextensions/media-filtered-expected.txt:
     14        * http/tests/contentextensions/subresource-redirect-blocked-expected.txt:
     15        * http/tests/contentextensions/text-track-blocked-expected.txt:
     16        Add new logs.
     17
    1182015-06-18  Alexey Proskuryakov  <ap@apple.com>
    219

  • trunk/LayoutTests/http/tests/contentextensions/basic-filter-expected.txt

    r181031 r185714  
     1CONSOLE MESSAGE: line 7: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/basic-filter.html from loading a resource from http://localhost:8000/resources/square100.png
     2CONSOLE MESSAGE: line 8: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/basic-filter.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?localhost_not_at_end
     3CONSOLE MESSAGE: line 9: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/basic-filter.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?ends_with_localhost
    14layer at (0,0) size 800x600
    25  RenderView at (0,0) size 800x600

  • trunk/LayoutTests/http/tests/contentextensions/character-set-basic-support-expected.txt

    r181132 r185714  
     1CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?BaSiC-TeSt-cAsE
     2CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?any-scheme-matcher
     3CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?casesensitive
     4CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?caseSeNsitive
    15Test basic cases of filter using a character set (e.g. [a-z]).
    26

  • trunk/LayoutTests/http/tests/contentextensions/domain-rules-expected.txt

    r184116 r185714  
     1CONSOLE MESSAGE: line 6: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/domain-rules.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?should_be_blocked_1
     2CONSOLE MESSAGE: line 7: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/domain-rules.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?should_be_blocked_2
     3CONSOLE MESSAGE: line 8: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/domain-rules.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?should_be_blocked_3
    14layer at (0,0) size 800x600
    25  RenderView at (0,0) size 800x600

  • trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt

    r185230 r185714  
     1CONSOLE MESSAGE: line 14: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?abcabc
     2CONSOLE MESSAGE: line 15: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?abccabc
     3CONSOLE MESSAGE: line 16: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?defghi
     4CONSOLE MESSAGE: line 17: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?defgghi
     5CONSOLE MESSAGE: line 18: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?jklmno
     6CONSOLE MESSAGE: line 19: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?jkljklmno
     7CONSOLE MESSAGE: line 20: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?pqrstv
     8CONSOLE MESSAGE: line 21: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?pqrabcstv
     9CONSOLE MESSAGE: line 22: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?wxyabc
     10CONSOLE MESSAGE: line 23: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?wxydefabc
     11CONSOLE MESSAGE: line 24: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?acbwxy
     12CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?abcacbdefabcdjklwhitelistwxy
    113layer at (0,0) size 785x952
    214  RenderView at (0,0) size 785x600

  • trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt

    r185430 r185714  
    1 main frame - didStartProvisionalLoadForFrame
    2 main frame - didFailProvisionalLoadWithError
    3 main frame - (kWKErrorCodeCannotShowURL)
     1CONSOLE MESSAGE: Content blocker prevented frame displaying about:blank from loading a resource from http://127.0.0.1:8000/contentextensions/resources/main-resource-redirect-blocked-target.html

  • trunk/LayoutTests/http/tests/contentextensions/media-filtered-expected.txt

    r182820 r185714  
     1CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/media-filtered.html from loading a resource from http://localhost:8000/media/resources/test.mp4
    12CONSOLE MESSAGE: line 14: Video error
    23layer at (0,0) size 800x600

  • trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked-expected.txt

    r182016 r185714  
     1CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/subresource-redirect-blocked.html from loading a resource from http://127.0.0.1:8000/resources/square128.png
    12layer at (0,0) size 800x600
    23  RenderView at (0,0) size 800x600

  • trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt

    r182820 r185714  
    11CONSOLE MESSAGE: line 21: video loaded
     2CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/text-track-blocked.html from loading a resource from http://127.0.0.1:8000/media-resources/track/captions-webvtt/captions-fast.vtt
    23CONSOLE MESSAGE: line 14: vttError
    34layer at (0,0) size 800x600

  • trunk/Source/JavaScriptCore/ChangeLog

    r185699 r185714  
     12015-06-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        [Content Extensions] Log blocked loads to the WebInspector console
     4        https://bugs.webkit.org/show_bug.cgi?id=146089
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * inspector/ConsoleMessage.cpp:
     9        (Inspector::messageSourceValue):
     10        * inspector/protocol/Console.json:
     11        * runtime/ConsoleTypes.h:
     12        Add content blocker message source.
     13
    1142015-06-18  Saam Barati  <saambarati1@gmail.com>
    215

  • trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp

    r183659 r185714  
    142142    case MessageSource::CSS: return Inspector::Protocol::Console::ConsoleMessage::Source::CSS;
    143143    case MessageSource::Security: return Inspector::Protocol::Console::ConsoleMessage::Source::Security;
     144    case MessageSource::ContentBlocker: return Inspector::Protocol::Console::ConsoleMessage::Source::ContentBlocker;
    144145    case MessageSource::Other: return Inspector::Protocol::Console::ConsoleMessage::Source::Other;
    145146    }

  • trunk/Source/JavaScriptCore/inspector/protocol/Console.json

    r183659 r185714  
    88            "description": "Console message.",
    99            "properties": [
    10                 { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "other"], "description": "Message source." },
     10                { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "content-blocker", "other"], "description": "Message source." },
    1111                { "name": "level", "type": "string", "enum": ["log", "info", "warning", "error", "debug"], "description": "Message severity." },
    1212                { "name": "text", "type": "string", "description": "Message text." },

  • trunk/Source/JavaScriptCore/runtime/ConsoleTypes.h

    r183659 r185714  
    3939    CSS,
    4040    Security,
     41    ContentBlocker,
    4142    Other,
    4243};

  • trunk/Source/WebCore/ChangeLog

    r185712 r185714  
     12015-06-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        [Content Extensions] Log blocked loads to the WebInspector console
     4        https://bugs.webkit.org/show_bug.cgi?id=146089
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * contentextensions/ContentExtensionsBackend.cpp:
     9        (WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
     10        (WebCore::ContentExtensions::ContentExtensionsBackend::displayNoneCSSRule):
     11        Log which URLs are blocked and the URL of the page they are blocked from.
     12
    1132015-06-18  Joseph Pecoraro  <pecoraro@apple.com>
    214

  • trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp

    r184644 r185714  
    211211    }
    212212
    213     if (willBlockLoad)
     213    if (willBlockLoad) {
     214        if (currentDocument)
     215            currentDocument->addConsoleMessage(MessageSource::ContentBlocker, MessageLevel::Info, makeString("Content blocker prevented frame displaying ", mainDocumentURL.string(), " from loading a resource from ", request.url().string()));
    214216        request = ResourceRequest();
     217    }
    215218}
    216219

  • trunk/Source/WebKit/mac/ChangeLog

    r185668 r185714  
     12015-06-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        [Content Extensions] Log blocked loads to the WebInspector console
     4        https://bugs.webkit.org/show_bug.cgi?id=146089
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * WebCoreSupport/WebChromeClient.mm:
     9        (stringForMessageSource):
     10        Added content blocker message source.
     11
    1122015-06-17  Dan Bernstein  <mitz@apple.com>
    213

  • trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm

    r184670 r185714  
    110110NSString *WebConsoleMessageCSSMessageSource = @"CSSMessageSource";
    111111NSString *WebConsoleMessageSecurityMessageSource = @"SecurityMessageSource";
     112NSString *WebConsoleMessageContentBlockerMessageSource = @"ContentBlockerMessageSource";
    112113NSString *WebConsoleMessageOtherMessageSource = @"OtherMessageSource";
    113114
    … …  
    388389    case MessageSource::Security:
    389390        return WebConsoleMessageSecurityMessageSource;
     391    case MessageSource::ContentBlocker:
     392        return WebConsoleMessageContentBlockerMessageSource;
    390393    case MessageSource::Other:
    391394        return WebConsoleMessageOtherMessageSource;
Note: See TracChangeset for help on using the changeset viewer.