Skip to content

Commit

Permalink
fix: force hostname to lowercase (#1443)
Browse files Browse the repository at this point in the history
  • Loading branch information
erisu committed Jun 20, 2022
1 parent 68a9a31 commit 4916e1d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion framework/src/org/apache/cordova/ConfigXmlParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private String getLaunchUrlPrefix() {
return "file:///android_asset/www/";
} else {
String scheme = prefs.getString("scheme", SCHEME_HTTPS).toLowerCase();
String hostname = prefs.getString("hostname", DEFAULT_HOSTNAME);
String hostname = prefs.getString("hostname", DEFAULT_HOSTNAME).toLowerCase();

if (!scheme.contentEquals(SCHEME_HTTP) && !scheme.contentEquals(SCHEME_HTTPS)) {
LOG.d(TAG, "The provided scheme \"" + scheme + "\" is not valid. " +
Expand Down
2 changes: 1 addition & 1 deletion framework/src/org/apache/cordova/PluginManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ public void onNewIntent(Intent intent) {
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);
String hostname = app.getPreferences().getString("hostname", DEFAULT_HOSTNAME).toLowerCase();
return scheme + "://" + hostname + '/';
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public SystemWebViewClient(SystemWebViewEngine parentEngine) {
this.parentEngine = parentEngine;

WebViewAssetLoader.Builder assetLoaderBuilder = new WebViewAssetLoader.Builder()
.setDomain(parentEngine.preferences.getString("hostname", "localhost"))
.setDomain(parentEngine.preferences.getString("hostname", "localhost").toLowerCase())
.setHttpAllowed(true);

assetLoaderBuilder.addPathHandler("/", path -> {
Expand Down

0 comments on commit 4916e1d

Please sign in to comment.