github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

netexec shellCommand endpoint returns the error if shell command fails, instead of killing netexec

Browse Source
This commit is contained in:
Abhishek Shah 2015-09-21 16:32:51 -07:00
parent 915bc04488
commit e40f1533f9
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/for-tests/netexec/Makefile
View File

@ -1,12 +1,10 @@
.PHONY: all netexec image push clean .PHONY: all netexec image push clean
TAG = 1.0 TAG = 1.1
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: push all: push
TAG = 1.0
netexec: netexec.go netexec: netexec.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./netexec.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./netexec.go

17
contrib/for-tests/netexec/netexec.go
View File

@ -191,9 +191,20 @@ func dialUDP(request string, remoteAddress *net.UDPAddr) (string, error) {
func shellHandler(w http.ResponseWriter, r *http.Request) { func shellHandler(w http.ResponseWriter, r *http.Request) {
log.Println(r.FormValue("shellCommand")) log.Println(r.FormValue("shellCommand"))
output, err := exec.Command(shellPath, "-c", r.FormValue("shellCommand")).CombinedOutput() cmdOut, err := exec.Command(shellPath, "-c", r.FormValue("shellCommand")).CombinedOutput()
assertNoError(err) output := map[string]string{}
fmt.Fprintf(w, string(output)) if len(cmdOut) > 0 {
output["output"] = string(cmdOut)
}
if err != nil {
output["error"] = fmt.Sprintf("%v", err)
}
bytes, err := json.Marshal(output)
if err == nil {
fmt.Fprintf(w, string(bytes))
} else {
http.Error(w, fmt.Sprintf("response could not be serialized. %v", err), http.StatusExpectationFailed)
}
} }
func hostNameHandler(w http.ResponseWriter, r *http.Request) { func hostNameHandler(w http.ResponseWriter, r *http.Request) {