containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

api: utils: add an `IsLibpodRequest` handler 

Add a hanlder to figure out if the specified http request came through
a libpod endpoint.  A first user is the top endpoint which has a
different default value for `ps_args` depending if the request came
through the docker or libpod endpoint.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg 2020-01-15 16:51:46 +01:00
parent 9d54815c26
commit a65068aff8
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/handlers/containers_top.go
View File

@ -15,10 +15,14 @@ func TopContainer(w http.ResponseWriter, r *http.Request) {
runtime := r.Context().Value("runtime").(*libpod.Runtime) runtime := r.Context().Value("runtime").(*libpod.Runtime)
decoder := r.Context().Value("decoder").(*schema.Decoder) decoder := r.Context().Value("decoder").(*schema.Decoder)
defaultValue := "-ef"
if utils.IsLibpodRequest(r) {
defaultValue = ""
}
query := struct { query := struct {
PsArgs string `schema:"ps_args"` PsArgs string `schema:"ps_args"`
}{ }{
PsArgs: "-ef", PsArgs: defaultValue,
} }
if err := decoder.Decode(&query, r.URL.Query()); err != nil { if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,

16
pkg/api/handlers/utils/handler.go
View File

@ -6,10 +6,18 @@ import (
"io" "io"
"net/http" "net/http"
"os" "os"
"strings"
log "github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
// IsLibpodRequest returns true if the request related to a libpod endpoint
// (e.g., /v2/libpod/...).
func IsLibpodRequest(r *http.Request) bool {
split := strings.Split(r.URL.String(), "/")
return len(split) >= 3 && split[2] == "libpod"
}
// WriteResponse encodes the given value as JSON or string and renders it for http client // WriteResponse encodes the given value as JSON or string and renders it for http client
func WriteResponse(w http.ResponseWriter, code int, value interface{}) { func WriteResponse(w http.ResponseWriter, code int, value interface{}) {
switch v := value.(type) { switch v := value.(type) {
@ -18,14 +26,14 @@ func WriteResponse(w http.ResponseWriter, code int, value interface{}) {
w.WriteHeader(code) w.WriteHeader(code)
if _, err := fmt.Fprintln(w, v); err != nil { if _, err := fmt.Fprintln(w, v); err != nil {
log.Errorf("unable to send string response: %q", err) logrus.Errorf("unable to send string response: %q", err)
} }
case *os.File: case *os.File:
w.Header().Set("Content-Type", "application/octet; charset=us-ascii") w.Header().Set("Content-Type", "application/octet; charset=us-ascii")
w.WriteHeader(code) w.WriteHeader(code)
if _, err := io.Copy(w, v); err != nil { if _, err := io.Copy(w, v); err != nil {
log.Errorf("unable to copy to response: %q", err) logrus.Errorf("unable to copy to response: %q", err)
} }
default: default:
WriteJSON(w, code, value) WriteJSON(w, code, value)
@ -40,6 +48,6 @@ func WriteJSON(w http.ResponseWriter, code int, value interface{}) {
coder := json.NewEncoder(w) coder := json.NewEncoder(w)
coder.SetEscapeHTML(true) coder.SetEscapeHTML(true)
if err := coder.Encode(value); err != nil { if err := coder.Encode(value); err != nil {
log.Errorf("unable to write json: %q", err) logrus.Errorf("unable to write json: %q", err)
} }
} }