You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by dk...@apache.org on 2015/08/05 17:34:56 UTC
[2/2] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-5754 - better filename guaard fix
https://issues.apache.org/jira/browse/AMQ-5754 - better filename guaard fix
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/729c4731
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/729c4731
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/729c4731
Branch: refs/heads/activemq-5.11.x
Commit: 729c4731574ffffaf58ebefdbaeb3bd19ed1c7b7
Parents: 9fd5cb7
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Tue May 5 16:29:26 2015 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 5 11:15:55 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/activemq/util/FilenameGuardFilter.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/729c4731/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
----------------------------------------------------------------------
diff --git a/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java b/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
index 89bfa58..b8bcc95 100644
--- a/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
+++ b/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
@@ -17,6 +17,7 @@
package org.apache.activemq.util;
import java.io.IOException;
+import java.nio.file.FileSystems;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -60,7 +61,8 @@ public class FilenameGuardFilter implements Filter {
}
private String guard(String filename) {
- String guarded = filename.replace(":", "_").replace("\\", "").replace("/", "");
+ String guarded = filename.replace(":", "_");
+ guarded = FileSystems.getDefault().getPath(guarded).normalize().toString();
if (LOG.isDebugEnabled()) {
LOG.debug("guarded " + filename + " to " + guarded);
}