Changeset 6474 in josm for trunk

Timestamp:

2013-12-16T00:22:44+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9434 - Robustness in hash URLs parsing

Location:

trunk

Files:

• .settings/org.eclipse.jdt.ui.prefs (modified) (3 diffs)
• src/org/openstreetmap/josm/Main.java (modified) (12 diffs)
• src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) (3 diffs)

trunk/.settings/org.eclipse.jdt.ui.prefs

@@ -1 @@
-#Wed Jan 27 11:53:40 EST 2010
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -14 +13 @@
 sp_cleanup.add_missing_nls_tags=false
 sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
 sp_cleanup.add_serial_version_id=false
 sp_cleanup.always_use_blocks=false
@@ -51 +51 @@
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks=false
 sp_cleanup.use_blocks_only_for_return_and_throw=true
 sp_cleanup.use_parentheses_in_expressions=false

trunk/src/org/openstreetmap/josm/Main.java

@@ -212 +212 @@
      */
     public static int logLevel = 3;
-    
+
     /**
      * Prints an error message if logging is on.
@@ -223 +223 @@
         System.err.println(tr("ERROR: {0}", msg));
     }
-    
+
     /**
      * Prints a warning message if logging is on.
@@ -233 +233 @@
         System.err.println(tr("WARNING: {0}", msg));
     }
-    
+
     /**
      * Prints an informational message if logging is on.
@@ -243 +243 @@
         System.out.println(tr("INFO: {0}", msg));
     }
-    
+
     /**
      * Prints a debug message if logging is on.
@@ -253 +253 @@
         System.out.println(tr("DEBUG: {0}", msg));
     }
-    
+
     /**
      * Prints a formated error message if logging is on. Calls {@link MessageFormat#format}
@@ -264 +264 @@
         error(MessageFormat.format(msg, objects));
     }
-    
+
     /**
      * Prints a formated warning message if logging is on. Calls {@link MessageFormat#format}
@@ -274 +274 @@
         warn(MessageFormat.format(msg, objects));
     }
-    
+
     /**
      * Prints a formated informational message if logging is on. Calls {@link MessageFormat#format}
@@ -284 +284 @@
         info(MessageFormat.format(msg, objects));
     }
-    
+
     /**
      * Prints a formated debug message if logging is on. Calls {@link MessageFormat#format}
@@ -294 +294 @@
         debug(MessageFormat.format(msg, objects));
     }
-    
+
     /**
      * Prints an error message for the given Throwable.
@@ -303 +303 @@
         error(getErrorMessage(t));
     }
-    
+
     /**
      * Prints a warning message for the given Throwable.
@@ -312 +312 @@
         warn(getErrorMessage(t));
     }
-    
+
     private static String getErrorMessage(Throwable t) {
         StringBuilder sb = new StringBuilder(t.getClass().getName());
@@ -318 +318 @@
         if (msg != null) {
             sb.append(": ").append(msg.trim());
+        }
+        Throwable cause = t.getCause();
+        if (cause != null && !cause.equals(t)) {
+            sb.append(". ").append(tr("Cause: ")).append(getErrorMessage(cause));
         }
         return sb.toString();

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -183 +183 @@
         if (!tasks.isEmpty()) {
             // TODO: handle multiple suitable tasks ?
-            future = tasks.iterator().next().loadUrl(new_layer, url, monitor);
+            try {
+                future = tasks.iterator().next().loadUrl(new_layer, url, monitor);
+            } catch (IllegalArgumentException e) {
+                Main.error(e);
+            }
         }
         if (future != null) {

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
@@ -34 +35 @@
      */
     public BoundingBoxDownloader(Bounds downloadArea) {
+        CheckParameterUtil.ensureParameterNotNull(downloadArea, "downloadArea");
         this.lat1 = downloadArea.getMinLat();
         this.lon1 = downloadArea.getMinLon();

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.HeadlessException;
@@ -15 +17 @@
 public final class OsmUrlToBounds {
     private static final String SHORTLINK_PREFIX = "http://osm.org/go/";
-    
+
     private OsmUrlToBounds() {
         // Hide default constructor for utils classes
     }
 
-    public static Bounds parse(String url) {
+    public static Bounds parse(String url) throws IllegalArgumentException {
         try {
             // a percent sign indicates an encoded URL (RFC 1738).
@@ -86 +88 @@
      * @param url string for parsing
      * @return Bounds if hashurl, {@code null} otherwise
-     */
-    private static Bounds parseHashURLs(String url) {
+     * @throws IllegalArgumentException if URL is invalid
+     */
+    private static Bounds parseHashURLs(String url) throws IllegalArgumentException {
         int startIndex = url.indexOf("#map=");
         if (startIndex == -1) return null;
         int endIndex = url.indexOf('&', startIndex);
         if (endIndex == -1) endIndex = url.length();
-        try {
-            String coordPart = url.substring(startIndex+5, endIndex);
-            String[] parts = coordPart.split("/");
-            Bounds b = positionToBounds(Double.parseDouble(parts[1]),
-                    Double.parseDouble(parts[2]),
-                    Integer.parseInt(parts[0]));
-            return b;
-        } catch (Exception ex) {
-            Main.debug(ex.getMessage());
-            return null;
-        }
+        String coordPart = url.substring(startIndex+5, endIndex);
+        String[] parts = coordPart.split("/");
+        if (parts.length < 3) {
+            throw new IllegalArgumentException(tr("URL does not contain {0}/{1}/{2}", tr("zoom"), tr("latitude"), tr("longitude")));
+        }
+        int zoom;
+        double lat, lon;
+        try {
+            zoom = Integer.parseInt(parts[0]);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException(tr("URL does not contain valid {0}", tr("zoom")), e);
+        }
+        try {
+            lat = Double.parseDouble(parts[1]);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException(tr("URL does not contain valid {0}", tr("latitude")), e);
+        }
+        try {
+            lon = Double.parseDouble(parts[2]);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException(tr("URL does not contain valid {0}", tr("longitude")), e);
+        }
+        return positionToBounds(lat, lon, zoom);
     }