Skip to content

fix(security): Prevent command injection in ProcessBuilder call #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: only-aws
Choose a base branch
from
Open

fix(security): Prevent command injection in ProcessBuilder call #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions ...on/java/com/netflix/spinnaker/clouddriver/kubernetes/it/containers/KubernetesCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,13 @@ public String execKubectl(String args, Map<String, Object> manifest)
String json = manifestToJson(manifest);
ProcessBuilder builder = new ProcessBuilder();
List<String> cmd = new ArrayList<>();
cmd.add("sh");
cmd.add("-c");
cmd.add(KUBECTL_PATH + " --kubeconfig=" + KUBECFG_PATH + " " + args);
cmd.add(KUBECTL_PATH.toString());
cmd.add("--kubeconfig=" + KUBECFG_PATH.toString());
// Split args on whitespace and add each argument separately to avoid shell injection
if (args != null && !args.trim().isEmpty()) {
String[] argArray = args.trim().split("\\s+");
cmd.addAll(Arrays.asList(argArray));
}
builder.command(cmd);
builder.redirectErrorStream(true);
Process process = builder.start();
Expand Down Expand Up @@ -193,9 +197,12 @@ private void createCluster() throws IOException, InterruptedException {
private String runKindCmd(String args) throws IOException, InterruptedException {
ProcessBuilder builder = new ProcessBuilder();
List<String> cmd = new ArrayList<>();
cmd.add("sh");
cmd.add("-c");
cmd.add(Paths.get(IT_BUILD_HOME.toString(), "kind") + " " + args);
cmd.add(Paths.get(IT_BUILD_HOME.toString(), "kind").toString());
// Split args on whitespace and add each argument separately to avoid shell injection
if (args != null && !args.trim().isEmpty()) {
String[] argArray = args.trim().split("\\s+");
cmd.addAll(Arrays.asList(argArray));
}
builder.command(cmd);
builder.redirectErrorStream(true);
Process process = builder.start();
Expand Down
Loading