Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(PluginManager): AllowBridgeAccess default policy to handle scheme & hostname #1332

Merged
merged 3 commits into from
Sep 7, 2021
Merged

fix(PluginManager): AllowBridgeAccess default policy to handle scheme & hostname #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa3ab7d
fix(PluginManager): AllowBridgeAccess to handle scheme & hostname
erisu Aug 26, 2021
fa5b228
fix(AllowListPlugin): add scheme & hostname as allowed navigation
erisu Aug 31, 2021
ac36705
chore(AllowListPlugin): remove scheme+hostname allow navigation. use …
erisu Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions framework/src/org/apache/cordova/AllowListPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ public void handleStartTag(XmlPullParser xml) {
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)) {
Expand Down
26 changes: 25 additions & 1 deletion framework/src/org/apache/cordova/PluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ Licensed to the Apache Software Foundation (ASF) under one
*/
public class PluginManager {
private static String TAG = "PluginManager";

// @todo same as ConfigXmlParser. Research centralizing ideas, maybe create CordovaConstants
private static String SCHEME_HTTPS = "https";
// @todo same as ConfigXmlParser. Research centralizing ideas, maybe create CordovaConstants
private static String DEFAULT_HOSTNAME = "localhost";

private static final int SLOW_EXEC_WARNING_THRESHOLD = Debug.isDebuggerConnected() ? 60 : 16;

// List of service entries
Expand Down Expand Up @@ -366,6 +372,24 @@ public void onNewIntent(Intent intent) {
}
}

/**
* @todo should we move this somewhere public and accessible by all plugins?
* For now, it is placed where it is used and kept private so we can decide later and move without causing a breaking change.
* An ideal location might be in the "ConfigXmlParser" at the time it generates the "launchUrl".
*
* @todo should we be restrictive on the "file://" return? e.g. "file:///android_asset/www/"
* Would be considered as a breaking change if we apply a more granular check.
*/
private String getLaunchUrlPrefix() {
if (!app.getPreferences().getBoolean("AndroidInsecureFileModeEnabled", false)) {
String scheme = app.getPreferences().getString("scheme", SCHEME_HTTPS).toLowerCase();
String hostname = app.getPreferences().getString("hostname", DEFAULT_HOSTNAME);
return scheme + "://" + hostname + '/';
}

return "file://";
}

/**
* Called when the webview is going to request an external resource.
*
Expand Down Expand Up @@ -452,7 +476,7 @@ public boolean shouldAllowBridgeAccess(String url) {
}

// Default policy:
return url.startsWith("file://");
return url.startsWith(getLaunchUrlPrefix());
}

/**
Expand Down