3bbc43f24d
appc/cni#76 added a "dns" field in the result JSON. But before this patch, the plugins had no way of knowing which name server to return. There could be two ways of knowing which name server to return: 1. add it as an extra argument ("CNI_ARGS") 2. add it in the network configuration as a convenience (received via stdin) I chose the second way because it is easier. In the case of rkt, it means the user could just add the DNS name servers in /etc/rkt/net.d/mynetwork.conf.
168 lines
3.4 KiB
Go
168 lines
3.4 KiB
Go
// Copyright 2015 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 types
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net"
|
|
"os"
|
|
)
|
|
|
|
// like net.IPNet but adds JSON marshalling and unmarshalling
|
|
type IPNet net.IPNet
|
|
|
|
// ParseCIDR takes a string like "10.2.3.1/24" and
|
|
// return IPNet with "10.2.3.1" and /24 mask
|
|
func ParseCIDR(s string) (*net.IPNet, error) {
|
|
ip, ipn, err := net.ParseCIDR(s)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ipn.IP = ip
|
|
return ipn, nil
|
|
}
|
|
|
|
func (n IPNet) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal((*net.IPNet)(&n).String())
|
|
}
|
|
|
|
func (n *IPNet) UnmarshalJSON(data []byte) error {
|
|
var s string
|
|
if err := json.Unmarshal(data, &s); err != nil {
|
|
return err
|
|
}
|
|
|
|
tmp, err := ParseCIDR(s)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
*n = IPNet(*tmp)
|
|
return nil
|
|
}
|
|
|
|
// NetConf describes a network.
|
|
type NetConf struct {
|
|
Name string `json:"name,omitempty"`
|
|
Type string `json:"type,omitempty"`
|
|
IPAM struct {
|
|
Type string `json:"type,omitempty"`
|
|
} `json:"ipam,omitempty"`
|
|
}
|
|
|
|
// Result is what gets returned from the plugin (via stdout) to the caller
|
|
type Result struct {
|
|
IP4 *IPConfig `json:"ip4,omitempty"`
|
|
IP6 *IPConfig `json:"ip6,omitempty"`
|
|
DNS []string `json:"dns,omitempty"`
|
|
}
|
|
|
|
func (r *Result) Print() error {
|
|
return prettyPrint(r)
|
|
}
|
|
|
|
// IPConfig contains values necessary to configure an interface
|
|
type IPConfig struct {
|
|
IP net.IPNet
|
|
Gateway net.IP
|
|
Routes []Route
|
|
}
|
|
|
|
type Route struct {
|
|
Dst net.IPNet
|
|
GW net.IP
|
|
}
|
|
|
|
type Error struct {
|
|
Code uint `json:"code"`
|
|
Msg string `json:"msg"`
|
|
Details string `json:"details,omitempty"`
|
|
}
|
|
|
|
func (e *Error) Error() string {
|
|
return e.Msg
|
|
}
|
|
|
|
func (e *Error) Print() error {
|
|
return prettyPrint(e)
|
|
}
|
|
|
|
// net.IPNet is not JSON (un)marshallable so this duality is needed
|
|
// for our custom IPNet type
|
|
|
|
// JSON (un)marshallable types
|
|
type ipConfig struct {
|
|
IP IPNet `json:"ip"`
|
|
Gateway net.IP `json:"gateway,omitempty"`
|
|
Routes []Route `json:"routes,omitempty"`
|
|
}
|
|
|
|
type route struct {
|
|
Dst IPNet `json:"dst"`
|
|
GW net.IP `json:"gw,omitempty"`
|
|
}
|
|
|
|
func (c *IPConfig) MarshalJSON() ([]byte, error) {
|
|
ipc := ipConfig{
|
|
IP: IPNet(c.IP),
|
|
Gateway: c.Gateway,
|
|
Routes: c.Routes,
|
|
}
|
|
|
|
return json.Marshal(ipc)
|
|
}
|
|
|
|
func (c *IPConfig) UnmarshalJSON(data []byte) error {
|
|
ipc := ipConfig{}
|
|
if err := json.Unmarshal(data, &ipc); err != nil {
|
|
return err
|
|
}
|
|
|
|
c.IP = net.IPNet(ipc.IP)
|
|
c.Gateway = ipc.Gateway
|
|
c.Routes = ipc.Routes
|
|
return nil
|
|
}
|
|
|
|
func (r *Route) UnmarshalJSON(data []byte) error {
|
|
rt := route{}
|
|
if err := json.Unmarshal(data, &rt); err != nil {
|
|
return err
|
|
}
|
|
|
|
r.Dst = net.IPNet(rt.Dst)
|
|
r.GW = rt.GW
|
|
return nil
|
|
}
|
|
|
|
func (r *Route) MarshalJSON() ([]byte, error) {
|
|
rt := route{
|
|
Dst: IPNet(r.Dst),
|
|
GW: r.GW,
|
|
}
|
|
|
|
return json.Marshal(rt)
|
|
}
|
|
|
|
func prettyPrint(obj interface{}) error {
|
|
data, err := json.MarshalIndent(obj, "", " ")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = os.Stdout.Write(data)
|
|
return err
|
|
}
|