mirror of
https://github.com/containers/podman.git
synced 2025-10-17 19:24:04 +08:00
455f5b7616
`go get github.com/cri-o/ocicni@deac903fd99b6c52d781c9f42b8db3af7dcfd00a` I had to fix compilation errors in libpod/networking_linux.go --- ocicni.Networks has changed from string to the structure NetAttachment with the member Name (the former string value) and the member Ifname (optional). I don't think we can make use of Ifname here, so I just map the array of structures to array of strings - e.g. dropping Ifname. --- The function GetPodNetworkStatus no longer returns Result but it returns the wrapper structure NetResult which contains the former Result plus NetAttachment (Network name and Interface name). Again, I don't think we can make use of that information here, so I just added `.Result` to fix the build. --- Issue: #1136 Signed-off-by: Jakub Filak <jakub.filak@sap.com>
52 lines
1.8 KiB
Go
52 lines
1.8 KiB
Go
// Copyright 2019 CNI authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package utils
|
|
|
|
import (
|
|
"regexp"
|
|
|
|
"github.com/containernetworking/cni/pkg/types"
|
|
)
|
|
|
|
// cniValidNameChars is the regexp used to validate valid characters in
|
|
// containerID and networkName
|
|
const cniValidNameChars = `[a-zA-Z0-9][a-zA-Z0-9_.\-]`
|
|
|
|
var cniReg = regexp.MustCompile(`^` + cniValidNameChars + `*$`)
|
|
|
|
// ValidateContainerID will validate that the supplied containerID is not empty does not contain invalid characters
|
|
func ValidateContainerID(containerID string) *types.Error {
|
|
|
|
if containerID == "" {
|
|
return types.NewError(types.ErrUnknownContainer, "missing containerID", "")
|
|
}
|
|
if !cniReg.MatchString(containerID) {
|
|
return types.NewError(types.ErrInvalidEnvironmentVariables, "invalid characters in containerID", containerID)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ValidateNetworkName will validate that the supplied networkName does not contain invalid characters
|
|
func ValidateNetworkName(networkName string) *types.Error {
|
|
|
|
if networkName == "" {
|
|
return types.NewError(types.ErrInvalidNetworkConfig, "missing network name:", "")
|
|
}
|
|
if !cniReg.MatchString(networkName) {
|
|
return types.NewError(types.ErrInvalidNetworkConfig, "invalid characters found in network name", networkName)
|
|
}
|
|
return nil
|
|
}
|