Changeset 18896 in josm

Timestamp:

2023-11-10T13:44:25+01:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #23235: Revert r18869

The URI specification only allows for ascii characters.
See ​https://datatracker.ietf.org/doc/html/rfc3986#section-1.2.1.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (modified) (1 diff)

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

@@ -165 +165 @@
 
     private static final String PATH_REGEX = "^(/[-\\w:@&?=+,.!/~*'%$_;()]*)?$";
-    private static final Pattern PATH_PATTERN = Pattern.compile(PATH_REGEX, Pattern.UNICODE_CHARACTER_CLASS);
+    private static final Pattern PATH_PATTERN = Pattern.compile(PATH_REGEX);
 
     private static final String QUERY_REGEX = "^(.*)$";

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java

@@ -566 +566 @@
             new ResultPair("/..//file", false),
             new ResultPair("/test1//file", false),
-            new ResultPair("/projekte-und-themen/eulen-falken-und-deren-nistkästen/trafotürme", true)
+            // non-ascii characters are invalid for URIs. See https://datatracker.ietf.org/doc/html/rfc3986#section-1.2.1
+            new ResultPair("/projekte-und-themen/eulen-falken-und-deren-nistkästen/trafotürme", false)
     };