Changeset 230810 in webkit


Ignore:
Timestamp:
Apr 19, 2018 10:54:35 AM (6 years ago)
Author:
youenn@apple.com
Message:

NetworkProcess should use CSP/content blockers for sync XHR
​https://bugs.webkit.org/show_bug.cgi?id=184760

Reviewed by Chris Dumez.

Source/WebKit:

Setting CSP/ContentBlockers parameters for sync XHR loads.

  • NetworkProcess/NetworkResourceLoader.cpp:

LayoutTests:

  • http/tests/contentextensions/sync-xhr-redirection-blocked-expected.txt: Added.
  • http/tests/contentextensions/sync-xhr-redirection-blocked.html: Added.
  • http/tests/contentextensions/sync-xhr-redirection-blocked.html.json: Added.
  • http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/resources/insecure-sync-xhr-in-main-frame-window.html: Added.
  • http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-sync-xhr-in-main-frame-expected.txt: Added.
  • http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-sync-xhr-in-main-frame.html: Added.
  • platform/mac-wk1/TestExpectations:
  • platform/win/TestExpectations:
Location:
trunk
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r230809 r230810  
     12018-04-19  Youenn Fablet  <youenn@apple.com>
     2
     3        NetworkProcess should use CSP/content blockers for sync XHR
     4        https://bugs.webkit.org/show_bug.cgi?id=184760
     5
     6        Reviewed by Chris Dumez.
     7
     8        * http/tests/contentextensions/sync-xhr-redirection-blocked-expected.txt: Added.
     9        * http/tests/contentextensions/sync-xhr-redirection-blocked.html: Added.
     10        * http/tests/contentextensions/sync-xhr-redirection-blocked.html.json: Added.
     11        * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/resources/insecure-sync-xhr-in-main-frame-window.html: Added.
     12        * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-sync-xhr-in-main-frame-expected.txt: Added.
     13        * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-sync-xhr-in-main-frame.html: Added.
     14        * platform/mac-wk1/TestExpectations:
     15        * platform/win/TestExpectations:
     16
    1172018-04-19  Ryan Haddad  <ryanhaddad@apple.com>
    218

  • trunk/LayoutTests/platform/mac-wk1/TestExpectations

    r230801 r230810  
    9797# rdar://problem/34716163 Breaks subsequent tests using response.xml
    9898[ HighSierra+ ] http/tests/xmlhttprequest/range-test.html [ Skip ]
     99
     100# WK1 does not support sync XHR redirections as does WK2
     101http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-sync-xhr-in-main-frame.html [ Skip ]
    99102
    100103### END OF (1) Failures with bug reports

  • trunk/LayoutTests/platform/win/TestExpectations

    r230774 r230810  
    22112211webkit.org/b/140703 http/tests/xmlhttprequest/remember-bad-password.html [ Failure ]
    22122212webkit.org/b/140703 http/tests/xmlhttprequest/failed-auth.html [ Failure ]
     2213
     2214# WK1 does not support sync XHR redirections as does WK2
     2215http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-sync-xhr-in-main-frame.html [ Skip ]
    22132216
    22142217# CSP Stuff

  • trunk/Source/WebKit/ChangeLog

    r230808 r230810  
     12018-04-19  Youenn Fablet  <youenn@apple.com>
     2
     3        NetworkProcess should use CSP/content blockers for sync XHR
     4        https://bugs.webkit.org/show_bug.cgi?id=184760
     5
     6        Reviewed by Chris Dumez.
     7
     8        Setting CSP/ContentBlockers parameters for sync XHR loads.
     9        * NetworkProcess/NetworkResourceLoader.cpp:
     10
    1112018-04-19  Nan Wang  <n_wang@apple.com>
    212

  • trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

    r230791 r230810  
    110110    if (synchronousReply) {
    111111        m_networkLoadChecker = NetworkLoadChecker::create(FetchOptions { m_parameters.options }, m_parameters.sessionID, HTTPHeaderMap { m_parameters.originalRequestHeaders }, URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef());
     112        if (m_parameters.cspResponseHeaders)
     113            m_networkLoadChecker->setCSPResponseHeaders(ContentSecurityPolicyResponseHeaders { m_parameters.cspResponseHeaders.value() });
     114#if ENABLE(CONTENT_EXTENSIONS)
     115        m_networkLoadChecker->setContentExtensionController(URL { m_parameters.mainDocumentURL }, m_parameters.userContentControllerIdentifier);
     116#endif
    112117        m_synchronousLoadData = std::make_unique<SynchronousLoadData>(WTFMove(synchronousReply));
    113118    }
Note: See TracChangeset for help on using the changeset viewer.