SITES-21342 - "abs_path requested" error is getting logged for link s…

…tarting with " mailto: " in Call-To-actions dialog field in teaser component (#2737) * fixed error and updated unit test --------- Co-authored-by: Egor_Cheptsov <egor.cheptsov@digitalum.eu>
adobe · Apr 26, 2024 · cba4a1b · cba4a1b
1 parent 71f8a55
commit cba4a1b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/link/LinkUtil.java b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/link/LinkUtil.java
@@ -61,6 +61,7 @@ public class LinkUtil {
             .collect(Collectors.toList()));
     }
 
+    private static final String MAIL_TO_PATTERN = "mailto";
     //SITES-18137: imitate the exact behavior of com.google.common.net.URL_FRAGMENT_ESCAPER
     private static final BitSet URL_FRAGMENT_SAFE_CHARS = new BitSet(256);
 
@@ -127,7 +128,7 @@ public static String escape(final String path, final String queryString, final S
             LOG.error(e.getMessage(), e);
         }
         try {
-            if (parsed != null) {
+            if (parsed != null && !isMailToLink(parsed.getScheme())) {
                 escaped = new URI(parsed.getScheme(), parsed.getAuthority(), parsed.getPath(), maskedQueryString, null).toString();
             } else {
                 escaped = new URI(null, null, path, maskedQueryString, null).toString();
@@ -267,4 +268,12 @@ private static String replaceEncodedCharactersInFragment(final String str) {
             .replace("%2F", "/")
             .replace("%3F", "?");
     }
+
+    private static boolean isMailToLink(String link) {
+        if (link != null) {
+            return link.startsWith(MAIL_TO_PATTERN);
+        } else {
+            return false;
+        }
+    }
 }
diff --git a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/LinkUtilTest.java b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/link/LinkUtilTest.java
@@ -63,4 +63,11 @@ void escape_whenEscapingPathWithFragment_thenFragmentForwardSlashIsNotEncoded()
         String escapedPAth = LinkUtil.escape(path, null, fragment);
         assertEquals(path+ "#" + fragment, escapedPAth);
     }
+
+    @Test
+    void escape_mailToLinkNotThrowException() throws UnsupportedEncodingException {
+        String path = "mailto:mail@example.com";
+        String escapedMailTo = LinkUtil.escape(path, null, null);
+        assertEquals(path, escapedMailTo);
+    }
 }