Don't treat non-zero command exit as an RPC failure.

BishopFox · Nov 19, 2020 · 42be5ef · 42be5ef
1 parent 9f2d3a1
commit 42be5ef
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/client/command/execute.go b/client/command/execute.go
@@ -49,10 +49,14 @@ func execute(ctx *grumble.Context, rpc rpcpb.SliverRPCClient) {
 	})
 	if err != nil {
 		fmt.Printf(Warn+"%s", err)
-		if exec != nil && exec.Result != "" {
-			fmt.Printf(Warn+"Output:\n%s\n", exec.Result)
-		}
 	} else if !output {
-		fmt.Printf(Info+"Output:\n%s\n", exec.Result)
+		if exec.Status != 0 {
+			fmt.Printf(Warn+"Exited with status %d!\n", exec.Status)
+			if exec.Result != "" {
+				fmt.Printf(Info+"Output:\n%s\n", exec.Result)
+			}
+		} else {
+			fmt.Printf(Info+"Output:\n%s\n", exec.Result)
+		}
 	}
 }
diff --git a/protobuf/sliverpb/sliver.proto b/protobuf/sliverpb/sliver.proto
@@ -321,6 +321,7 @@ message ExecuteReq {
 
 message Execute {
   string Result = 1;
+  uint32 Status = 2;
 
   commonpb.Response Response = 9;
 }

diff --git a/sliver/handlers/generic-rpc-handlers.go b/sliver/handlers/generic-rpc-handlers.go
@@ -511,8 +511,13 @@ func executeHandler(data []byte, resp RPCResponse) {
 		log.Println(string(res))
 		//{{end}}
 		if err != nil {
-			execResp.Response = &commonpb.Response{
-				Err: fmt.Sprintf("%s", err),
+			// Exit errors are not a failure of the RPC, but of the command.
+			if exiterr, ok := err.(os.ExitError); ok {
+				execResp.Status = uint32(exiterr.ExitCode())
+			} else {
+				execResp.Response = &commonpb.Response{
+					Err: fmt.Sprintf("%s", err),
+				}
 			}
 		}
 		execResp.Result = string(res)