Skip to content

Commit d82f61f

Browse files
authored
Disable the message servlet by default (#2000) (#2015)
* Disable the message servlet by default * Add warning message and deprecated annotation (cherry picked from commit d8a8540)
1 parent c034ea8 commit d82f61f

2 files changed

Lines changed: 21 additions & 6 deletions

File tree

activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,13 @@
5353
* there will always be a chance of losing messages. Consider what happens when
5454
* a message is retrieved from the broker but the web call is interrupted before
5555
* the client receives the message in the response - the message is lost.
56+
*
57+
* @deprecated - WARNING: The MessageServlet should be used with caution as it is unmaintained
58+
* and there are multiple security related issues. This servlet is primarily meant for demo
59+
* purposes only and will be removed entirely in a future release. It is recommended to
60+
* keep it disabled.
5661
*/
62+
@Deprecated
5763
public class MessageServlet extends MessageServletSupport {
5864

5965
// its a bit pita that this servlet got intermixed with asyncRequest/rest

assembly/src/release/webapps/api/WEB-INF/web.xml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,19 @@
2222

2323
<display-name>Apache ActiveMQ REST API</display-name>
2424

25+
<!--
26+
27+
WARNING: The MessageServlet should be used with caution as it is deprecated and unmaintained
28+
and there are multiple security related issues. This servlet is primarily meant for demo
29+
purposes only and will be removed entirely in a future release. It is recommended to
30+
keep it disabled.
31+
2532
<servlet>
2633
<servlet-name>MessageServlet</servlet-name>
2734
<servlet-class>org.apache.activemq.web.MessageServlet</servlet-class>
2835
<load-on-startup>1</load-on-startup>
2936
<async-supported>true</async-supported>
37+
-->
3038
<!--
3139
Uncomment this parameter if you plan to use multiple consumers over REST
3240
<init-param>
@@ -43,7 +51,13 @@
4351
<param-value>-1</param-value>
4452
</init-param>
4553
-->
46-
</servlet>
54+
<!--</servlet>
55+
56+
<servlet-mapping>
57+
<servlet-name>MessageServlet</servlet-name>
58+
<url-pattern>/message/*</url-pattern>
59+
</servlet-mapping>
60+
-->
4761

4862
<servlet>
4963
<servlet-name>jolokia-agent</servlet-name>
@@ -74,11 +88,6 @@
7488
<load-on-startup>1</load-on-startup>
7589
</servlet>
7690

77-
<servlet-mapping>
78-
<servlet-name>MessageServlet</servlet-name>
79-
<url-pattern>/message/*</url-pattern>
80-
</servlet-mapping>
81-
8291
<servlet-mapping>
8392
<servlet-name>jolokia-agent</servlet-name>
8493
<url-pattern>/jolokia/*</url-pattern>

0 commit comments

Comments
 (0)