Changeset 15163 in josm

Timestamp:

2019-06-07T11:56:58+02:00 (5 years ago)

Author:

Don-vip

Message:

fix URL parsing errors

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (2 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -10 +10 @@
 import java.io.OutputStreamWriter;
 import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -1081 +1083 @@
             if (isNotBlank(jt) && !jt.startsWith("data:image/png;base64,"))
                 urls.add(jt);
-            Pattern patternU = Pattern.compile("^https?://([^/]+?)(:\\d+)?/.*");
+            Pattern patternU = Pattern.compile("^https?://([^/]+?)(:\\d+)?(/.*)?");
             for (String u : urls) {
-                Matcher m = patternU.matcher(u);
-                if (!m.matches() || u.matches(".*[ \t]+$")) {
+                if (!patternU.matcher(u).matches() || u.matches(".*[ \t]+$")) {
                     myprintln("* Strange URL '"+u+"': "+getDescription(j));
                 } else {
-                    String domain = m.group(1).replaceAll("\\{switch:.*\\}", "x");
-                    String port = m.group(2);
-                    if (!(domain.matches("^\\d+\\.\\d+\\.\\d+\\.\\d+$")) && !dv.isValid(domain))
-                        myprintln("* Strange Domain '"+domain+"': "+getDescription(j));
-                    else if (":80".equals(port) || ":443".equals(port)) {
-                        myprintln("* Useless port '"+port+"': "+getDescription(j));
+                    try {
+                        URL jurl = new URL(u.replaceAll("\\{switch:[^\\}]*\\}", "x"));
+                        String domain = jurl.getHost();
+                        int port = jurl.getPort();
+                        if (!(domain.matches("^\\d+\\.\\d+\\.\\d+\\.\\d+$")) && !dv.isValid(domain))
+                            myprintln("* Strange Domain '"+domain+"': "+getDescription(j));
+                        else if (80 == port || 443 == port) {
+                            myprintln("* Useless port '"+port+"': "+getDescription(j));
+                        }
+                    } catch (MalformedURLException e) {
+                        myprintln("* Malformed URL '"+u+"': "+getDescription(j)+" => "+e.getMessage());
                     }
                 }