From db70e91bde90514ace510f66a1069207217a8d69 Mon Sep 17 00:00:00 2001 From: Anders F Björklund Date: Thu, 26 Nov 2020 18:05:00 +0100 Subject: Validate that the bridge option is supported MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks Luap99 for the validation suggestion Signed-off-by: Anders F Björklund --- libpod/network/create.go | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'libpod') diff --git a/libpod/network/create.go b/libpod/network/create.go index e9ab93262..094fbe349 100644 --- a/libpod/network/create.go +++ b/libpod/network/create.go @@ -173,14 +173,26 @@ func createBridge(name string, options entities.NetworkCreateOptions, runtimeCon ipMasq = false } - mtu, err := parseMTU(options.Options["mtu"]) - if err != nil { - return "", err - } + var mtu int + var vlan int + for k, v := range options.Options { + var err error + switch k { + case "mtu": + mtu, err = parseMTU(v) + if err != nil { + return "", err + } - vlan, err := parseVlan(options.Options["vlan"]) - if err != nil { - return "", err + case "vlan": + vlan, err = parseVlan(v) + if err != nil { + return "", err + } + + default: + return "", errors.Errorf("unsupported option %s", k) + } } // obtain host bridge name -- cgit v1.2.3-54-g00ecf