android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java - Issue 2668273003: WebView shell: automatically escape URLs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java

Issue 2668273003: WebView shell: automatically escape URLs (Closed)

Patch Set: Created 3 years, 11 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

Index: android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java

diff --git a/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java

index c8b3ae75e7903f68545beb872fadb7dad0d1a847..02b364a67d855f11348820e34877978fc6f9581b 100644

--- a/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java

+++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java

@@ -50,9 +50,6 @@ import org.chromium.base.Log;

import java.lang.reflect.InvocationTargetException;

import java.lang.reflect.Method;

-import java.net.URI;

-import java.net.URISyntaxException;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

@@ -401,16 +398,10 @@ public class WebViewBrowserActivity extends Activity implements PopupMenu.OnMenu

public void loadUrlFromUrlBar(View view) {

String url = mUrlBar.getText().toString();

- try {

- URI uri = new URI(url);

- url = (uri.getScheme() == null) ? "http://" + uri.toString() : uri.toString();

- } catch (URISyntaxException e) {

- String message = "<html><body>URISyntaxException: " + e.getMessage() + "</body></html>";

- mWebView.loadData(message, "text/html", "UTF-8");

- setUrlFail(true);

- return;

- }

+ // Parse with android.net.Uri instead of java.net.URI because Uri does no validation. Rather

+ // than failing, illegal characters should just be passed through to WebView, which will

+ // escape them where appropriate.

+ if (Uri.parse(url).getScheme() == null) url = "http://" + url;

timvolodine 2017/02/02 01:32:35 I think the original code also meant to catch thin

paulmiller 2017/02/02 01:43:20 No, but I don't think we need to. If you give WebV

setUrlBarText(url);

setUrlFail(false);

loadUrl(url);

« no previous file with comments | « no previous file | no next file » | no next file with comments »