From 844f91a021fdf2e01d8adaaf1c69008334d69d14 Mon Sep 17 00:00:00 2001
From: Erisu <ellis.bryan@gmail.com>
Date: Tue, 1 Dec 2020 14:57:07 +0900
Subject: [PATCH 1/4] refactor: naming to allow list

---
 bin/templates/project/assets/www/index.html   |  2 +-
 bin/templates/project/res/xml/config.xml      |  2 +-
 .../{Whitelist.java => AllowList.java}        | 34 +++++++++----------
 framework/src/org/apache/cordova/Config.java  |  2 +-
 .../org/apache/cordova/CordovaWebView.java    |  2 +-
 .../apache/cordova/CordovaWebViewImpl.java    |  6 ++--
 .../cordova/engine/SystemWebViewClient.java   |  4 +--
 .../cordova/engine/SystemWebViewEngine.java   |  2 +-
 .../www/{whitelist => allowlist}/index.html   |  2 +-
 .../www/{whitelist => allowlist}/index2.html  |  2 +-
 .../app/src/main/assets/www/index.html        |  2 +-
 .../app/src/main/assets/www/index.html        |  2 +-
 .../src/main/assets/www/whitelist/index.html  |  2 +-
 .../src/main/assets/www/whitelist/index2.html |  2 +-
 14 files changed, 33 insertions(+), 33 deletions(-)
 rename framework/src/org/apache/cordova/{Whitelist.java => AllowList.java} (87%)
 rename test/android/app/src/main/assets/www/{whitelist => allowlist}/index.html (98%)
 rename test/android/app/src/main/assets/www/{whitelist => allowlist}/index2.html (98%)
diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html
index 646f9cb25d..590563bed1 100644
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -21,7 +21,7 @@
     <head>
         <!--
         Customize this policy to fit your own app's needs. For more guidance, see:
-            https://github.com/apache/cordova-plugin-whitelist/blob/master/README.md#content-security-policy
+            https://cordova.apache.org/docs/en/latest/
         Some notes:
             * gap: is required only on iOS (when using UIWebView) and is needed for JS->native communication
             * https://ssl.gstatic.com is required only on Android and is needed for TalkBack to function properly
diff --git a/bin/templates/project/res/xml/config.xml b/bin/templates/project/res/xml/config.xml
index ae067831a2..79e01a0bbb 100644
--- a/bin/templates/project/res/xml/config.xml
+++ b/bin/templates/project/res/xml/config.xml
@@ -33,7 +33,7 @@
     <!-- <content src="http://mysite.com/myapp.html" /> for external pages -->
     <content src="index.html" />
 
-    <!-- Whitelist docs: https://github.com/apache/cordova-plugin-whitelist -->
+    <!-- Allow List docs: https://cordova.apache.org/docs/en/latest/ -->
     <access origin="*" />
     <!-- Grant certain URLs the ability to launch external applications. This
          behaviour is set to match that of Cordova versions before 3.6.0, and
diff --git a/framework/src/org/apache/cordova/Whitelist.java b/framework/src/org/apache/cordova/AllowList.java
similarity index 87%
rename from framework/src/org/apache/cordova/Whitelist.java
rename to framework/src/org/apache/cordova/AllowList.java
index d0f823c3ca..b63171db96 100644
--- a/framework/src/org/apache/cordova/Whitelist.java
+++ b/framework/src/org/apache/cordova/AllowList.java
@@ -28,7 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import android.net.Uri;
 
-public class Whitelist {
+public class AllowList {
     private static class URLPattern {
         public Pattern scheme;
         public Pattern host;
@@ -92,12 +92,12 @@ public boolean matches(Uri uri) {
         }
     }
 
-    private ArrayList<URLPattern> whiteList;
+    private ArrayList<URLPattern> allowList;
 
-    public static final String TAG = "Whitelist";
+    public static final String TAG = "AllowList";
 
-    public Whitelist() {
-        this.whiteList = new ArrayList<URLPattern>();
+    public AllowList() {
+        this.allowList = new ArrayList<URLPattern>();
     }
 
     /* Match patterns (from http://developer.chrome.com/extensions/match_patterns.html)
@@ -111,13 +111,13 @@ public Whitelist() {
      * the scheme to be omitted for backwards compatibility. (Also host is not required
      * to begin with a "*" or "*.".)
      */
-    public void addWhiteListEntry(String origin, boolean subdomains) {
-        if (whiteList != null) {
+    public void addAllowListEntry(String origin, boolean subdomains) {
+        if (allowList != null) {
             try {
                 // Unlimited access to network resources
                 if (origin.compareTo("*") == 0) {
                     LOG.d(TAG, "Unlimited access to network resources");
-                    whiteList = null;
+                    allowList = null;
                 }
                 else { // specific access
                     Pattern parts = Pattern.compile("^((\\*|[A-Za-z-]+):(//)?)?(\\*|((\\*\\.)?[^*/:]+))?(:(\\d+))?(/.*)?");
@@ -131,10 +131,10 @@ public void addWhiteListEntry(String origin, boolean subdomains) {
                         String path = m.group(9);
                         if (scheme == null) {
                             // XXX making it stupid friendly for people who forget to include protocol/SSL
-                            whiteList.add(new URLPattern("http", host, port, path));
-                            whiteList.add(new URLPattern("https", host, port, path));
+                            allowList.add(new URLPattern("http", host, port, path));
+                            allowList.add(new URLPattern("https", host, port, path));
                         } else {
-                            whiteList.add(new URLPattern(scheme, host, port, path));
+                            allowList.add(new URLPattern(scheme, host, port, path));
                         }
                     }
                 }
@@ -149,15 +149,15 @@ public void addWhiteListEntry(String origin, boolean subdomains) {
      * Determine if URL is in approved list of URLs to load.
      *
      * @param uri
-     * @return true if wide open or whitelisted
+     * @return true if wide open or allow listed
      */
-    public boolean isUrlWhiteListed(String uri) {
-        // If there is no whitelist, then it's wide open
-        if (whiteList == null) return true;
+    public boolean isUrlAllowListed(String uri) {
+        // If there is no allowList, then it's wide open
+        if (allowList == null) return true;
 
         Uri parsedUri = Uri.parse(uri);
-        // Look for match in white list
-        Iterator<URLPattern> pit = whiteList.iterator();
+        // Look for match in allow list
+        Iterator<URLPattern> pit = allowList.iterator();
         while (pit.hasNext()) {
             URLPattern p = pit.next();
             if (p.matches(parsedUri)) {
diff --git a/framework/src/org/apache/cordova/Config.java b/framework/src/org/apache/cordova/Config.java
index 073979599e..238cd5e33d 100644
--- a/framework/src/org/apache/cordova/Config.java
+++ b/framework/src/org/apache/cordova/Config.java
@@ -23,7 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import android.app.Activity;
 
-@Deprecated // Use Whitelist, CordovaPrefences, etc. directly.
+@Deprecated // Use AllowList, CordovaPrefences, etc. directly.
 public class Config {
     private static final String TAG = "Config";
 
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index c846c35e34..bfabf2557c 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -94,7 +94,7 @@ public interface CordovaWebView {
     /**
      * Load the specified URL in the Cordova webview or a new browser instance.
      *
-     * NOTE: If openExternal is false, only whitelisted URLs can be loaded.
+     * NOTE: If openExternal is false, only allow listed URLs can be loaded.
      *
      * @param url           The url to load.
      * @param openExternal  Load url in browser instead of Cordova webview.
diff --git a/framework/src/org/apache/cordova/CordovaWebViewImpl.java b/framework/src/org/apache/cordova/CordovaWebViewImpl.java
index a77502d6ef..560741c123 100644
--- a/framework/src/org/apache/cordova/CordovaWebViewImpl.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewImpl.java
@@ -211,19 +211,19 @@ public void showWebPage(String url, boolean openExternal, boolean clearHistory,
 
         // If loading into our webview
         if (!openExternal) {
-            // Make sure url is in whitelist
+            // Make sure url is in allow list
             if (pluginManager.shouldAllowNavigation(url)) {
                 // TODO: What about params?
                 // Load new URL
                 loadUrlIntoView(url, true);
                 return;
             } else {
-                LOG.w(TAG, "showWebPage: Refusing to load URL into webview since it is not in the <allow-navigation> whitelist. URL=" + url);
+                LOG.w(TAG, "showWebPage: Refusing to load URL into webview since it is not in the <allow-navigation> allow list. URL=" + url);
                 return;
             }
         }
         if (!pluginManager.shouldOpenExternalUrl(url)) {
-            LOG.w(TAG, "showWebPage: Refusing to send intent for URL since it is not in the <allow-intent> whitelist. URL=" + url);
+            LOG.w(TAG, "showWebPage: Refusing to send intent for URL since it is not in the <allow-intent> allow list. URL=" + url);
             return;
         }
         try {
diff --git a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java
index af9e51f118..86d17fe5c0 100755
--- a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java
@@ -320,10 +320,10 @@ public void clearAuthenticationTokens() {
     @SuppressWarnings("deprecation")
     public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
         try {
-            // Check the against the whitelist and lock out access to the WebView directory
+            // Check the against the allow list and lock out access to the WebView directory
             // Changing this will cause problems for your application
             if (!parentEngine.pluginManager.shouldAllowRequest(url)) {
-                LOG.w(TAG, "URL blocked by whitelist: " + url);
+                LOG.w(TAG, "URL blocked by allow list: " + url);
                 // Results in a 404.
                 return new WebResourceResponse("text/plain", "UTF-8", null);
             }
diff --git a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
index e703f09d47..def44193b9 100755
--- a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
@@ -168,7 +168,7 @@ private void initWebViewSettings() {
         settings.setSaveFormData(false);
         settings.setSavePassword(false);
 
-        // Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
+        // Jellybean rightfully tried to lock this down. Too bad they didn't give us an allow list
         // while we do this
         settings.setAllowUniversalAccessFromFileURLs(true);
         settings.setMediaPlaybackRequiresUserGesture(false);
diff --git a/test/android/app/src/main/assets/www/whitelist/index.html b/test/android/app/src/main/assets/www/allowlist/index.html
similarity index 98%
rename from test/android/app/src/main/assets/www/whitelist/index.html
rename to test/android/app/src/main/assets/www/allowlist/index.html
index b9596c939c..24cac6eb33 100755
--- a/test/android/app/src/main/assets/www/whitelist/index.html
+++ b/test/android/app/src/main/assets/www/allowlist/index.html
@@ -27,7 +27,7 @@
       <script type="text/javascript" charset="utf-8" src="../main.js"></script>
   </head>
   <body onload="init();" id="stage" class="theme">
-    <h1>Whitelist Page 1</h1>
+    <h1>Allow List Page 1</h1>
     <div id="info">
         <h4>Cordova: <span id="cordova"> &nbsp;</span></h4>
         <h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>
diff --git a/test/android/app/src/main/assets/www/whitelist/index2.html b/test/android/app/src/main/assets/www/allowlist/index2.html
similarity index 98%
rename from test/android/app/src/main/assets/www/whitelist/index2.html
rename to test/android/app/src/main/assets/www/allowlist/index2.html
index 5d990ad720..bb475a8774 100755
--- a/test/android/app/src/main/assets/www/whitelist/index2.html
+++ b/test/android/app/src/main/assets/www/allowlist/index2.html
@@ -27,7 +27,7 @@
       <script type="text/javascript" charset="utf-8" src="../main.js"></script>
   </head>
   <body onload="init();" id="stage" class="theme">
-    <h1>Whitelist Page 2</h1>
+    <h1>Allow List Page 2</h1>
     <div id="info">
         <h4>Cordova: <span id="cordova"> &nbsp;</span></h4>
         <h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>
diff --git a/test/android/app/src/main/assets/www/index.html b/test/android/app/src/main/assets/www/index.html
index 46148260c5..0252050ae5 100755
--- a/test/android/app/src/main/assets/www/index.html
+++ b/test/android/app/src/main/assets/www/index.html
@@ -51,6 +51,6 @@ <h4>Run each of the test activities below:</h4>
     <button class="btn large" onclick="startActivity('htmlnotfound/index.html');">HTML not found</button>
     <button class="btn large" onclick="startActivity('iframe/index.html');">IFrame</button>
     <button class="btn large" onclick="startActivity('lifecycle/index.html');">Lifecycle</button>
-    <button class="btn large" onclick="startActivity('whitelist/index.html');">Whitelist</button>
+    <button class="btn large" onclick="startActivity('allowlist/index.html');">Allow List</button>
   </body>
 </html>
diff --git a/test/androidx/app/src/main/assets/www/index.html b/test/androidx/app/src/main/assets/www/index.html
index 46148260c5..0252050ae5 100755
--- a/test/androidx/app/src/main/assets/www/index.html
+++ b/test/androidx/app/src/main/assets/www/index.html
@@ -51,6 +51,6 @@ <h4>Run each of the test activities below:</h4>
     <button class="btn large" onclick="startActivity('htmlnotfound/index.html');">HTML not found</button>
     <button class="btn large" onclick="startActivity('iframe/index.html');">IFrame</button>
     <button class="btn large" onclick="startActivity('lifecycle/index.html');">Lifecycle</button>
-    <button class="btn large" onclick="startActivity('whitelist/index.html');">Whitelist</button>
+    <button class="btn large" onclick="startActivity('allowlist/index.html');">Allow List</button>
   </body>
 </html>
diff --git a/test/androidx/app/src/main/assets/www/whitelist/index.html b/test/androidx/app/src/main/assets/www/whitelist/index.html
index b9596c939c..24cac6eb33 100755
--- a/test/androidx/app/src/main/assets/www/whitelist/index.html
+++ b/test/androidx/app/src/main/assets/www/whitelist/index.html
@@ -27,7 +27,7 @@
       <script type="text/javascript" charset="utf-8" src="../main.js"></script>
   </head>
   <body onload="init();" id="stage" class="theme">
-    <h1>Whitelist Page 1</h1>
+    <h1>Allow List Page 1</h1>
     <div id="info">
         <h4>Cordova: <span id="cordova"> &nbsp;</span></h4>
         <h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>
diff --git a/test/androidx/app/src/main/assets/www/whitelist/index2.html b/test/androidx/app/src/main/assets/www/whitelist/index2.html
index 5d990ad720..bb475a8774 100755
--- a/test/androidx/app/src/main/assets/www/whitelist/index2.html
+++ b/test/androidx/app/src/main/assets/www/whitelist/index2.html
@@ -27,7 +27,7 @@
       <script type="text/javascript" charset="utf-8" src="../main.js"></script>
   </head>
   <body onload="init();" id="stage" class="theme">
-    <h1>Whitelist Page 2</h1>
+    <h1>Allow List Page 2</h1>
     <div id="info">
         <h4>Cordova: <span id="cordova"> &nbsp;</span></h4>
         <h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>

From 8fbb81826315b193c42a7e23b1902e699fcef5ba Mon Sep 17 00:00:00 2001
From: Erisu <ellis.bryan@gmail.com>
Date: Tue, 1 Dec 2020 16:38:44 +0900
Subject: [PATCH 2/4] feat(allow-list): integrate core plugin

---
 .../org/apache/cordova/AllowListPlugin.java   | 165 ++++++++++++++++++
 .../org/apache/cordova/ConfigXmlParser.java   |   9 +
 2 files changed, 174 insertions(+)
 create mode 100644 framework/src/org/apache/cordova/AllowListPlugin.java

diff --git a/framework/src/org/apache/cordova/AllowListPlugin.java b/framework/src/org/apache/cordova/AllowListPlugin.java
new file mode 100644
index 0000000000..feb6e121b4
--- /dev/null
+++ b/framework/src/org/apache/cordova/AllowListPlugin.java
@@ -0,0 +1,165 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+package org.apache.cordova;
+
+import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.ConfigXmlParser;
+import org.apache.cordova.LOG;
+import org.apache.cordova.AllowList;
+import org.xmlpull.v1.XmlPullParser;
+
+import android.content.Context;
+
+public class AllowListPlugin extends CordovaPlugin {
+    public static final String PLUGIN_NAME = "CordovaAllowList";
+    protected static final String LOG_TAG = "CordovaAllowList";
+    private AllowList allowedNavigations;
+    private AllowList allowedIntents;
+    private AllowList allowedRequests;
+
+    // Used when instantiated via reflection by PluginManager
+    public AllowListPlugin() { }
+
+    // These can be used by embedders to allow Java-configuration of an allow list.
+    public AllowListPlugin(Context context) {
+        this(new AllowList(), new AllowList(), null);
+        new CustomConfigXmlParser().parse(context);
+    }
+
+    public AllowListPlugin(XmlPullParser xmlParser) {
+        this(new AllowList(), new AllowList(), null);
+        new CustomConfigXmlParser().parse(xmlParser);
+    }
+
+    public AllowListPlugin(AllowList allowedNavigations, AllowList allowedIntents, AllowList allowedRequests) {
+        if (allowedRequests == null) {
+            allowedRequests = new AllowList();
+            allowedRequests.addAllowListEntry("file:///*", false);
+            allowedRequests.addAllowListEntry("data:*", false);
+        }
+        this.allowedNavigations = allowedNavigations;
+        this.allowedIntents = allowedIntents;
+        this.allowedRequests = allowedRequests;
+    }
+
+    @Override
+    public void pluginInitialize() {
+        if (allowedNavigations == null) {
+            allowedNavigations = new AllowList();
+            allowedIntents = new AllowList();
+            allowedRequests = new AllowList();
+            new CustomConfigXmlParser().parse(webView.getContext());
+        }
+    }
+
+    private class CustomConfigXmlParser extends ConfigXmlParser {
+        @Override
+        public void handleStartTag(XmlPullParser xml) {
+            String strNode = xml.getName();
+            if (strNode.equals("content")) {
+                String startPage = xml.getAttributeValue(null, "src");
+                allowedNavigations.addAllowListEntry(startPage, false);
+            } else if (strNode.equals("allow-navigation")) {
+                String origin = xml.getAttributeValue(null, "href");
+                if ("*".equals(origin)) {
+                    allowedNavigations.addAllowListEntry("http://*/*", false);
+                    allowedNavigations.addAllowListEntry("https://*/*", false);
+                    allowedNavigations.addAllowListEntry("data:*", false);
+                } else {
+                    allowedNavigations.addAllowListEntry(origin, false);
+                }
+            } else if (strNode.equals("allow-intent")) {
+                String origin = xml.getAttributeValue(null, "href");
+                allowedIntents.addAllowListEntry(origin, false);
+            } else if (strNode.equals("access")) {
+                String origin = xml.getAttributeValue(null, "origin");
+                String subdomains = xml.getAttributeValue(null, "subdomains");
+                boolean external = (xml.getAttributeValue(null, "launch-external") != null);
+                if (origin != null) {
+                    if (external) {
+                        LOG.w(LOG_TAG, "Found <access launch-external> within config.xml. Please use <allow-intent> instead.");
+                        allowedIntents.addAllowListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
+                    } else {
+                        if ("*".equals(origin)) {
+                            allowedRequests.addAllowListEntry("http://*/*", false);
+                            allowedRequests.addAllowListEntry("https://*/*", false);
+                        } else {
+                            allowedRequests.addAllowListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
+                        }
+                    }
+                }
+            }
+        }
+        @Override
+        public void handleEndTag(XmlPullParser xml) {
+        }
+    }
+
+    @Override
+    public Boolean shouldAllowNavigation(String url) {
+        if (allowedNavigations.isUrlAllowListed(url)) {
+            return true;
+        }
+        return null; // Default policy
+    }
+
+    @Override
+    public Boolean shouldAllowRequest(String url) {
+        if (Boolean.TRUE == shouldAllowNavigation(url)) {
+            return true;
+        }
+        if (allowedRequests.isUrlAllowListed(url)) {
+            return true;
+        }
+        return null; // Default policy
+    }
+
+    @Override
+    public Boolean shouldOpenExternalUrl(String url) {
+        if (allowedIntents.isUrlAllowListed(url)) {
+            return true;
+        }
+        return null; // Default policy
+    }
+
+    public AllowList getAllowedNavigations() {
+        return allowedNavigations;
+    }
+
+    public void setAllowedNavigations(AllowList allowedNavigations) {
+        this.allowedNavigations = allowedNavigations;
+    }
+
+    public AllowList getAllowedIntents() {
+        return allowedIntents;
+    }
+
+    public void setAllowedIntents(AllowList allowedIntents) {
+        this.allowedIntents = allowedIntents;
+    }
+
+    public AllowList getAllowedRequests() {
+        return allowedRequests;
+    }
+
+    public void setAllowedRequests(AllowList allowedRequests) {
+        this.allowedRequests = allowedRequests;
+    }
+}
diff --git a/framework/src/org/apache/cordova/ConfigXmlParser.java b/framework/src/org/apache/cordova/ConfigXmlParser.java
index 01a97f2d0b..d13e48bcf1 100644
--- a/framework/src/org/apache/cordova/ConfigXmlParser.java
+++ b/framework/src/org/apache/cordova/ConfigXmlParser.java
@@ -60,6 +60,15 @@ public void parse(Context action) {
                 return;
             }
         }
+
+        pluginEntries.add(
+            new PluginEntry(
+                "CDVAllowListPlugin",
+                "org.apache.cordova.AllowListPlugin",
+                true
+            )
+        );
+
         parse(action.getResources().getXml(id));
     }
 

From 52f00b0fa0a8e9566aa6a927735becfe33e95af0 Mon Sep 17 00:00:00 2001
From: Erisu <ellis.bryan@gmail.com>
Date: Tue, 1 Dec 2020 16:56:01 +0900
Subject: [PATCH 3/4] refactor(allow-list): cleanup

---
 .../src/org/apache/cordova/AllowList.java     |  2 +-
 .../org/apache/cordova/AllowListPlugin.java   | 49 +++++++++----------
 .../org/apache/cordova/ConfigXmlParser.java   |  2 +-
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/framework/src/org/apache/cordova/AllowList.java b/framework/src/org/apache/cordova/AllowList.java
index b63171db96..4b4bafcce9 100644
--- a/framework/src/org/apache/cordova/AllowList.java
+++ b/framework/src/org/apache/cordova/AllowList.java
@@ -94,7 +94,7 @@ public boolean matches(Uri uri) {
 
     private ArrayList<URLPattern> allowList;
 
-    public static final String TAG = "AllowList";
+    public static final String TAG = "CordovaAllowList";
 
     public AllowList() {
         this.allowList = new ArrayList<URLPattern>();
diff --git a/framework/src/org/apache/cordova/AllowListPlugin.java b/framework/src/org/apache/cordova/AllowListPlugin.java
index feb6e121b4..7bf320c614 100644
--- a/framework/src/org/apache/cordova/AllowListPlugin.java
+++ b/framework/src/org/apache/cordova/AllowListPlugin.java
@@ -28,8 +28,9 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.content.Context;
 
 public class AllowListPlugin extends CordovaPlugin {
-    public static final String PLUGIN_NAME = "CordovaAllowList";
-    protected static final String LOG_TAG = "CordovaAllowList";
+    public static final String PLUGIN_NAME = "CordovaAllowListPlugin";
+    protected static final String LOG_TAG = "CordovaAllowListPlugin";
+
     private AllowList allowedNavigations;
     private AllowList allowedIntents;
     private AllowList allowedRequests;
@@ -54,6 +55,7 @@ public AllowListPlugin(AllowList allowedNavigations, AllowList allowedIntents, A
             allowedRequests.addAllowListEntry("file:///*", false);
             allowedRequests.addAllowListEntry("data:*", false);
         }
+
         this.allowedNavigations = allowedNavigations;
         this.allowedIntents = allowedIntents;
         this.allowedRequests = allowedRequests;
@@ -61,10 +63,11 @@ public AllowListPlugin(AllowList allowedNavigations, AllowList allowedIntents, A
 
     @Override
     public void pluginInitialize() {
-        if (allowedNavigations == null) {
-            allowedNavigations = new AllowList();
-            allowedIntents = new AllowList();
-            allowedRequests = new AllowList();
+        if (this.allowedNavigations == null) {
+            this.allowedNavigations = new AllowList();
+            this.allowedIntents = new AllowList();
+            this.allowedRequests = new AllowList();
+
             new CustomConfigXmlParser().parse(webView.getContext());
         }
     }
@@ -107,40 +110,34 @@ public void handleStartTag(XmlPullParser xml) {
                 }
             }
         }
+
         @Override
-        public void handleEndTag(XmlPullParser xml) {
-        }
+        public void handleEndTag(XmlPullParser xml) { }
     }
 
     @Override
     public Boolean shouldAllowNavigation(String url) {
-        if (allowedNavigations.isUrlAllowListed(url)) {
-            return true;
-        }
-        return null; // Default policy
+        return this.allowedNavigations.isUrlAllowListed(url)
+            ? true
+            : null; // default policy
     }
 
     @Override
     public Boolean shouldAllowRequest(String url) {
-        if (Boolean.TRUE == shouldAllowNavigation(url)) {
-            return true;
-        }
-        if (allowedRequests.isUrlAllowListed(url)) {
-            return true;
-        }
-        return null; // Default policy
+        return (this.shouldAllowNavigation(url) || this.allowedRequests.isUrlAllowListed(url))
+            ? true
+            : null; // default policy
     }
 
     @Override
     public Boolean shouldOpenExternalUrl(String url) {
-        if (allowedIntents.isUrlAllowListed(url)) {
-            return true;
-        }
-        return null; // Default policy
+        return (this.allowedIntents.isUrlAllowListed(url))
+            ? true
+            : null; // default policy
     }
 
     public AllowList getAllowedNavigations() {
-        return allowedNavigations;
+        return this.allowedNavigations;
     }
 
     public void setAllowedNavigations(AllowList allowedNavigations) {
@@ -148,7 +145,7 @@ public void setAllowedNavigations(AllowList allowedNavigations) {
     }
 
     public AllowList getAllowedIntents() {
-        return allowedIntents;
+        return this.allowedIntents;
     }
 
     public void setAllowedIntents(AllowList allowedIntents) {
@@ -156,7 +153,7 @@ public void setAllowedIntents(AllowList allowedIntents) {
     }
 
     public AllowList getAllowedRequests() {
-        return allowedRequests;
+        return this.allowedRequests;
     }
 
     public void setAllowedRequests(AllowList allowedRequests) {
diff --git a/framework/src/org/apache/cordova/ConfigXmlParser.java b/framework/src/org/apache/cordova/ConfigXmlParser.java
index d13e48bcf1..f9e828df15 100644
--- a/framework/src/org/apache/cordova/ConfigXmlParser.java
+++ b/framework/src/org/apache/cordova/ConfigXmlParser.java
@@ -63,7 +63,7 @@ public void parse(Context action) {
 
         pluginEntries.add(
             new PluginEntry(
-                "CDVAllowListPlugin",
+                AllowListPlugin.PLUGIN_NAME,
                 "org.apache.cordova.AllowListPlugin",
                 true
             )

From 4fc48ff5093d0d8b5defc9fa9f58a72dc192d582 Mon Sep 17 00:00:00 2001
From: Erisu <ellis.bryan@gmail.com>
Date: Wed, 2 Dec 2020 15:48:07 +0900
Subject: [PATCH 4/4] refactor: drop deprecated launch-external case for
 CustomConfigParser::handleStartTag

---
 .../src/org/apache/cordova/AllowListPlugin.java | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/framework/src/org/apache/cordova/AllowListPlugin.java b/framework/src/org/apache/cordova/AllowListPlugin.java
index 7bf320c614..7b2e7873b7 100644
--- a/framework/src/org/apache/cordova/AllowListPlugin.java
+++ b/framework/src/org/apache/cordova/AllowListPlugin.java
@@ -93,19 +93,14 @@ public void handleStartTag(XmlPullParser xml) {
                 allowedIntents.addAllowListEntry(origin, false);
             } else if (strNode.equals("access")) {
                 String origin = xml.getAttributeValue(null, "origin");
-                String subdomains = xml.getAttributeValue(null, "subdomains");
-                boolean external = (xml.getAttributeValue(null, "launch-external") != null);
+
                 if (origin != null) {
-                    if (external) {
-                        LOG.w(LOG_TAG, "Found <access launch-external> within config.xml. Please use <allow-intent> instead.");
-                        allowedIntents.addAllowListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
+                    if ("*".equals(origin)) {
+                        allowedRequests.addAllowListEntry("http://*/*", false);
+                        allowedRequests.addAllowListEntry("https://*/*", false);
                     } else {
-                        if ("*".equals(origin)) {
-                            allowedRequests.addAllowListEntry("http://*/*", false);
-                            allowedRequests.addAllowListEntry("https://*/*", false);
-                        } else {
-                            allowedRequests.addAllowListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
-                        }
+                        String subdomains = xml.getAttributeValue(null, "subdomains");
+                        allowedRequests.addAllowListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
                     }
                 }
             }
