Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Android WebView: Deprecate unsafe file urls APIs" into rvc-dev am: 8ed01d4075 am: c3d9d88ec7 am: e3e54a4507

Browse Source 
Change-Id: Ic868c5a8e777981e54ed37f0dbbe923b0e4e2806
This commit is contained in:
Automerger Merge Worker
2020-03-11 00:01:03 +00:00
parent 5d16e32f38 e3e54a4507
commit d57030d8bc
3 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -58003,7 +58003,7 @@ package android.webkit {
method @Deprecated public abstract void removeSessionCookie();
method public abstract void removeSessionCookies(@Nullable android.webkit.ValueCallback<java.lang.Boolean>);
method public abstract void setAcceptCookie(boolean);
method public static void setAcceptFileSchemeCookies(boolean);
method @Deprecated public static void setAcceptFileSchemeCookies(boolean);
method public abstract void setAcceptThirdPartyCookies(android.webkit.WebView, boolean);
method public abstract void setCookie(String, String);
method public abstract void setCookie(String, String, @Nullable android.webkit.ValueCallback<java.lang.Boolean>);
@@ -58368,8 +58368,8 @@ package android.webkit {
method public abstract String getUserAgentString();
method public abstract void setAllowContentAccess(boolean);
method public abstract void setAllowFileAccess(boolean);
method public abstract void setAllowFileAccessFromFileURLs(boolean);
method public abstract void setAllowUniversalAccessFromFileURLs(boolean);
method @Deprecated public abstract void setAllowFileAccessFromFileURLs(boolean);
method @Deprecated public abstract void setAllowUniversalAccessFromFileURLs(boolean);
method public abstract void setAppCacheEnabled(boolean);
method @Deprecated public abstract void setAppCacheMaxSize(long);
method public abstract void setAppCachePath(String);

27
core/java/android/webkit/CookieManager.java
View File

@@ -268,17 +268,28 @@ public abstract class CookieManager {
protected abstract boolean allowFileSchemeCookiesImpl();
/**
* Sets whether the application's {@link WebView} instances should send and
* accept cookies for file scheme URLs.
* Use of cookies with file scheme URLs is potentially insecure and turned
* off by default.
* Do not use this feature unless you can be sure that no unintentional
* sharing of cookie data can take place.
* Sets whether the application's {@link WebView} instances should send and accept cookies for
* file scheme URLs.
* <p>
* Note that calls to this method will have no effect if made after a
* {@link WebView} or CookieManager instance has been created.
* Use of cookies with file scheme URLs is potentially insecure and turned off by default. All
* {@code file://} URLs share all their cookies, which may lead to leaking private app cookies
* (ex. any malicious file can access cookies previously set by other (trusted) files).
* <p class="note">
* Loading content via {@code file://} URLs is generally discouraged. See the note in
* {@link WebSettings#setAllowFileAccess}.
* Using <a href="{@docRoot}reference/androidx/webkit/WebViewAssetLoader.html">
* androidx.webkit.WebViewAssetLoader</a> to load files over {@code http(s)://} URLs allows
* the standard web security model to be used for setting and sharing cookies for local files.
* <p>
* Note that calls to this method will have no effect if made after calling other
* {@link CookieManager} APIs.
*
* @deprecated This setting is not secure, please use
* <a href="{@docRoot}reference/androidx/webkit/WebViewAssetLoader.html">
* androidx.webkit.WebViewAssetLoader</a> instead.
*/
// Static for backward compatibility.
@Deprecated
public static void setAcceptFileSchemeCookies(boolean accept) {
getInstance().setAcceptFileSchemeCookiesImpl(accept);
}

73
core/java/android/webkit/WebSettings.java
View File

@@ -983,48 +983,63 @@ public abstract class WebSettings {
public abstract void setJavaScriptEnabled(boolean flag);
/**
* Sets whether JavaScript running in the context of a file scheme URL
* should be allowed to access content from any origin. This includes
* access to content from other file scheme URLs. See
* {@link #setAllowFileAccessFromFileURLs}. To enable the most restrictive,
* and therefore secure policy, this setting should be disabled.
* Note that this setting affects only JavaScript access to file scheme
* resources. Other access to such resources, for example, from image HTML
* elements, is unaffected. To prevent possible violation of same domain policy
* when targeting {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and earlier,
* you should explicitly set this value to {@code false}.
* Sets whether cross-origin requests in the context of a file scheme URL should be allowed to
* access content from <i>any</i> origin. This includes access to content from other file
* scheme URLs or web contexts. Note that some access such as image HTML elements doesn't
* follow same-origin rules and isn't affected by this setting.
* <p>
* <b>Don't</b> enable this setting if you open files that may be created or altered by
* external sources. Enabling this setting allows malicious scripts loaded in a {@code file://}
* context to launch cross-site scripting attacks, either accessing arbitrary local files
* including WebView cookies, app private data or even credentials used on arbitrary web sites.
* <p class="note">
* Loading content via {@code file://} URLs is generally discouraged. See the note in
* {@link #setAllowFileAccess}.
* <p>
* The default value is {@code true} for apps targeting
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and below,
* and {@code false} when targeting {@link android.os.Build.VERSION_CODES#JELLY_BEAN}
* and above.
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and below, and {@code false}
* when targeting {@link android.os.Build.VERSION_CODES#JELLY_BEAN} and above. To prevent
* possible violation of same domain policy when targeting
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and earlier, you should
* explicitly set this value to {@code false}.
*
* @param flag whether JavaScript running in the context of a file scheme
* URL should be allowed to access content from any origin
* @param flag whether JavaScript running in the context of a file scheme URL should be allowed
* to access content from any origin
* @deprecated This setting is not secure, please use
* <a href="{@docRoot}reference/androidx/webkit/WebViewAssetLoader.html">
* androidx.webkit.WebViewAssetLoader</a> to load file content securely.
*/
@Deprecated
public abstract void setAllowUniversalAccessFromFileURLs(boolean flag);
/**
* Sets whether JavaScript running in the context of a file scheme URL
* should be allowed to access content from other file scheme URLs. To
* enable the most restrictive, and therefore secure, policy this setting
* should be disabled. Note that the value of this setting is ignored if
* the value of {@link #getAllowUniversalAccessFromFileURLs} is {@code true}.
* Note too, that this setting affects only JavaScript access to file scheme
* resources. Other access to such resources, for example, from image HTML
* elements, is unaffected. To prevent possible violation of same domain policy
* when targeting {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and earlier,
* you should explicitly set this value to {@code false}.
* Sets whether cross-origin requests in the context of a file scheme URL should be allowed to
* access content from other file scheme URLs. Note that some accesses such as image HTML
* elements don't follow same-origin rules and aren't affected by this setting.
* <p>
* The default value is {@code true} for apps targeting
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and below,
* and {@code false} when targeting {@link android.os.Build.VERSION_CODES#JELLY_BEAN}
* and above.
* <b>Don't</b> enable this setting if you open files that may be created or altered by
* external sources. Enabling this setting allows malicious scripts loaded in a {@code file://}
* context to access arbitrary local files including WebView cookies and app private data.
* <p class="note">
* Loading content via {@code file://} URLs is generally discouraged. See the note in
* {@link #setAllowFileAccess}.
* <p>
* Note that the value of this setting is ignored if the value of
* {@link #getAllowUniversalAccessFromFileURLs} is {@code true}. The default value is
* {@code true} for apps targeting {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1}
* and below, and {@code false} when targeting {@link android.os.Build.VERSION_CODES#JELLY_BEAN}
* and above. To prevent possible violation of same domain policy when targeting
* {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1} and earlier, you should
* explicitly set this value to {@code false}.
*
* @param flag whether JavaScript running in the context of a file scheme
* URL should be allowed to access content from other file
* scheme URLs
* @deprecated This setting is not secure, please use
* <a href="{@docRoot}reference/androidx/webkit/WebViewAssetLoader.html">
* androidx.webkit.WebViewAssetLoader</a> to load file content securely.
*/
@Deprecated
public abstract void setAllowFileAccessFromFileURLs(boolean flag);
/**