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:55 UTC
[1/2] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-5754 - disable file server by
default
Repository: activemq
Updated Branches:
refs/heads/activemq-5.11.x a37b43cca -> 729c47315
https://issues.apache.org/jira/browse/AMQ-5754 - disable file server by default
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9fd5cb7d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9fd5cb7d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9fd5cb7d
Branch: refs/heads/activemq-5.11.x
Commit: 9fd5cb7dfe0fcc431f99d5e14206e0090e72f36b
Parents: a37b43c
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Thu Apr 30 12:08:26 2015 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 5 11:15:43 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/activemq/util/FilenameGuardFilter.java | 2 +-
activemq-fileserver/src/main/webapp/index.html | 4 ++--
assembly/src/release/conf/jetty.xml | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/9fd5cb7d/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 099fa41..89bfa58 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
@@ -60,7 +60,7 @@ public class FilenameGuardFilter implements Filter {
}
private String guard(String filename) {
- String guarded = filename.replace(":", "_");
+ String guarded = filename.replace(":", "_").replace("\\", "").replace("/", "");
if (LOG.isDebugEnabled()) {
LOG.debug("guarded " + filename + " to " + guarded);
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/9fd5cb7d/activemq-fileserver/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/activemq-fileserver/src/main/webapp/index.html b/activemq-fileserver/src/main/webapp/index.html
index 56294f6..f30eb69 100644
--- a/activemq-fileserver/src/main/webapp/index.html
+++ b/activemq-fileserver/src/main/webapp/index.html
@@ -16,14 +16,14 @@
-->
<html>
<head>
-<title>ActiveMQ Console</title>
+<title>ActiveMQ File server</title>
</head>
<body>
<h1>RESTful file access</h1>
<p>
- This webapp provides RESTful file access.
+ This webapp provides RESTful file access for <a href="http://activemq.apache.org/blob-messages.html">blob messages</a>. It's disabled by default, please take a look at web server configuration on how to enable it.
</p>
</body>
http://git-wip-us.apache.org/repos/asf/activemq/blob/9fd5cb7d/assembly/src/release/conf/jetty.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index 2f77ee5..12e104c 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -65,12 +65,15 @@
<property name="resourceBase" value="${activemq.home}/webapps/admin" />
<property name="logUrlOnStart" value="true" />
</bean>
+ <!-- Enable embedded file server for Blob messages -->
+ <!--
<bean class="org.eclipse.jetty.webapp.WebAppContext">
<property name="contextPath" value="/fileserver" />
<property name="resourceBase" value="${activemq.home}/webapps/fileserver" />
<property name="logUrlOnStart" value="true" />
<property name="parentLoaderPriority" value="true" />
</bean>
+ -->
<bean class="org.eclipse.jetty.webapp.WebAppContext">
<property name="contextPath" value="/api" />
<property name="resourceBase" value="${activemq.home}/webapps/api" />
[2/2] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-5754 - better filename guaard fix
Posted by dk...@apache.org.
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);
}