Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/http/tests/serviceworker/resources/fetch-canvas-tainting-iframe.html

Issue 600393004: [ServiceWorker] Set FetchRequestMode and handle wasFetchedViaServiceWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: delete fetch-cors-xhr-expected.txt Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/http/tests/serviceworker/fetch-request-image.html ('k') | LayoutTests/http/tests/serviceworker/resources/fetch-cors-xhr-iframe.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/serviceworker/resources/fetch-canvas-tainting-iframe.html
diff --git a/LayoutTests/http/tests/serviceworker/resources/fetch-canvas-tainting-iframe.html b/LayoutTests/http/tests/serviceworker/resources/fetch-canvas-tainting-iframe.html
index 32dba6e996361e0449be8df245042a3eba5171e2..2c588c5e59b1fc1848b195bd68d0911d2a2b8a7a 100644
--- a/LayoutTests/http/tests/serviceworker/resources/fetch-canvas-tainting-iframe.html
+++ b/LayoutTests/http/tests/serviceworker/resources/fetch-canvas-tainting-iframe.html
@@ -3,11 +3,15 @@
var image_path = base_path() + 'fetch-access-control.php?PNGIMAGE';
var host_info = get_host_info();
+var NOT_TAINTED = 'NOT_TAINTED';
+var TAINTED = 'TAINTED';
+var LOAD_ERROR = 'LOAD_ERROR';
+
function create_test_case_promise(url, cross_origin) {
- return new Promise(function(resolve, reject) {
+ return new Promise(function(resolve) {
var img = new Image();
- if (cross_origin) {
- img.crossOrigin = 'anonymous';
+ if (cross_origin != '') {
+ img.crossOrigin = cross_origin;
}
img.onload = function() {
try {
@@ -17,62 +21,228 @@ function create_test_case_promise(url, cross_origin) {
var context = canvas.getContext('2d');
context.drawImage(img, 0, 0);
context.getImageData(0, 0, 100, 100);
- resolve();
+ resolve(NOT_TAINTED);
} catch (e) {
- reject();
+ resolve(TAINTED);
}
};
+ img.onerror = function() {
+ resolve(LOAD_ERROR);
+ }
img.src = url;
});
}
-function create_success_test_promise(url, cross_origin) {
+function create_test_promise(url, cross_origin, expected_result) {
return new Promise(function(resolve, reject) {
create_test_case_promise(url, cross_origin)
- .then(function() { resolve(); })
- .catch(function() {
- reject('Image of ' + url + ' must not taint the canvas.');
- });
- });
-}
-
-function create_failure_test_promise(url, cross_origin) {
- return new Promise(function(resolve, reject) {
- create_test_case_promise(url, cross_origin)
- .then(function() {
- reject('Image of ' + url + ' must taint the canvas.');
- })
- .catch(function() { resolve(); });
+ .then(function(result) {
+ if (result == expected_result) {
+ resolve();
+ } else {
+ reject('Result of url:' + url + ' ' +
+ ' cross_origin: ' + cross_origin + ' must be ' +
+ expected_result + ' but ' + result);
+ }
+ })
});
}
window.addEventListener('message', function(evt) {
var port = evt.ports[0];
- create_success_test_promise(host_info['HTTP_ORIGIN'] + image_path, false)
- .then(function() {
- return create_failure_test_promise(
- host_info['HTTP_REMOTE_ORIGIN'] + image_path,
- false);
- })
- .then(function() {
- return create_success_test_promise(
- './dummy?url=' +
- encodeURIComponent(host_info['HTTP_ORIGIN'] + image_path),
- false);
- })
- .then(function() {
- return create_failure_test_promise(
- './dummy?mode=no-cors&url=' +
- encodeURIComponent(host_info['HTTP_REMOTE_ORIGIN'] + image_path),
- false);
- })
- .then(function() {
- return create_success_test_promise(
- './dummy?mode=no-cors&url=' +
- encodeURIComponent(host_info['HTTP_REMOTE_ORIGIN'] + image_path +
+ var image_url = host_info['HTTP_ORIGIN'] + image_path;
+ var remote_image_url = host_info['HTTP_REMOTE_ORIGIN'] + image_path;
+ Promise.all([
+ // Reject tests
+ create_test_promise(image_url + '&reject', '', LOAD_ERROR),
+ create_test_promise(image_url + '&reject', 'anonymous', LOAD_ERROR),
+ create_test_promise(
+ image_url + '&reject', 'use-credentials', LOAD_ERROR),
+ // Fallback tests
+ create_test_promise(
+ image_url + '&ignore',
+ '',
+ NOT_TAINTED),
+ create_test_promise(
+ remote_image_url + '&ignore',
+ '',
+ TAINTED),
+ create_test_promise(
+ remote_image_url + '&ignore',
+ 'anonymous',
+ LOAD_ERROR),
+ create_test_promise(
+ remote_image_url + '&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
+ '&ignore',
+ 'anonymous',
+ NOT_TAINTED),
+ create_test_promise(
+ remote_image_url + '&ignore',
+ 'use-credentials',
+ LOAD_ERROR),
+ create_test_promise(
+ remote_image_url + '&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
+ '&ignore',
+ 'use-credentials',
+ LOAD_ERROR),
+ create_test_promise(
+ remote_image_url + '&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
+ '&ACACredentials=true&ignore',
+ 'use-credentials',
+ NOT_TAINTED),
+
+ // Credential test (fallback)
+ create_test_promise(
+ image_url + '&Auth&ignore',
+ '',
+ NOT_TAINTED),
+ create_test_promise(
+ remote_image_url + '&Auth&ignore',
+ '',
+ TAINTED),
+ create_test_promise(
+ remote_image_url + '&Auth&ignore',
+ 'anonymous',
+ LOAD_ERROR),
+ create_test_promise(
+ remote_image_url + '&Auth&ignore',
+ 'use-credentials',
+ LOAD_ERROR),
+ create_test_promise(
+ remote_image_url + '&Auth&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
+ '&ignore',
+ 'use-credentials',
+ LOAD_ERROR),
+ create_test_promise(
+ remote_image_url + '&Auth&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
+ '&ACACredentials=true&ignore',
+ 'use-credentials',
+ NOT_TAINTED),
+
+ // Basic response
+ create_test_promise(
+ image_url +
+ '&mode=same-origin&url=' + encodeURIComponent(image_url),
+ '',
+ NOT_TAINTED),
+ create_test_promise(
+ image_url +
+ '&mode=same-origin&url=' + encodeURIComponent(image_url),
+ 'anonymous',
+ NOT_TAINTED),
+ create_test_promise(
+ image_url +
+ '&mode=same-origin&url=' + encodeURIComponent(image_url),
+ 'use-credentials',
+ NOT_TAINTED),
+ create_test_promise(
+ remote_image_url +
+ '&mode=same-origin&url=' + encodeURIComponent(image_url),
+ '',
+ NOT_TAINTED),
+ create_test_promise(
+ remote_image_url +
+ '&mode=same-origin&url=' + encodeURIComponent(image_url),
+ 'anonymous',
+ NOT_TAINTED),
+ create_test_promise(
+ remote_image_url +
+ '&mode=same-origin&url=' + encodeURIComponent(image_url),
+ 'use-credentials',
+ NOT_TAINTED),
+
+ // Opaque response
+ create_test_promise(
+ image_url +
+ '&mode=no-cors&url=' + encodeURIComponent(remote_image_url),
+ '',
+ TAINTED),
+ create_test_promise(
+ image_url +
+ '&mode=no-cors&url=' + encodeURIComponent(remote_image_url),
+ 'anonymous',
+ LOAD_ERROR),
+ create_test_promise(
+ image_url +
+ '&mode=no-cors&url=' + encodeURIComponent(remote_image_url),
+ 'use-credentials',
+ LOAD_ERROR),
+ create_test_promise(
+ remote_image_url +
+ '&mode=no-cors&url=' + encodeURIComponent(remote_image_url),
+ '',
+ TAINTED),
+ create_test_promise(
+ remote_image_url +
+ '&mode=no-cors&url=' + encodeURIComponent(remote_image_url),
+ 'anonymous',
+ LOAD_ERROR),
+ create_test_promise(
+ remote_image_url +
+ '&mode=no-cors&url=' + encodeURIComponent(remote_image_url),
+ 'use-credentials',
+ LOAD_ERROR),
+
+ // CORS response
+ create_test_promise(
+ image_url +
+ '&mode=cors&url=' +
+ encodeURIComponent(remote_image_url +
'&ACAOrigin=' + host_info['HTTP_ORIGIN']),
- true);
- })
+ '',
+ TAINTED), // FIXME: This should be NOT_TAINTED.
+ create_test_promise(
+ image_url +
+ '&mode=cors&url=' +
+ encodeURIComponent(remote_image_url +
+ '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
+ 'anonymous',
+ NOT_TAINTED),
+ create_test_promise(
+ image_url +
+ '&mode=cors&url=' +
+ encodeURIComponent(remote_image_url +
+ '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
+ 'use-credentials',
+ TAINTED), // FIXME: This should be NOT_TAINTED.
+ create_test_promise(
+ image_url +
+ '&mode=cors&url=' +
+ encodeURIComponent(
+ remote_image_url +
+ '&ACACredentials=true&ACAOrigin=' + host_info['HTTP_ORIGIN']),
+ 'use-credentials',
+ NOT_TAINTED),
+ create_test_promise(
+ remote_image_url +
+ '&mode=cors&url=' +
+ encodeURIComponent(remote_image_url +
+ '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
+ '',
+ TAINTED), // FIXME: This should be NOT_TAINTED.
+ create_test_promise(
+ remote_image_url +
+ '&mode=cors&url=' +
+ encodeURIComponent(remote_image_url +
+ '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
+ 'anonymous',
+ NOT_TAINTED),
+ create_test_promise(
+ remote_image_url +
+ '&mode=cors&url=' +
+ encodeURIComponent(remote_image_url +
+ '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
+ 'use-credentials',
+ TAINTED), // FIXME: This should be NOT_TAINTED.
+ create_test_promise(
+ remote_image_url +
+ '&mode=cors&url=' +
+ encodeURIComponent(
+ remote_image_url +
+ '&ACACredentials=true&ACAOrigin=' + host_info['HTTP_ORIGIN']),
+ 'use-credentials',
+ NOT_TAINTED)
+ ])
.then(function() {
port.postMessage({results: 'finish'});
})
« no previous file with comments | « LayoutTests/http/tests/serviceworker/fetch-request-image.html ('k') | LayoutTests/http/tests/serviceworker/resources/fetch-cors-xhr-iframe.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698