Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-4397 - xss in cron expressions 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1459265 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-03-21 12:34:01 +00:00
parent 0d58477039
commit 148ca81dcd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java
View File

@ -42,7 +42,7 @@ public class CronParser {
// Handle the once per minute case "* * * * *" // Handle the once per minute case "* * * * *"
// starting the next event at the top of the minute. // starting the next event at the top of the minute.
if (cronEntry.startsWith("* * * * *")) { if (cronEntry.equals("* * * * *")) {
result = currentTime + 60 * 1000; result = currentTime + 60 * 1000;
result = result / 1000 * 1000; result = result / 1000 * 1000;
return result; return result;

14
activemq-web-console/src/main/webapp/scheduled.jsp
View File

@ -40,13 +40,13 @@
<c:forEach items="${requestContext.brokerQuery.scheduledJobs}" <c:forEach items="${requestContext.brokerQuery.scheduledJobs}"
var="row"> var="row">
<tr> <tr>
<td>${row.jobId}</td> <td><c:out value="${row.jobId}"/></td>
<td>${row.cronEntry}</td> <td><c:out value="${row.cronEntry}"/></td>
<td>${row.nextExecutionTime}</td> <td><c:out value="${row.nextExecutionTime}"/></td>
<td>${row.start}</td> <td><c:out value="${row.start}"/></td>
<td>${row.delay}</td> <td><c:out value="${row.delay}"/></td>
<td>${row.period}</td> <td><c:out value="${row.period}"/></td>
<td>${row.repeat}</td> <td><c:out value="${row.repeat}"/></td>
<td> <td>
<a href="deleteJob.action?jobId=${row.jobId}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a> <a href="deleteJob.action?jobId=${row.jobId}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a>
</td> </td>