opendev/gerrit
Code Issues Proposed changes

Merge "Let kill SSH command only kill tasks that are visible to the caller"

Browse Source
This commit is contained in:
Edwin Kempin
2014-07-10 08:04:28 +00:00
committed by Gerrit Code Review
parent 0a76254bb9 8917a04ade
commit 29517f8a28
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/KillCommand.java
View File

@@ -16,10 +16,13 @@ package com.google.gerrit.sshd.commands;
import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.extensions.annotations.RequiresCapability;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.server.config.ConfigResource;
import com.google.gerrit.server.config.DeleteTask; import com.google.gerrit.server.config.DeleteTask;
import com.google.gerrit.server.config.TaskResource; import com.google.gerrit.server.config.TaskResource;
import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.config.TasksCollection;
import com.google.gerrit.server.git.WorkQueue.Task;
import com.google.gerrit.sshd.AdminHighPriorityCommand; import com.google.gerrit.sshd.AdminHighPriorityCommand;
import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshCommand;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -34,7 +37,7 @@ import java.util.List;
@RequiresCapability(GlobalCapability.KILL_TASK) @RequiresCapability(GlobalCapability.KILL_TASK)
final class KillCommand extends SshCommand { final class KillCommand extends SshCommand {
@Inject @Inject
private WorkQueue workQueue; private TasksCollection tasksCollection;
@Inject @Inject
private DeleteTask deleteTask; private DeleteTask deleteTask;
@@ -44,11 +47,12 @@ final class KillCommand extends SshCommand {
@Override @Override
protected void run() { protected void run() {
ConfigResource cfgRsrc = new ConfigResource();
for (String id : taskIds) { for (String id : taskIds) {
try { try {
Task<?> task = workQueue.getTask((int) Long.parseLong(id, 16)); TaskResource taskRsrc = tasksCollection.parse(cfgRsrc, IdString.fromDecoded(id));
deleteTask.apply(new TaskResource(task), null); deleteTask.apply(taskRsrc, null);
} catch (NumberFormatException e) { } catch (AuthException | ResourceNotFoundException e) {
stderr.print("kill: " + id + ": No such task\n"); stderr.print("kill: " + id + ": No such task\n");
} }
} }