You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2021/07/14 13:29:28 UTC
[cordova-android] branch master updated: fix: add
WebViewAssetloader to default allow list (#1275)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new bedb442 fix: add WebViewAssetloader to default allow list (#1275)
bedb442 is described below
commit bedb4427f420157ac547588acdf1083e8e916e20
Author: Niklas Merz <ni...@apache.org>
AuthorDate: Wed Jul 14 15:29:15 2021 +0200
fix: add WebViewAssetloader to default allow list (#1275)
---
framework/src/org/apache/cordova/AllowListPlugin.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/framework/src/org/apache/cordova/AllowListPlugin.java b/framework/src/org/apache/cordova/AllowListPlugin.java
index 7b2e787..3333180 100644
--- a/framework/src/org/apache/cordova/AllowListPlugin.java
+++ b/framework/src/org/apache/cordova/AllowListPlugin.java
@@ -23,6 +23,7 @@ import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.ConfigXmlParser;
import org.apache.cordova.LOG;
import org.apache.cordova.AllowList;
+import org.apache.cordova.CordovaPreferences;
import org.xmlpull.v1.XmlPullParser;
import android.content.Context;
@@ -73,12 +74,19 @@ public class AllowListPlugin extends CordovaPlugin {
}
private class CustomConfigXmlParser extends ConfigXmlParser {
+ private CordovaPreferences prefs = new CordovaPreferences();
+
@Override
public void handleStartTag(XmlPullParser xml) {
String strNode = xml.getName();
if (strNode.equals("content")) {
String startPage = xml.getAttributeValue(null, "src");
allowedNavigations.addAllowListEntry(startPage, false);
+
+ // Allow origin for WebViewAssetLoader
+ if (!this.prefs.getBoolean("AndroidInsecureFileModeEnabled", false)) {
+ allowedNavigations.addAllowListEntry("https://" + this.prefs.getString("hostname", "localhost"), false);
+ }
} else if (strNode.equals("allow-navigation")) {
String origin = xml.getAttributeValue(null, "href");
if ("*".equals(origin)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org