Home Explore Help
Sign In
apache
/
hadoop
mirror of https://github.com/apache/hadoop.git
2
0
Fork 1
Files Issues 0 Wiki
Browse Source

HADOOP-3342. Change the kill task actions to require http post instead of
get to prevent accidental crawls from triggering it. (enis via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@689993 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley 17 years ago
parent
9b4f336c17
commit
27a7773b1b
3 changed files with 35 additions and 13 deletions
Unified View Show Diff Stats
  1. 3 0
      CHANGES.txt
  2. 21 8
      src/webapps/job/jobdetails.jsp
  3. 11 5
      src/webapps/job/taskdetails.jsp

+ 3 - 0
CHANGES.txt
View File 

@@ -236,6 +236,9 @@ Trunk (unreleased changes)
 
     HADOOP-3488. Prevent hadoop-daemon from rsync'ing log files (Stefan 
     HADOOP-3488. Prevent hadoop-daemon from rsync'ing log files (Stefan 
     Groshupf and Craig Macdonald via omalley)
 
     Groshupf and Craig Macdonald via omalley)
 
 
 
+    HADOOP-3342. Change the kill task actions to require http post instead of 
+    get to prevent accidental crawls from triggering it. (enis via omalley)
 
+
 
   OPTIMIZATIONS
 
   OPTIMIZATIONS
 
 
 
     HADOOP-3556. Removed lock contention in MD5Hash by changing the 
     HADOOP-3556. Removed lock contention in MD5Hash by changing the

+ 21 - 8
src/webapps/job/jobdetails.jsp
View File 

@@ -95,9 +95,13 @@
 
         + url+"\"></head>"
 
         + url+"\"></head>"
 
         + "<body><h3> Are you sure you want to kill " + jobId
 
         + "<body><h3> Are you sure you want to kill " + jobId
 
         + " ?<h3><br><table border=\"0\"><tr><td width=\"100\">"
 
         + " ?<h3><br><table border=\"0\"><tr><td width=\"100\">"
 
-        + "<a href=\"" +  url + "&action=kill"
 
-        + "\">Kill</a></td><td width=\"100\"><a href=\"" + url
 
-        + "\">Cancel </a></td></tr></table></body></html>");
 
+        + "<form action=\"" + url + "\" method=\"post\">"
 
+        + "<input type=\"hidden\" name=\"action\" value=\"kill\" />"
 
+        + "<input type=\"submit\" name=\"kill\" value=\"Kill\" />"
 
+        + "</form>"
 
+        + "</td><td width=\"100\"><form method=\"post\" action=\"" + url
 
+        + "\"><input type=\"submit\" value=\"Cancel\" name=\"Cancel\""
 
+        + "/></form></td></tr></table></body></html>");
 
   }
 
   }
 
   
   
 %>       
 %>       
@@ -121,7 +125,7 @@
 
     JobInProgress job = (JobInProgress) tracker.getJob(jobIdObj);
 
     JobInProgress job = (JobInProgress) tracker.getJob(jobIdObj);
 
     
     
     String action = request.getParameter("action");
 
     String action = request.getParameter("action");
 
-    if("changeprio".equalsIgnoreCase(action)) {
 
+    if("changeprio".equalsIgnoreCase(action) && request.getMethod().equalsIgnoreCase("POST")) {
 
       tracker.setJobPriority(jobIdObj, 
       tracker.setJobPriority(jobIdObj, 
                              JobPriority.valueOf(request.getParameter("prio")));
 
                              JobPriority.valueOf(request.getParameter("prio")));
 
     }
 
     }
 
@@ -132,7 +136,8 @@
 
   	      printConfirm(out, jobId);
 
   	      printConfirm(out, jobId);
 
     	    return;
 
     	    return;
 
 	    }
 
 	    }
 
-  	    else if(action != null && action.equalsIgnoreCase("kill")) {
 
+  	    else if(action != null && action.equalsIgnoreCase("kill") && 
+  	        request.getMethod().equalsIgnoreCase("POST")) {
 
 	      tracker.killJob(jobIdObj);
 
 	      tracker.killJob(jobIdObj);
 
 	    }
 
 	    }
 
     }
 
     }
 
@@ -292,16 +297,24 @@ if("off".equals(session.getAttribute("map.graph"))) { %>
 
        style="width:100%" type="image/svg+xml" pluginspage="http://www.adobe.com/svg/viewer/install/" />
 
        style="width:100%" type="image/svg+xml" pluginspage="http://www.adobe.com/svg/viewer/install/" />
 
 <%} }%>
 
 <%} }%>
 
 
 
-<hr>Change priority from <%=job.getPriority()%> to: 
+<hr>
 
+<table border="0"> <tr> <td>
 
+Change priority from <%=job.getPriority()%> to:
 
+<form action="jobdetails.jsp" method="post">
 
+<input type="hidden" name="action" value="changeprio"/>
 
+<input type="hidden" name="jobid" value="<%=jobId%>"/>
 
+</td><td> <select name="prio"> 
 <%
 
 <%
 
   JobPriority jobPrio = job.getPriority();
 
   JobPriority jobPrio = job.getPriority();
 
   for (JobPriority prio : JobPriority.values()) {
 
   for (JobPriority prio : JobPriority.values()) {
 
     if(jobPrio != prio) {
 
     if(jobPrio != prio) {
 
-      %> <a style="margin-left: 5px; margin-right: 5px;" href="jobdetails.jsp?action=changeprio&jobid=<%=jobId%>&prio=<%=prio%>"> <%=prio%> </a> <%
 
+      %> <option value=<%=prio%>><%=prio%></option> <%
 
     }
 
     }
 
   }
 
   }
 
 %>
 
 %>
 
-</br>
 
+</select> </td><td><input type="submit" value="Submit"> </form></td></tr> </table>
 
+
 
+<table border="0"> <tr>
 
     
     
 <% if(JspHelper.conf.getBoolean(PRIVATE_ACTIONS_KEY, false) 
 <% if(JspHelper.conf.getBoolean(PRIVATE_ACTIONS_KEY, false) 
     	&& runState == JobStatus.RUNNING) { %>
 
     	&& runState == JobStatus.RUNNING) { %>

+ 11 - 5
src/webapps/job/taskdetails.jsp
View File 

@@ -22,9 +22,13 @@
 
     out.print("<html><head><META http-equiv=\"refresh\" content=\"15;URL="
 
     out.print("<html><head><META http-equiv=\"refresh\" content=\"15;URL="
 
         + url + "\"></head>" + "<body><h3> Are you sure you want to kill/fail "
 
         + url + "\"></head>" + "<body><h3> Are you sure you want to kill/fail "
 
         + taskid + " ?<h3><br><table border=\"0\"><tr><td width=\"100\">"
 
         + taskid + " ?<h3><br><table border=\"0\"><tr><td width=\"100\">"
 
-        + "<a href=\"" + url + "&action=" + action
 
-        + "\">Kill / Fail</a></td><td width=\"100\"><a href=\"" + url
 
-        + "\">Cancel</a></td></tr></table></body></html>");
 
+        + "<form action=\"" + url + "\" method=\"post\">"
 
+        + "<input type=\"hidden\" name=\"action\" value=\"" + action + "\" />"
 
+        + "<input type=\"submit\" name=\"Kill/Fail\" value=\"Kill/Fail\" />"
 
+        + "</form>"
 
+        + "</td><td width=\"100\"><form method=\"post\" action=\"" + url
 
+        + "\"><input type=\"submit\" value=\"Cancel\" name=\"Cancel\""
 
+        + "/></form></td></tr></table></body></html>");
 
   }%>
 
   }%>
 
 <%
 
 <%
 
     JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
 
     JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
 
@@ -49,13 +53,15 @@
 
           printConfirm(out, jobid, tipid, taskid, subAction);
 
           printConfirm(out, jobid, tipid, taskid, subAction);
 
           return;
 
           return;
 
         }
 
         }
 
-        else if (action.equalsIgnoreCase("kill-task")) {
 
+        else if (action.equalsIgnoreCase("kill-task") 
+            && request.getMethod().equalsIgnoreCase("POST")) {
 
           tracker.killTask(taskidObj, false);
 
           tracker.killTask(taskidObj, false);
 
           //redirect again so that refreshing the page will not attempt to rekill the task
 
           //redirect again so that refreshing the page will not attempt to rekill the task
 
           response.sendRedirect("/taskdetails.jsp?" + "&subaction=kill-task"
 
           response.sendRedirect("/taskdetails.jsp?" + "&subaction=kill-task"
 
               + "&jobid=" + jobid + "&tipid=" + tipid);
 
               + "&jobid=" + jobid + "&tipid=" + tipid);
 
         }
 
         }
 
-        else if (action.equalsIgnoreCase("fail-task")) {
 
+        else if (action.equalsIgnoreCase("fail-task")
 
+            && request.getMethod().equalsIgnoreCase("POST")) {
 
           tracker.killTask(taskidObj, true);
 
           tracker.killTask(taskidObj, true);
 
           response.sendRedirect("/taskdetails.jsp?" + "&subaction=fail-task"
 
           response.sendRedirect("/taskdetails.jsp?" + "&subaction=fail-task"
 
               + "&jobid=" + jobid + "&tipid=" + tipid);
 
               + "&jobid=" + jobid + "&tipid=" + tipid);