mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
In situations where an empty ID was passed, the client would construct an
invalid API endpoint URL, which either resulted in the "not found" handler
being hit (resulting in a "page not found" error), or even the wrong endpoint
being hit if the client follows redirects.
For example, `/containers/<empty id>/json` (inspect) redirects to `/containers/json`
(docker ps))
Given that empty IDs should never be expected (especially if they're part of
the API URL path), we can validate these and return early.
Its worth noting that a few methods already had an error in place; those
methods were related to the situation mentioned above, where (e.g.) an
"inspect" would redirect to a "list" endpoint. The existing errors, for
convenience, mimicked a "not found" error; this patch changes such errors
to an "Invalid Parameter" instead, which is more correct, but it could be
a breaking change for some edge cases where users parsed the output;
git grep 'objectNotFoundError{'
client/config_inspect.go: return swarm.Config{}, nil, objectNotFoundError{object: "config", id: id}
client/container_inspect.go: return container.InspectResponse{}, nil, objectNotFoundError{object: "container", id: containerID}
client/container_inspect.go: return container.InspectResponse{}, objectNotFoundError{object: "container", id: containerID}
client/distribution_inspect.go: return distributionInspect, objectNotFoundError{object: "distribution", id: imageRef}
client/image_inspect.go: return image.InspectResponse{}, nil, objectNotFoundError{object: "image", id: imageID}
client/network_inspect.go: return network.Inspect{}, nil, objectNotFoundError{object: "network", id: networkID}
client/node_inspect.go: return swarm.Node{}, nil, objectNotFoundError{object: "node", id: nodeID}
client/plugin_inspect.go: return nil, nil, objectNotFoundError{object: "plugin", id: name}
client/secret_inspect.go: return swarm.Secret{}, nil, objectNotFoundError{object: "secret", id: id}
client/service_inspect.go: return swarm.Service{}, nil, objectNotFoundError{object: "service", id: serviceID}
client/task_inspect.go: return swarm.Task{}, nil, objectNotFoundError{object: "task", id: taskID}
client/volume_inspect.go: return volume.Volume{}, nil, objectNotFoundError{object: "volume", id: volumeID}
Two such errors are still left, as "ID or name" would probably be confusing,
but perhaps we can use a more generic error to include those as well (e.g.
"invalid <object> reference: value is empty");
client/distribution_inspect.go: return distributionInspect, objectNotFoundError{object: "distribution", id: imageRef}
client/image_inspect.go: return image.InspectResponse{}, nil, objectNotFoundError{object: "image", id: imageID}
Before this patch:
docker container start ""
Error response from daemon: page not found
Error: failed to start containers:
docker container start " "
Error response from daemon: No such container:
Error: failed to start containers:
With this patch:
docker container start ""
invalid container name or ID: value is empty
Error: failed to start containers:
docker container start " "
invalid container name or ID: value is empty
Error: failed to start containers:
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
109 lines
3.8 KiB
Go
109 lines
3.8 KiB
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types/network"
|
|
"github.com/docker/docker/errdefs"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestNetworkInspect(t *testing.T) {
|
|
client := &Client{
|
|
client: newMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if req.Method != http.MethodGet {
|
|
return nil, errors.New("expected GET method, got " + req.Method)
|
|
}
|
|
if req.URL.Path == "/networks/" {
|
|
return errorMock(http.StatusInternalServerError, "client should not make a request for empty IDs")(req)
|
|
}
|
|
if strings.HasPrefix(req.URL.Path, "/networks/unknown") {
|
|
return errorMock(http.StatusNotFound, "Error: No such network: unknown")(req)
|
|
}
|
|
if strings.HasPrefix(req.URL.Path, "/networks/test-500-response") {
|
|
return errorMock(http.StatusInternalServerError, "Server error")(req)
|
|
}
|
|
// other test-cases all use "network_id"
|
|
if !strings.HasPrefix(req.URL.Path, "/networks/network_id") {
|
|
return nil, errors.New("expected URL '/networks/network_id', got " + req.URL.Path)
|
|
}
|
|
if strings.Contains(req.URL.RawQuery, "scope=global") {
|
|
return errorMock(http.StatusNotFound, "Error: No such network: network_id")(req)
|
|
}
|
|
var (
|
|
content []byte
|
|
err error
|
|
)
|
|
if strings.Contains(req.URL.RawQuery, "verbose=true") {
|
|
s := map[string]network.ServiceInfo{
|
|
"web": {},
|
|
}
|
|
content, err = json.Marshal(network.Inspect{
|
|
Name: "mynetwork",
|
|
Services: s,
|
|
})
|
|
} else {
|
|
content, err = json.Marshal(network.Inspect{
|
|
Name: "mynetwork",
|
|
})
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &http.Response{
|
|
Header: http.Header{"Content-Type": []string{"application/json"}},
|
|
StatusCode: http.StatusOK,
|
|
Body: io.NopCloser(bytes.NewReader(content)),
|
|
}, nil
|
|
}),
|
|
}
|
|
|
|
t.Run("empty ID", func(t *testing.T) {
|
|
// verify that the client does not create a request if the network-ID/name is empty.
|
|
_, err := client.NetworkInspect(context.Background(), "", network.InspectOptions{})
|
|
assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
|
|
assert.Check(t, is.ErrorContains(err, "value is empty"))
|
|
|
|
_, err = client.NetworkInspect(context.Background(), " ", network.InspectOptions{})
|
|
assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
|
|
assert.Check(t, is.ErrorContains(err, "value is empty"))
|
|
})
|
|
t.Run("no options", func(t *testing.T) {
|
|
r, err := client.NetworkInspect(context.Background(), "network_id", network.InspectOptions{})
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, r.Name, "mynetwork")
|
|
})
|
|
t.Run("verbose", func(t *testing.T) {
|
|
r, err := client.NetworkInspect(context.Background(), "network_id", network.InspectOptions{Verbose: true})
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, r.Name, "mynetwork")
|
|
_, ok := r.Services["web"]
|
|
if !ok {
|
|
t.Fatalf("expected service `web` missing in the verbose output")
|
|
}
|
|
})
|
|
t.Run("global scope", func(t *testing.T) {
|
|
_, err := client.NetworkInspect(context.Background(), "network_id", network.InspectOptions{Scope: "global"})
|
|
assert.Check(t, is.ErrorContains(err, "Error: No such network: network_id"))
|
|
assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))
|
|
})
|
|
t.Run("unknown network", func(t *testing.T) {
|
|
_, err := client.NetworkInspect(context.Background(), "unknown", network.InspectOptions{})
|
|
assert.Check(t, is.ErrorContains(err, "Error: No such network: unknown"))
|
|
assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))
|
|
})
|
|
t.Run("server error", func(t *testing.T) {
|
|
// Just testing that an internal server error is converted correctly by the client
|
|
_, err := client.NetworkInspect(context.Background(), "test-500-response", network.InspectOptions{})
|
|
assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
|
|
})
|
|
}
|