This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch blogroll-link-urls
in repository https://gitbox.apache.org/repos/asf/roller.git

commit e4b534184d10bcd41631378026dfe8bbd964a54b
Author: David M. Johnson <[email protected]>
AuthorDate: Tue Oct 27 16:47:23 2026 -0400

    Keep blogroll links to web and relative URLs
    
    OPML import keeps only absolute http and https links. Templates get 
bookmark URLs through the wrapper only when they are relative or use http, 
https, ftp or mailto, so links stored earlier are covered too. The blogroll 
macro escapes the URLs it prints in attributes.
---
 .../business/jpa/JPABookmarkManagerImpl.java       | 26 ++++++++++++
 .../pojos/wrapper/WeblogBookmarkWrapper.java       | 31 ++++++++++++--
 app/src/main/webapp/WEB-INF/velocity/weblog.vm     | 12 +++---
 .../business/BookmarkImportParsingTest.java        | 28 +++++++++++++
 .../pojos/wrapper/WeblogBookmarkWrapperTest.java   | 48 ++++++++++++++++++++++
 5 files changed, 136 insertions(+), 9 deletions(-)

diff --git 
a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
 
b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
index f1fa7478e..dfff07428 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
@@ -19,6 +19,8 @@
 package org.apache.roller.weblogger.business.jpa;
 
 import java.io.StringReader;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
 import jakarta.persistence.NoResultException;
 import jakarta.persistence.TypedQuery;
@@ -228,6 +230,10 @@ public class JPABookmarkManagerImpl implements 
BookmarkManager {
         desc =    null!=desc ? desc : title;
         xmlUrl =  null!=xmlUrl ? xmlUrl : url;
         url =     null!=htmlUrl ? htmlUrl : url;
+
+        // keep only web links; an outline with anything else gets no url
+        xmlUrl = webLinkOrNull(xmlUrl);
+        url = webLinkOrNull(url);
         
         // better to truncate imported OPML fields than to fail import or drop 
whole bookmark
         int maxLength = RollerConstants.TEXTWIDTH_255;
@@ -270,6 +276,26 @@ public class JPABookmarkManagerImpl implements 
BookmarkManager {
         }
     }
 
+    /**
+     * Returns the value if it is an absolute http or https URL, else null.
+     */
+    static String webLinkOrNull(String value) {
+        if (value == null) {
+            return null;
+        }
+        try {
+            URI uri = new URI(value.trim());
+            String scheme = uri.getScheme();
+            if (scheme != null && uri.getHost() != null
+                    && ("http".equalsIgnoreCase(scheme) || 
"https".equalsIgnoreCase(scheme))) {
+                return uri.toString();
+            }
+        } catch (URISyntaxException e) {
+            log.debug("Skipping OPML URL that is not valid: " + value);
+        }
+        return null;
+    }
+
     /**
      * @see org.apache.roller.weblogger.business.BookmarkManager#getBookmarks(
      *      org.apache.roller.weblogger.pojos.WeblogBookmarkFolder)
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
 
b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
index 66a6cccda..db9405683 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
@@ -18,6 +18,11 @@
 
 package org.apache.roller.weblogger.pojos.wrapper;
 
+import java.util.Locale;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 
 
@@ -25,6 +30,9 @@ import org.apache.roller.weblogger.pojos.WeblogBookmark;
  * Pojo safety wrapper for WeblogBookmark object.
  */
 public final class WeblogBookmarkWrapper {
+
+    private static final Pattern SCHEME = 
Pattern.compile("^([a-zA-Z][a-zA-Z0-9+.-]*):");
+    private static final Set<String> ALLOWED_SCHEMES = Set.of("http", "https", 
"ftp", "mailto");
     
     // keep a reference to the wrapped pojo
     private final WeblogBookmark pojo;
@@ -59,7 +67,7 @@ public final class WeblogBookmarkWrapper {
     
     
     public String getUrl() {
-        return this.pojo.getUrl();
+        return linkOrEmpty(this.pojo.getUrl());
     }
 
     public Integer getPriority() {
@@ -67,12 +75,29 @@ public final class WeblogBookmarkWrapper {
     }
 
     public String getImage() {
-        return this.pojo.getImage();
+        return linkOrEmpty(this.pojo.getImage());
     }
     
     
     public String getFeedUrl() {
-        return this.pojo.getFeedUrl();
+        return linkOrEmpty(this.pojo.getFeedUrl());
+    }
+
+    /**
+     * Returns the link if it is relative or uses a scheme a blogroll link
+     * needs (http, https, ftp, mailto), else an empty string. Browsers ignore 
tabs and
+     * line breaks inside a scheme, so those are removed before the check.
+     */
+    static String linkOrEmpty(String link) {
+        if (link == null) {
+            return null;
+        }
+        String compact = link.replaceAll("[\\t\\n\\r]", "").trim();
+        Matcher m = SCHEME.matcher(compact);
+        if (m.find() && 
!ALLOWED_SCHEMES.contains(m.group(1).toLowerCase(Locale.ROOT))) {
+            return "";
+        }
+        return link;
     }
     
     
diff --git a/app/src/main/webapp/WEB-INF/velocity/weblog.vm 
b/app/src/main/webapp/WEB-INF/velocity/weblog.vm
index b80804dac..198b8e443 100644
--- a/app/src/main/webapp/WEB-INF/velocity/weblog.vm
+++ b/app/src/main/webapp/WEB-INF/velocity/weblog.vm
@@ -479,21 +479,21 @@ Show bookmarks as a HTML ul list.
         <li class="rFolderItem">
         #if($utils.isNotEmpty($bookmark.Image))
           #if( $bookmark.Image.startsWith("http://";) )
-          <a href="$bookmark.url">
+          <a href="$utils.escapeHTML($bookmark.url)">
              <img alt="$bookmark.description" border="0"
-                src="$bookmark.image" class="rBookmark" /></a>
+                src="$utils.escapeHTML($bookmark.image)" class="rBookmark" 
/></a>
           #else
-          <a href="$bookmark.url">
+          <a href="$utils.escapeHTML($bookmark.url)">
              <img alt="$bookmark.description" border="0"
-                src="$bookmark.image" class="rBookmark" /></a>
+                src="$utils.escapeHTML($bookmark.image)" class="rBookmark" 
/></a>
           #end
         #else
             #if($utils.isNotEmpty( $bookmark.FeedUrl))
-            <a href="$bookmark.feedUrl"><img class="smrssbadge"
+            <a href="$utils.escapeHTML($bookmark.feedUrl)"><img 
class="smrssbadge"
                src="$url.absoluteSite/images/smrssbadge.gif"
                alt="$text.get("macro.bookmark.urlFeed")"/></a>
             #end
-            <a href="$bookmark.url" 
title="$bookmark.description">$bookmark.name</a>
+            <a href="$utils.escapeHTML($bookmark.url)" 
title="$bookmark.description">$bookmark.name</a>
         #end
         </li>
     #end
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/business/BookmarkImportParsingTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/business/BookmarkImportParsingTest.java
index ce8e8e29a..e232b1322 100644
--- 
a/app/src/test/java/org/apache/roller/weblogger/business/BookmarkImportParsingTest.java
+++ 
b/app/src/test/java/org/apache/roller/weblogger/business/BookmarkImportParsingTest.java
@@ -32,12 +32,15 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Covers the OPML bookmark import's handling of document type declarations:
  * documents that carry one are refused, while ordinary OPML still imports.
+ * Also checks that imported links are kept only when they are web links.
  */
 public class BookmarkImportParsingTest {
 
@@ -133,4 +136,29 @@ public class BookmarkImportParsingTest {
         assertTrue(importedBookmarks().isEmpty(),
                 "a document carrying a DOCTYPE was still imported");
     }
+
+    /** Only absolute http and https links are imported. */
+    @Test
+    public void importKeepsOnlyWebLinks() throws Exception {
+        String opml = "<?xml version=\"1.0\"?><opml 
version=\"1.1\"><head><title>t</title></head><body>"
+                + "<outline text=\"web\" htmlUrl=\"https://example.com/a\"; 
xmlUrl=\"http://example.com/feed\"/>"
+                + "<outline text=\"ftp\" htmlUrl=\"ftp://example.com/a\"/>"
+                + "<outline text=\"mail\" 
htmlUrl=\"mailto:[email protected]\"/>"
+                + "<outline text=\"relative\" htmlUrl=\"/a/b\"/>"
+                + "<outline text=\"spaces\" htmlUrl=\"http://example.com/a 
b\"/>"
+                + "<outline text=\"feed\" htmlUrl=\"https://example.com/b\"; 
xmlUrl=\"file:///etc/feed\"/>"
+                + "</body></opml>";
+        
bookmarkManager().importBookmarks(TestUtils.getManagedWebsite(testWeblog), 
folderName, opml);
+        TestUtils.endSession(true);
+
+        java.util.Map<String, WeblogBookmark> byName = new 
java.util.HashMap<>();
+        for (WeblogBookmark b : importedBookmarks()) {
+            byName.put(b.getName(), b);
+        }
+        assertEquals(java.util.Set.of("web", "feed"), byName.keySet());
+        assertEquals("https://example.com/a";, byName.get("web").getUrl());
+        assertEquals("http://example.com/feed";, 
byName.get("web").getFeedUrl());
+        assertEquals("https://example.com/b";, byName.get("feed").getUrl());
+        assertNull(byName.get("feed").getFeedUrl());
+    }
 }
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapperTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapperTest.java
new file mode 100644
index 000000000..4fa26391c
--- /dev/null
+++ 
b/app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapperTest.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+package org.apache.roller.weblogger.pojos.wrapper;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * Blogroll links reach templates only when they are relative or use a scheme
+ * a blogroll link needs.
+ */
+class WeblogBookmarkWrapperTest {
+
+    @Test
+    void keepsWebAndRelativeLinks() {
+        assertEquals("https://example.com/a";, 
WeblogBookmarkWrapper.linkOrEmpty("https://example.com/a";));
+        assertEquals("HTTP://example.com/", 
WeblogBookmarkWrapper.linkOrEmpty("HTTP://example.com/"));
+        assertEquals("ftp://example.com/f";, 
WeblogBookmarkWrapper.linkOrEmpty("ftp://example.com/f";));
+        assertEquals("mailto:[email protected]";, 
WeblogBookmarkWrapper.linkOrEmpty("mailto:[email protected]";));
+        assertEquals("/blog/page", 
WeblogBookmarkWrapper.linkOrEmpty("/blog/page"));
+        assertEquals("page?a=b:c", 
WeblogBookmarkWrapper.linkOrEmpty("page?a=b:c"));
+        assertNull(WeblogBookmarkWrapper.linkOrEmpty(null));
+    }
+
+    @Test
+    void dropsOtherSchemes() {
+        assertEquals("", 
WeblogBookmarkWrapper.linkOrEmpty("data:text/plain,x"));
+        assertEquals("", WeblogBookmarkWrapper.linkOrEmpty("FILE:///etc/x"));
+        assertEquals("", WeblogBookmarkWrapper.linkOrEmpty(" 
fi\tle:///etc/x"));
+    }
+}

Reply via email to