Changeset 14496 in josm for trunk/src

Timestamp:

2018-12-02T18:35:04+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17060, see #16073 - Support Internationalized domain names (IDN)

This allows JOSM to accesss https://öpnvkarte.de

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/routines/DomainValidator.java (modified) (1 diff)
• tools/HttpClient.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -2011 +2011 @@
      */
     // Needed by UrlValidator
-    static String unicodeToASCII(String input) {
+    public static String unicodeToASCII(String input) {
         if (isOnlyASCII(input)) { // skip possibly expensive processing
             return input;

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -13 +13 @@
 import java.net.CookieManager;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -30 +31 @@
 
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.validation.routines.DomainValidator;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -78 +80 @@
 
     private HttpClient(URL url, String requestMethod) {
-        this.url = url;
+        try {
+            String host = url.getHost();
+            String asciiHost = DomainValidator.unicodeToASCII(host);
+            this.url = asciiHost.equals(host) ? url : new URL(url.getProtocol(), asciiHost, url.getPort(), url.getFile());
+        } catch (MalformedURLException e) {
+            throw new JosmRuntimeException(e);
+        }
         this.requestMethod = requestMethod;
         this.headers.put("Accept-Encoding", "gzip");