opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-26 18:54:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11602 from Luap99/netname

Browse Source 
Do not allow network modes to be used as network names
This commit is contained in:
OpenShift Merge Robot
2021-09-16 17:17:08 -04:00
committed by GitHub
parent 0acf540304 5c7935057c
commit 6cf13c3dbf
6 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/handlers/compat/networks.go
View File

@ -224,7 +224,8 @@ func CreateNetwork(w http.ResponseWriter, r *http.Request) {
// FIXME can we use the IPAM driver and options? // FIXME can we use the IPAM driver and options?
} }
network, err := runtime.Network().NetworkCreate(network) ic := abi.ContainerEngine{Libpod: runtime}
newNetwork, err := ic.NetworkCreate(r.Context(), network)
if err != nil { if err != nil {
utils.InternalServerError(w, err) utils.InternalServerError(w, err)
return return
@ -234,7 +235,7 @@ func CreateNetwork(w http.ResponseWriter, r *http.Request) {
ID string `json:"Id"` ID string `json:"Id"`
Warning []string Warning []string
}{ }{
ID: network.ID, ID: newNetwork.ID,
} }
utils.WriteResponse(w, http.StatusCreated, body) utils.WriteResponse(w, http.StatusCreated, body)
} }

2
pkg/api/handlers/libpod/networks.go
View File

@ -25,7 +25,7 @@ func CreateNetwork(w http.ResponseWriter, r *http.Request) {
} }
ic := abi.ContainerEngine{Libpod: runtime} ic := abi.ContainerEngine{Libpod: runtime}
report, err := ic.Libpod.Network().NetworkCreate(network) report, err := ic.NetworkCreate(r.Context(), network)
if err != nil { if err != nil {
utils.InternalServerError(w, err) utils.InternalServerError(w, err)
return return

2
pkg/domain/entities/engine_container.go
View File

@ -59,7 +59,7 @@ type ContainerEngine interface {
HealthCheckRun(ctx context.Context, nameOrID string, options HealthCheckOptions) (*define.HealthCheckResults, error) HealthCheckRun(ctx context.Context, nameOrID string, options HealthCheckOptions) (*define.HealthCheckResults, error)
Info(ctx context.Context) (*define.Info, error) Info(ctx context.Context) (*define.Info, error)
NetworkConnect(ctx context.Context, networkname string, options NetworkConnectOptions) error NetworkConnect(ctx context.Context, networkname string, options NetworkConnectOptions) error
NetworkCreate(ctx context.Context, network types.Network) (*NetworkCreateReport, error) NetworkCreate(ctx context.Context, network types.Network) (*types.Network, error)
NetworkDisconnect(ctx context.Context, networkname string, options NetworkDisconnectOptions) error NetworkDisconnect(ctx context.Context, networkname string, options NetworkDisconnectOptions) error
NetworkExists(ctx context.Context, networkname string) (*BoolReport, error) NetworkExists(ctx context.Context, networkname string) (*BoolReport, error)
NetworkInspect(ctx context.Context, namesOrIds []string, options InspectOptions) ([]types.Network, []error, error) NetworkInspect(ctx context.Context, namesOrIds []string, options InspectOptions) ([]types.Network, []error, error)

7
pkg/domain/infra/abi/network.go
View File

@ -107,12 +107,15 @@ func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, o
return reports, nil return reports, nil
} }
func (ic *ContainerEngine) NetworkCreate(ctx context.Context, network types.Network) (*entities.NetworkCreateReport, error) { func (ic *ContainerEngine) NetworkCreate(ctx context.Context, network types.Network) (*types.Network, error) {
if util.StringInSlice(network.Name, []string{"none", "host", "bridge", "private", "slirp4netns", "container", "ns"}) {
return nil, errors.Errorf("cannot create network with name %q because it conflicts with a valid network mode", network.Name)
}
network, err := ic.Libpod.Network().NetworkCreate(network) network, err := ic.Libpod.Network().NetworkCreate(network)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &entities.NetworkCreateReport{Name: network.Name}, nil return &network, nil
} }
// NetworkDisconnect removes a container from a given network // NetworkDisconnect removes a container from a given network

4
pkg/domain/infra/tunnel/network.go
View File

@ -62,12 +62,12 @@ func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, o
return reports, nil return reports, nil
} }
func (ic *ContainerEngine) NetworkCreate(ctx context.Context, net types.Network) (*entities.NetworkCreateReport, error) { func (ic *ContainerEngine) NetworkCreate(ctx context.Context, net types.Network) (*types.Network, error) {
net, err := network.Create(ic.ClientCtx, &net) net, err := network.Create(ic.ClientCtx, &net)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &entities.NetworkCreateReport{Name: net.Name}, nil return &net, nil
} }
// NetworkDisconnect removes a container from a given network // NetworkDisconnect removes a container from a given network

9
test/e2e/network_create_test.go
View File

@ -343,4 +343,13 @@ var _ = Describe("Podman network create", func() {
Expect(nc.OutputToString()).ToNot(ContainSubstring("dnsname")) Expect(nc.OutputToString()).ToNot(ContainSubstring("dnsname"))
}) })
It("podman network create with invalid name", func() {
for _, name := range []string{"none", "host", "bridge", "private", "slirp4netns", "container", "ns"} {
nc := podmanTest.Podman([]string{"network", "create", name})
nc.WaitWithDefaultTimeout()
Expect(nc).To(Exit(125))
Expect(nc.ErrorToString()).To(ContainSubstring("cannot create network with name %q because it conflicts with a valid network mode", name))
}
})
}) })