(jspwiki) 01/05: jspwiki.attachment.forceDownload now accepts * as a way to always enforce attachment download

[ju...@apache.org]

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

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 9073db5b81b562c876101018819ba3e120fbe6f2
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Sep 26 23:30:39 2024 +0200

    jspwiki.attachment.forceDownload now accepts * as a way to always enforce attachment download
---
 .../java/org/apache/wiki/attachment/DefaultAttachmentManager.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
index 6fb3dd935..027d25142 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
@@ -18,6 +18,7 @@
  */
 package org.apache.wiki.attachment;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.wiki.api.core.Attachment;
@@ -102,7 +103,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
         }
 
         final String forceDownload = TextUtil.getStringProperty( props, PROP_FORCEDOWNLOAD, null );
-        if( forceDownload != null && !forceDownload.isEmpty() ) {
+        if( StringUtils.isNotEmpty( forceDownload ) ) {
             m_forceDownloadPatterns = forceDownload.toLowerCase().split( "\\s" );
         } else {
             m_forceDownloadPatterns = new String[ 0 ];
@@ -210,7 +211,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
         }
 
         for( final String forceDownloadPattern : m_forceDownloadPatterns ) {
-            if( name.endsWith( forceDownloadPattern ) && !forceDownloadPattern.isEmpty() ) {
+            if( ( name.endsWith( forceDownloadPattern ) && !forceDownloadPattern.isEmpty() ) || "*".equals( forceDownloadPattern ) ) {
                 return true;
             }
         }