Changeset 211700 in webkit


Ignore:
Timestamp:
Feb 5, 2017 9:25:14 PM (7 years ago)
Author:
matthew_hanson@apple.com
Message:

Merge r211616. rdar://problem/30060142

Location:
branches/safari-603-branch/LayoutTests
Files:
2 added
1 deleted
15 edited
2 moved

Legend:

Unmodified
Added
Removed

  • branches/safari-603-branch/LayoutTests/ChangeLog

    r211696 r211700  
     12017-02-05  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r211616. rdar://problem/30060142
     4
     5    2017-02-02  Alexey Proskuryakov  <ap@apple.com>
     6
     7            Multiple HTTP tests fail with Apache 2.4.25
     8            https://bugs.webkit.org/show_bug.cgi?id=167678
     9            <rdar://problem/30060142>
     10
     11            Reviewed by Sam Weinig.
     12
     13            Newer versions of Apache have a security fix where they generate an internal server
     14            error upon seeing an invalid HTTP header field. There is an opt-out configuration
     15            option which didn't quite work in my testing, but regardless, we should only use
     16            "nph-" CGIs for invalid responses. This is how Apache knows that it shouldn't
     17            attempt to parse the response.
     18
     19            This also uncovered a test bug.
     20
     21            * http/tests/cache/disk-cache/resources/cache-test.js: (generateTestURL):
     22            Without escaping, we were getting a broken response in attachment tests:
     23               Content-Disposition: attachment
     24                filename: "f.txt"
     25            Note how ";" turned into a newline.
     26
     27            * http/tests/misc/non-utf8-header-name-expected.txt: Removed.
     28            * http/tests/misc/non-utf8-header-name.php: Removed.
     29            * http/tests/misc/nph-non-utf8-header-name-expected.txt: Copied from LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt.
     30            * http/tests/misc/nph-non-utf8-header-name.pl: Copied from LayoutTests/http/tests/misc/non-utf8-header-name.php.
     31            * http/tests/preload/download_resources_from_invalid_headers.html:
     32            * http/tests/preload/resources/invalid_resources_from_header.php: Removed.
     33            * http/tests/preload/resources/nph-invalid_resources_from_header.pl: Copied from LayoutTests/http/tests/preload/resources/invalid_resources_from_header.php.
     34            * http/tests/security/contentSecurityPolicy/directive-parsing-01.html:
     35            * http/tests/security/contentSecurityPolicy/directive-parsing-02.html:
     36            * http/tests/security/contentSecurityPolicy/directive-parsing-03.html:
     37            * http/tests/security/contentSecurityPolicy/directive-parsing-04.html:
     38            * http/tests/security/contentSecurityPolicy/directive-parsing-05.html:
     39            * http/tests/security/contentSecurityPolicy/resources/echo-script-src.pl: Removed.
     40            * http/tests/security/contentSecurityPolicy/resources/multiple-iframe-test.js:
     41            * http/tests/security/contentSecurityPolicy/resources/nph-echo-script-src.pl: Copied from LayoutTests/http/tests/security/contentSecurityPolicy/resources/echo-script-src.pl.
     42            * http/tests/security/contentSecurityPolicy/script-loads-with-img-src.html:
     43            * http/tests/security/contentSecurityPolicy/script-src-none.html:
     44            * http/tests/security/contentSecurityPolicy/script-src-self-blocked-01.html:
     45            * http/tests/security/contentSecurityPolicy/script-src-self-blocked-02.html:
     46            * http/tests/security/contentSecurityPolicy/script-src-self-blocked-03.html:
     47            * http/tests/security/contentSecurityPolicy/script-src-self.html:
     48            * http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme.html:
     49            Changed scripts that are used to generate invalid responses to "nph-" ones.
     50
    1512017-02-02  Matthew Hanson  <matthew_hanson@apple.com>
    252

  • branches/safari-603-branch/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js

    r189177 r211700  
    4343function generateTestURL(test)
    4444{
    45     var body = typeof test.body !== 'undefined' ? test.body : "";
     45    var body = typeof test.body !== 'undefined' ? escape(test.body) : "";
    4646    var expiresInFutureIn304 = typeof test.expiresInFutureIn304 !== 'undefined' ? test.expiresInFutureIn304 : false;
    4747    var uniqueTestId = Math.floor((Math.random() * 1000000000000));
    … …  
    5555        testURL += "&Content-Type=text/plain";
    5656    for (var header in test.responseHeaders)
    57         testURL += '&' + header + '=' + makeHeaderValue(test.responseHeaders[header]);
     57        testURL += '&' + header + '=' + escape(makeHeaderValue(test.responseHeaders[header]));
    5858    return testURL;
    5959}

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-01.html

    r120174 r211700  
    1313    This script should not execute even though there are parse errors in the policy.
    1414  </p>
    15   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=allow%20*%3B%20script-src%20'none'%3B%20%20%3B%20"></iframe>
     15  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=allow%20*%3B%20script-src%20'none'%3B%20%20%3B%20"></iframe>
    1616</body>
    1717</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-02.html

    r120174 r211700  
    1313    This script should not execute even though there are parse errors in the policy.
    1414  </p>
    15   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'none'%3B%20aaa%20%3B%20"></iframe>
     15  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'none'%3B%20aaa%20%3B%20"></iframe>
    1616</body>
    1717</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-03.html

    r120174 r211700  
    1313    This script should not execute even though there are parse errors in the policy.
    1414  </p>
    15   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'none'%3B%20a%07aa%20%3B%20"></iframe>
     15  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'none'%3B%20a%07aa%20%3B%20"></iframe>
    1616</body>
    1717</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-04.html

    r123899 r211700  
    1414    contain a colon. Since the directive is invalid, the script should run.
    1515  </p>
    16   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%3A%20'none'"></iframe>
     16  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%3A%20'none'"></iframe>
    1717</body>
    1818</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-05.html

    r125195 r211700  
    1313    Directives starting with an invalid character should be logged and ignored.
    1414  </p>
    15   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=:script-src%20'none'"></iframe>
     15  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=:script-src%20'none'"></iframe>
    1616</body>
    1717</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/resources/multiple-iframe-test.js

    r195367 r211700  
    3333        scriptToLoad = encodeURIComponent(current[2]);
    3434
    35     iframe.src = baseURL + "resources/echo-script-src.pl?" +
     35    iframe.src = baseURL + "resources/nph-echo-script-src.pl?" +
    3636                 "experimental=" + (experimental ? "true" : "false") +
    3737                 "&should_run=" + encodeURIComponent(current[0]) +

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/resources/nph-echo-script-src.pl

    r211699 r211700  
    55my $cgi = new CGI;
    66
     7print "HTTP/1.1 200 OK\n";
    78print "Content-Type: text/html; charset=UTF-8\n";
    89my $experimental = $cgi->param('experimental') || "";

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/script-loads-with-img-src.html

    r120174 r211700  
    1010</head>
    1111<body>
    12   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-img%20'none'"></iframe>
     12  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-img%20'none'"></iframe>
    1313</body>
    1414</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none.html

    r120174 r211700  
    1313    Loads an iframe which in turns tries to load an external script. The iframe has a content security policy disabling external scripts. So the script should not get executed.
    1414  </p>
    15   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=allow%20*%3B%20script-src%20'none'"></iframe>
     15  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=allow%20*%3B%20script-src%20'none'"></iframe>
    1616</body>
    1717</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-01.html

    r120174 r211700  
    1010</head>
    1111<body>
    12   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://localhost:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
     12  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://localhost:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
    1313</body>
    1414</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-02.html

    r120174 r211700  
    1010</head>
    1111<body>
    12   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8080/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
     12  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8080/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
    1313</body>
    1414</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-03.html

    r120174 r211700  
    1010</head>
    1111<body>
    12   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=https://127.0.0.1:8443/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
     12  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=https://127.0.0.1:8443/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
    1313</body>
    1414</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self.html

    r120174 r211700  
    1010</head>
    1111<body>
    12   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
     12  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
    1313</body>
    1414</html>

  • branches/safari-603-branch/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme.html

    r120174 r211700  
    1010</head>
    1111<body>
    12   <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=https://127.0.0.1:8443/security/contentSecurityPolicy/resources/script.js&csp=script-src%20*"></iframe>
     12  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=https://127.0.0.1:8443/security/contentSecurityPolicy/resources/script.js&csp=script-src%20*"></iframe>
    1313</body>
    1414</html>
Note: See TracChangeset for help on using the changeset viewer.