github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Add optional code to netexec echo endpoint

Browse Source
This commit is contained in:
Tim Allclair 2020-07-06 17:02:43 -07:00 committed by Tim Allclair
parent 95c56ada4b
commit a15f5ea836
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/agnhost/README.md
View File

@ -393,7 +393,7 @@ Starts a HTTP(S) server on given port with the following endpoints:
- `protocol`: The protocol which will be used when making the request. Default value: `http`. - `protocol`: The protocol which will be used when making the request. Default value: `http`.
Acceptable values: `http`, `udp`, `sctp`. Acceptable values: `http`, `udp`, `sctp`.
- `tries`: The number of times the request will be performed. Default value: `1`. - `tries`: The number of times the request will be performed. Default value: `1`.
- `/echo`: Returns the given `msg` (`/echo?msg=echoed_msg`) - `/echo`: Returns the given `msg` (`/echo?msg=echoed_msg`), with the optional status `code`.
- `/exit`: Closes the server with the given code and graceful shutdown. The endpoint's parameters - `/exit`: Closes the server with the given code and graceful shutdown. The endpoint's parameters
are: are:
- `code`: The exit code for the process. Default value: 0. Allows an integer [0-127]. - `code`: The exit code for the process. Default value: 0. Allows an integer [0-127].

19
test/images/agnhost/netexec/netexec.go
View File

@ -69,7 +69,7 @@ var CmdNetexec = &cobra.Command{
- "protocol": The protocol which will be used when making the request. Default value: "http". - "protocol": The protocol which will be used when making the request. Default value: "http".
Acceptable values: "http", "udp", "sctp". Acceptable values: "http", "udp", "sctp".
- "tries": The number of times the request will be performed. Default value: "1". - "tries": The number of times the request will be performed. Default value: "1".
- "/echo": Returns the given "msg" ("/echo?msg=echoed_msg") - "/echo": Returns the given "msg" ("/echo?msg=echoed_msg"), with the optional status "code".
- "/exit": Closes the server with the given code and graceful shutdown. The endpoint's parameters - "/exit": Closes the server with the given code and graceful shutdown. The endpoint's parameters
are: are:
- "code": The exit code for the process. Default value: 0. Allows an integer [0-127]. - "code": The exit code for the process. Default value: 0. Allows an integer [0-127].
@ -166,6 +166,7 @@ func addRoutes(exitCh chan shutdownRequest) {
} }
func startServer(server *http.Server, exitCh chan shutdownRequest, fn func() error) { func startServer(server *http.Server, exitCh chan shutdownRequest, fn func() error) {
log.Printf("Started HTTP server on port %d", httpPort)
go func() { go func() {
re := <-exitCh re := <-exitCh
ctx, cancelFn := context.WithTimeout(context.Background(), re.timeout) ctx, cancelFn := context.WithTimeout(context.Background(), re.timeout)
@ -190,8 +191,18 @@ func rootHandler(w http.ResponseWriter, r *http.Request) {
} }
func echoHandler(w http.ResponseWriter, r *http.Request) { func echoHandler(w http.ResponseWriter, r *http.Request) {
log.Printf("GET /echo?msg=%s", r.FormValue("msg")) msg := r.FormValue("msg")
fmt.Fprintf(w, "%s", r.FormValue("msg")) codeString := r.FormValue("code")
log.Printf("GET /echo?msg=%s&code=%s", msg, codeString)
if codeString != "" {
code, err := strconv.Atoi(codeString)
if err != nil && codeString != "" {
fmt.Fprintf(w, "argument 'code' must be an integer or empty, got %q\n", codeString)
return
}
w.WriteHeader(code)
}
fmt.Fprintf(w, "%s", msg)
} }
func clientIPHandler(w http.ResponseWriter, r *http.Request) { func clientIPHandler(w http.ResponseWriter, r *http.Request) {
@ -497,7 +508,7 @@ func startUDPServer(udpPort int) {
defer serverConn.Close() defer serverConn.Close()
buf := make([]byte, 2048) buf := make([]byte, 2048)
log.Printf("Started UDP server") log.Printf("Started UDP server on port %d", udpPort)
// Start responding to readiness probes. // Start responding to readiness probes.
serverReady.set(true) serverReady.set(true)
defer func() { defer func() {