0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

api: postContainersStop, postContainersRestart remove redundant validation

Browse source 
Both of these pass the signal to daemon.containerStop(), which already validates
the signal; 2ed904cad7/daemon/stop.go (L48-L52)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-05-01 19:55:36 +02:00
parent 2ed904cad7
commit 789223f2dc
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/server/router/container/container_routes.go
View file

@ -226,12 +226,7 @@ func (s *containerRouter) postContainersStop(ctx context.Context, w http.Respons
version = httputils.VersionFromContext(ctx)
)
if versions.GreaterThanOrEqualTo(version, "1.42") {
if sig := r.Form.Get("signal"); sig != "" {
if _, err := signal.ParseSignal(sig); err != nil {
return errdefs.InvalidParameter(err)
}
options.Signal = sig
}
options.Signal = r.Form.Get("signal")
}
if tmpSeconds := r.Form.Get("t"); tmpSeconds != "" {
valSeconds, err := strconv.Atoi(tmpSeconds)
@ -294,12 +289,7 @@ func (s *containerRouter) postContainersRestart(ctx context.Context, w http.Resp
version = httputils.VersionFromContext(ctx)
)
if versions.GreaterThanOrEqualTo(version, "1.42") {
if sig := r.Form.Get("signal"); sig != "" {
if _, err := signal.ParseSignal(sig); err != nil {
return errdefs.InvalidParameter(err)
}
options.Signal = sig
}
options.Signal = r.Form.Get("signal")
}
if tmpSeconds := r.Form.Get("t"); tmpSeconds != "" {
valSeconds, err := strconv.Atoi(tmpSeconds)