Changeset 15543 in josm for trunk

Timestamp:

2019-11-30T13:44:40+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18362 - safer construction of URIs

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• OpenBrowser.java (modified) (2 diffs)
• PlatformHookUnixoid.java (modified) (2 diffs)
• PlatformHookWindows.java (modified) (2 diffs)
• Utils.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import java.awt.Desktop;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -63 +64 @@
     public static String displayUrl(String url) {
         try {
-            return displayUrl(new URI(url));
-        } catch (URISyntaxException e) {
+            return displayUrl(Utils.urlToURI(url));
+        } catch (URISyntaxException | MalformedURLException e) {
             Logging.debug(e);
             return e.getMessage();

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

@@ -12 +12 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
@@ -69 +68 @@
             try {
                 if ("#DESKTOP#".equals(program)) {
-                    Desktop.getDesktop().browse(new URI(url));
+                    Desktop.getDesktop().browse(Utils.urlToURI(url));
                 } else if (program.startsWith("$")) {
                     program = System.getenv().get(program.substring(1));

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

@@ -40 +40 @@
 import java.io.Writer;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
@@ -169 +168 @@
         try {
             // Desktop API works fine under Windows
-            Desktop.getDesktop().browse(new URI(url));
+            Desktop.getDesktop().browse(Utils.urlToURI(url));
         } catch (IOException | URISyntaxException e) {
             Logging.log(Logging.LEVEL_WARN, "Desktop class failed. Platform dependent fall back for open url in browser.", e);

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

@@ -18 +18 @@
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
@@ -542 +544 @@
     }
 
+    /**
+     * Converts the given URL to its URI.
+     * @param url the URL to get URI from
+     * @return the URI of given URL
+     * @throws URISyntaxException if the URL cannot be converted to an URI
+     * @throws MalformedURLException if no protocol is specified, or an unknown protocol is found, or {@code spec} is {@code null}.
+     * @since 15543
+     */
+    public static URI urlToURI(String url) throws URISyntaxException, MalformedURLException {
+        return urlToURI(new URL(url));
+    }
+
+    /**
+     * Converts the given URL to its URI.
+     * @param url the URL to get URI from
+     * @return the URI of given URL
+     * @throws URISyntaxException if the URL cannot be converted to an URI
+     * @since 15543
+     */
+    public static URI urlToURI(URL url) throws URISyntaxException {
+        try {
+            return url.toURI();
+        } catch (URISyntaxException e) {
+            Logging.trace(e);
+            return new URI(
+                    url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), url.getRef());
+        }
+    }
+
     private static final double EPSILON = 1e-11;