From bfd1bfe9f051c95228c157170e3b38937dac388c Mon Sep 17 00:00:00 2001 From: Simon MacDonald Date: Mon, 1 Oct 2012 16:03:28 -0400 Subject: [PATCH] CB-1564: DroidGap.loadUrl follows a path that never checks the white list Whoops, I needed to do more testing. This looks like the trick but it could use a review. --- framework/src/org/apache/cordova/CordovaWebView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 106f60d9..6488ead1 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -481,7 +481,9 @@ public class CordovaWebView extends WebView { if (LOG.isLoggable(LOG.DEBUG) && !url.startsWith("javascript:")) { LOG.d(TAG, ">>> loadUrlNow()"); } - super.loadUrl(url); + if (url.startsWith("file://") || url.indexOf(this.baseUrl) == 0 || url.startsWith("javascript:") || this.isUrlWhiteListed(url)) { + super.loadUrl(url); + } } /**