From 86699954b1177e6806f4ace5d329e55921384402 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 20 Jan 2023 14:52:07 +0100 Subject: [PATCH] network create: do not allow `default` as name `default` is already used as network mode, i.e. podman run --network default will choose the default mode not a network named `default`. We already block names from other network modes, default was forgotten. Fixes #17169 Signed-off-by: Paul Holzinger --- pkg/domain/infra/abi/network.go | 2 +- test/e2e/network_create_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go index 01e6dea538..f648a392c0 100644 --- a/pkg/domain/infra/abi/network.go +++ b/pkg/domain/infra/abi/network.go @@ -151,7 +151,7 @@ func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, o func (ic *ContainerEngine) NetworkCreate(ctx context.Context, network types.Network, createOptions *types.NetworkCreateOptions) (*types.Network, error) { // TODO (5.0): Stop accepting "pasta" as value here - if util.StringInSlice(network.Name, []string{"none", "host", "bridge", "private", "slirp4netns", "container", "ns"}) { + if util.StringInSlice(network.Name, []string{"none", "host", "bridge", "private", "slirp4netns", "container", "ns", "default"}) { return nil, fmt.Errorf("cannot create network with name %q because it conflicts with a valid network mode", network.Name) } network, err := ic.Libpod.Network().NetworkCreate(network, createOptions) diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index de1feae23c..90e85b9456 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -366,7 +366,7 @@ var _ = Describe("Podman network create", func() { }) It("podman network create with invalid name", func() { - for _, name := range []string{"none", "host", "bridge", "private", "slirp4netns", "container", "ns"} { + for _, name := range []string{"none", "host", "bridge", "private", "slirp4netns", "container", "ns", "default"} { nc := podmanTest.Podman([]string{"network", "create", name}) nc.WaitWithDefaultTimeout() Expect(nc).To(Exit(125))