Author: dejanb Date: Wed Apr 7 13:55:14 2010 New Revision: 931552 URL: http://svn.apache.org/viewvc?rev=931552&view=rev Log: https://issues.apache.org/activemq/browse/AMQ-2613 - more web console sanitation Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp activemq/trunk/activemq-web-console/src/main/webapp/message.jsp Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java?rev=931552&r1=931551&r2=931552&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java (original) +++ activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java Wed Apr 7 13:55:14 2010 @@ -178,6 +178,9 @@ public class SendMessage extends Destina for (Iterator iter = map.entrySet().iterator(); iter.hasNext();) { Map.Entry entry = (Map.Entry) iter.next(); String name = (String) entry.getKey(); + if (name.equals("secret")) { + continue; + } Object value = entry.getValue(); if (isValidPropertyName(name)) { if (value instanceof String[]) { Modified: activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp?rev=931552&r1=931551&r2=931552&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp Wed Apr 7 13:55:14 2010 @@ -41,13 +41,13 @@ " title="${row.properties}">${row.JMSMessageID} -${row.JMSCorrelationID} + -${row.JMSPriority} -${row.JMSRedelivered} -${row.JMSReplyTo} + + + -${row.JMSType} + &messageId=${row.JMSMessageID}&secret=">Delete Modified: activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp?rev=931552&r1=931551&r2=931552&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp Wed Apr 7 13:55:14 2010 @@ -17,7 +17,7 @@ -Connection ${requestContext.connectionQuery.connectionID} +Connection <c:out value="${requestContext.connectionQuery.connectionID}" /> @@ -26,40 +26,40 @@
-No connection could be found for ID ${requestContext.connectionQuery.connectionID} +No connection could be found for ID
-

Connection ${requestContext.connectionQuery.connectionID}

+

Connection

- + - + - + - + - + - + @@ -96,29 +96,29 @@ No connection could be found for ID ${re - Queue ${consumer.destinationName} + Queue - Topic ${consumer.destinationName} + Topic - ${consumer.destinationName} + - ${consumer.sessionId} - ${consumer.selector} - ${consumer.enqueueCounter} - ${consumer.dequeueCounter} - ${consumer.dispachedCounter} - ${consumer.dispatchedQueueSize} + + + + + + - ${consumer.prefetchSize}
- ${consumer.maximumPendingMessageLimit} +
+ - ${consumer.exclusive}
- ${consumer.retroactive} +
+ Modified: activemq/trunk/activemq-web-console/src/main/webapp/message.jsp URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/message.jsp?rev=931552&r1=931551&r2=931552&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/message.jsp (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/message.jsp Wed Apr 7 13:55:14 2010 @@ -17,7 +17,7 @@ -Message ${requestContext.messageQuery.id} +Message <c:out value="${requestContext.messageQuery.id}"/> @@ -26,7 +26,7 @@
-No message could be found for ID ${requestContext.messageQuery.id} +No message could be found for ID
@@ -47,7 +47,7 @@ No message could be found for ID ${reque Message ID - ${row.JMSMessageID} + Destination @@ -55,19 +55,19 @@ No message could be found for ID ${reque Correlation ID - ${row.JMSCorrelationID} + Group - ${row.groupID} + Sequence - ${row.groupSequence} + Expiration - ${row.JMSExpiration} + Persistence @@ -75,15 +75,15 @@ No message could be found for ID ${reque Priority - ${row.JMSPriority} + Redelivered - ${row.JMSRedelivered} + Reply To - ${row.JMSReplyTo} + Timestamp @@ -91,7 +91,7 @@ No message could be found for ID ${reque Type - ${row.JMSType} + @@ -109,8 +109,8 @@ No message could be found for ID ${reque - ${prop.key} - ${prop.value} + +