diff options
| author | Selim Gurun <sgurun@google.com> | 2014-01-15 17:10:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 17:10:49 -0800 |
| commit | f8c1843783a5bc8b0b5198e695bad96e9595d921 (patch) | |
| tree | ac977cdca623444c093973470f17e99f90a29c26 | |
| parent | 05288bbcba86cdf453e0eef9dacd2a076d079680 (diff) | |
| parent | 699496ca7b8bc7ef2727a6681eb95aa8ac78e59b (diff) | |
| download | Browser-f8c1843783a5bc8b0b5198e695bad96e9595d921.tar.gz | |
am 699496ca: am 6243e7cb: Restrict loading private browser files
* commit '699496ca7b8bc7ef2727a6681eb95aa8ac78e59b':
Restrict loading private browser files
| -rw-r--r-- | src/com/android/browser/Tab.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index b5000c2c..4eb5c067 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -72,6 +72,7 @@ import com.android.browser.TabControl.OnThumbnailUpdatedListener; import com.android.browser.homepages.HomeProvider; import com.android.browser.provider.SnapshotProvider.Snapshots; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -101,6 +102,8 @@ class Tab implements PictureListener { private static final int CAPTURE_DELAY = 100; private static final int INITIAL_PROGRESS = 5; + private static final String RESTRICTED = "<html><body>not allowed</body></html>"; + private static Bitmap sDefaultFavicon; private static Paint sAlphaPaint = new Paint(); @@ -626,6 +629,24 @@ class Tab implements PictureListener { @Override public WebResourceResponse shouldInterceptRequest(WebView view, String url) { + Uri uri = Uri.parse(url); + if (uri.getScheme().toLowerCase().equals("file")) { + File file = new File(uri.getPath()); + try { + if (file.getCanonicalPath().startsWith( + mContext.getDatabasePath("foo").getParent())) { + return new WebResourceResponse("text/html","UTF-8", + new ByteArrayInputStream(RESTRICTED.getBytes("UTF-8"))); + } + } catch (Exception ex) { + Log.e(LOGTAG, "Bad canonical path" + ex.toString()); + try { + return new WebResourceResponse("text/html","UTF-8", + new ByteArrayInputStream(RESTRICTED.getBytes("UTF-8"))); + } catch (java.io.UnsupportedEncodingException e) { + } + } + } WebResourceResponse res = HomeProvider.shouldInterceptRequest( mContext, url); return res; |