Add tests for XHR across custom-schemed URIs

When you use custom-schemed URLs across XHR, you will see an error saying that you cannot send an XHR from 'null' origin. This CL adds tests to compare the behavior between HTTP-schemed URL and custom-schemed URL such that the actual fix can pick it up. Bug: 898589, 900528, 896059 Change-Id: I43b4748a6595298d4ac6fdb216c8db1738719adf Reviewed-on: https://chromium-review.googlesource.com/c/1340999Reviewed-by: Richard Coles <torne@chromium.org> Commit-Queue: Changwan Ryu <changwan@chromium.org> Cr-Commit-Position: refs/heads/master@{#609490}

Add tests for XHR across custom-schemed URIs
When you use custom-schemed URLs across XHR, you will see an error saying that you cannot send an XHR from 'null' origin. This CL adds tests to compare the behavior between HTTP-schemed URL and custom-schemed URL such that the actual fix can pick it up. Bug: 898589, 900528, 896059 Change-Id: I43b4748a6595298d4ac6fdb216c8db1738719adf Reviewed-on: https://chromium-review.googlesource.com/c/1340999Reviewed-by: Richard Coles <torne@chromium.org> Commit-Queue: Changwan Ryu <changwan@chromium.org> Cr-Commit-Position: refs/heads/master@{#609490}
73b9579d · Changwan Ryu · Commit Bot · 990a0e4f · 73b9579d
Commit 73b9579d authored Nov 19, 2018 by Changwan Ryu Committed by Commit Bot Nov 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 84 additions and 0 deletions

android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java ...hromium/android_webview/test/LoadDataWithBaseUrlTest.java +84 -0

No files found.
--- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
@@ -18,6 +18,7 @@ import org.junit.runner.RunWith;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwCookieManager;
 import org.chromium.android_webview.AwSettings;
+import org.chromium.android_webview.AwWebResourceResponse;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.Feature;
@@ -28,8 +29,11 @@ import org.chromium.content_public.browser.test.util.TestCallbackHelperContainer
 import org.chromium.content_public.common.ContentUrlConstants;
 import org.chromium.net.test.util.TestWebServer;

+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.List;

 /**
@@ -571,4 +575,84 @@ public class LoadDataWithBaseUrlTest {
                mActivityTestRule.executeJavaScriptAndWaitForResult(
                        mAwContents, mContentsClient, "window.origin;"));
    }
+
+    @Test
+    @SmallTest
+    @Feature({"AndroidWebView"})
+    public void testXhrForHttpSchemeUrl() throws Throwable {
+        Assert.assertTrue(verifyXhrForUrls("https://google.com/1", "https://google.com/2"));
+    }
+
+    @Test
+    @SmallTest
+    @Feature({"AndroidWebView"})
+    // https://crbug.com/900528
+    public void testXhrForCustomSchemeUrl() throws Throwable {
+        // TODO(dcheng): this should be fixed by https://crbug.com/900528.
+        Assert.assertFalse(verifyXhrForUrls("myscheme://mydomain/1", "myscheme://mydomain/2"));
+    }
+
+    /**
+     * Verify that XHR can be correctly run with the set base URI, regardless of its scheme.
+     *
+     * @param baseUri Base URI to start from.
+     * @param textUri The text URI to fetch the text from.
+     * @throws Throwable
+     */
+    private boolean verifyXhrForUrls(String baseUri, String textUri) throws Throwable {
+        final String successMsg = "SUCCESS";
+        final String errorMsg = "ERROR";
+        final String data = "<html><head><script type='text/javascript'>"
+                + "var xhr = new XMLHttpRequest();"
+                + "xhr.open('GET', '" + textUri + "', true);"
+                + "xhr.onload = function(e) {"
+                + "  if (xhr.readyState === 4 && xhr.status === 200) {"
+                + "    document.title = xhr.responseText;"
+                + "  } else {"
+                + "    console.log('Error status: ' + xhr.statusText);"
+                + "    document.title = '" + errorMsg + "';"
+                + "  }"
+                + "};"
+                + "xhr.onerror = function(e) {"
+                + "  console.log('Error status: ' + xhr.statusText);"
+                + "  document.title = '" + errorMsg + "';"
+                + "};"
+                + "xhr.send(null);"
+                + "</script></head></html>";
+
+        // Intercept TEXT URI request, and respond with 'SUCCESS'.
+        TestAwContentsClient client = new TestAwContentsClient() {
+            @Override
+            public AwWebResourceResponse shouldInterceptRequest(AwWebResourceRequest request) {
+                String url = request.url;
+                if (textUri.equals(url)) {
+                    return new AwWebResourceResponse(
+                            "text/plaintext", "utf-8", createInputStreamForString(successMsg));
+                } else {
+                    return super.shouldInterceptRequest(request);
+                }
+            }
+        };
+
+        // We need extra setup with the new client.
+        final AwTestContainerView testContainerView =
+                mActivityTestRule.createAwTestContainerViewOnMainSync(client);
+        AwContents awContents = testContainerView.getAwContents();
+        mActivityTestRule.getAwSettingsOnUiThread(awContents).setJavaScriptEnabled(true);
+
+        // Starting from BASE URI, load data that loads JS URI.
+        mActivityTestRule.loadDataWithBaseUrlSync(awContents, client.getOnPageFinishedHelper(),
+                data, "text/html", false, baseUri, null);
+
+        // Polling here as XHR may take extra steps to change the title.
+        AwActivityTestRule.pollInstrumentationThread(() -> {
+            String title = mActivityTestRule.getTitleOnUiThread(awContents);
+            return successMsg.equals(title) || errorMsg.equals(title);
+        });
+        return successMsg.equals(mActivityTestRule.getTitleOnUiThread(awContents));
+    }
+
+    private InputStream createInputStreamForString(String str) {
+        return new ByteArrayInputStream(str.getBytes(Charset.defaultCharset()));
+    }
 }