From 4916e1db5108291f837a7174563c4d85be8ba5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=B9?= Date: Mon, 20 Jun 2022 23:25:57 +0900 Subject: [PATCH] fix: force hostname to lowercase (#1443) --- framework/src/org/apache/cordova/ConfigXmlParser.java | 2 +- framework/src/org/apache/cordova/PluginManager.java | 2 +- .../src/org/apache/cordova/engine/SystemWebViewClient.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/org/apache/cordova/ConfigXmlParser.java b/framework/src/org/apache/cordova/ConfigXmlParser.java index e93651731c..69d02ee680 100644 --- a/framework/src/org/apache/cordova/ConfigXmlParser.java +++ b/framework/src/org/apache/cordova/ConfigXmlParser.java @@ -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. " + diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java index 472bd2b50a..050299376c 100755 --- a/framework/src/org/apache/cordova/PluginManager.java +++ b/framework/src/org/apache/cordova/PluginManager.java @@ -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 + '/'; } diff --git a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java index 2fea4feb16..0540041774 100755 --- a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java +++ b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java @@ -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 -> {