Convert host names to lower case

h2database · Jan 16, 2022 · 0f83f48 · 0f83f48
1 parent c5f11a5
commit 0f83f48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/h2/src/main/org/h2/server/web/WebServer.java b/h2/src/main/org/h2/server/web/WebServer.java
@@ -321,7 +321,7 @@ public void init(String... args) {
                 "webSSL", false);
         allowOthers = SortedProperties.getBooleanProperty(prop,
                 "webAllowOthers", false);
-        externalNames = SortedProperties.getStringProperty(prop, "webExternalNames", null);
+        setExternalNames(SortedProperties.getStringProperty(prop, "webExternalNames", null));
         setAdminPassword(SortedProperties.getStringProperty(prop, "webAdminPassword", null));
         commandHistoryString = prop.getProperty(COMMAND_HISTORY);
         for (int i = 0; args != null && i < args.length; i++) {
@@ -333,7 +333,7 @@ public void init(String... args) {
             } else if (Tool.isOption(a, "-webAllowOthers")) {
                 allowOthers = true;
             }  else if (Tool.isOption(a, "-webExternalNames")) {
-                externalNames = args[++i];
+                setExternalNames(args[++i]);
             } else if (Tool.isOption(a, "-webDaemon")) {
                 isDaemon = true;
             } else if (Tool.isOption(a, "-baseDir")) {
@@ -392,7 +392,7 @@ public String getHost() {
 
     private void updateURL() {
         try {
-            host = NetUtils.getLocalAddress();
+            host = StringUtils.toLowerEnglish(NetUtils.getLocalAddress());
             StringBuilder builder = new StringBuilder(ssl ? "https" : "http").append("://")
                     .append(host).append(':').append(port);
             if (key != null && serverSocket != null) {
@@ -568,7 +568,7 @@ public boolean getAllowOthers() {
     }
 
     void setExternalNames(String externalNames) {
-        this.externalNames = externalNames;
+        this.externalNames = externalNames != null ? StringUtils.toLowerEnglish(externalNames) : null;
     }
 
     String getExternalNames() {

diff --git a/h2/src/main/org/h2/server/web/WebThread.java b/h2/src/main/org/h2/server/web/WebThread.java
@@ -256,6 +256,7 @@ private boolean checkHost(String host) throws IOException {
         if (host.isEmpty()) {
             return false;
         }
+        host = StringUtils.toLowerEnglish(host);
         if (host.equals(server.getHost()) || host.equals("localhost") || host.equals("127.0.0.1")) {
             return true;
         }