mirror of
https://github.com/rancher/os.git
synced 2025-04-27 19:15:23 +00:00
Fixes #2755. Allows for quoted arguments with spaces in the kernel cmdline to be parsed properly. An example command line: ``` $ cat /proc/cmdline earlyprintk=serial console=ttyS0 rancher.autologin=ttyS0 rancher.defaults.hostname=ros-vm1 rancher.defaults.network.dns.nameservers=[192.168.64.1] rancher.network.interfaces.eth0.dhcp=true rancher.network.interfaces.eth1.dhcp=false rancher.network.interfaces.eth1.address=192.168.99.11/24 rancher.state.dev=LABEL=RANCHER_STATE rancher.state.autoformat=[/dev/vda] rancher.state.formatzero cc.ssh_authorized_keys=['ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOz8mD0tRrNsHBLHD5jVgmXO26JA7eKFZrj4Ic9KR2y3qXlxU9JCYYn/qDyTCmExt8Rw6SaU/BvgU7WT3Bjsi6c=','ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJj5mkpBHBBAW5XClcB5aFTWph+VCL7I0W8gm93AT5w4','ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKfb0O2qXgIgrtD5Mj7fBYdg4jMrT7wetBbkG2e4maDsRR3AtSYjEB3NeEifM8gdvIf0gYs1BNB/Ar76agaQGeqW+Ewb2LWdypr4Ipw09yWCrC9ttVbCnHuzVLYjML0CNgpjIRC+FC5r1X1gm2LufRN4orZ1NQvNhRRWJVT37vRtHo79TecK0DKQmy87Zpj3cNiI/5iObnTk56pZWpIAEiC5hEVkcVxmdkLJs3YonWVZzmK/Y8uvFtF+GhA6Jcpc38zDQHKsOjFWvj3qbWtVEQteNDxsM2pNeXY5wdrhRn4YSdKme9Cm7CdAogIdAdPtqPIfq/jY0QczS12qFZH7zt'] ``` Results in: ``` $ sudo ros config export rancher: defaults: hostname: ros-vm1 network: dns: nameservers: - 192.168.64.1 environment: EXTRA_CMDLINE: /init AAAAC3NzaC1lZDI1NTE5AAAAIJj5mkpBHBBAW5XClcB5aFTWph+VCL7I0W8gm93AT5w4','ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKfb0O2qXgIgrtD5Mj7fBYdg4jMrT7wetBbkG2e4maDsRR3AtSYjEB3NeEifM8gdvIf0gYs1BNB/Ar76agaQGeqW+Ewb2LWdypr4Ipw09yWCrC9ttVbCnHuzVLYjML0CNgpjIRC+FC5r1X1gm2LufRN4orZ1NQvNhRRWJVT37vRtHo79TecK0DKQmy87Zpj3cNiI/5iObnTk56pZWpIAEiC5hEVkcVxmdkLJs3YonWVZzmK/Y8uvFtF+GhA6Jcpc38zDQHKsOjFWvj3qbWtVEQteNDxsM2pNeXY5wdrhRn4YSdKme9Cm7CdAogIdAdPtqPIfq/jY0QczS12qFZH7zt'] network: interfaces: eth0: dhcp: true eth1: address: 192.168.99.11/24 dhcp: false state: autoformat: - /dev/vda dev: LABEL=RANCHER_STATE formatzero: true ssh_authorized_keys: - ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOz8mD0tRrNsHBLHD5jVgmXO26JA7eKFZrj4Ic9KR2y3qXlxU9JCYYn/qDyTCmExt8Rw6SaU/BvgU7WT3Bjsi6c= - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJj5mkpBHBBAW5XClcB5aFTWph+VCL7I0W8gm93AT5w4 - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKfb0O2qXgIgrtD5Mj7fBYdg4jMrT7wetBbkG2e4maDsRR3AtSYjEB3NeEifM8gdvIf0gYs1BNB/Ar76agaQGeqW+Ewb2LWdypr4Ipw09yWCrC9ttVbCnHuzVLYjML0CNgpjIRC+FC5r1X1gm2LufRN4orZ1NQvNhRRWJVT37vRtHo79TecK0DKQmy87Zpj3cNiI/5iObnTk56pZWpIAEiC5hEVkcVxmdkLJs3YonWVZzmK/Y8uvFtF+GhA6Jcpc38zDQHKsOjFWvj3qbWtVEQteNDxsM2pNeXY5wdrhRn4YSdKme9Cm7CdAogIdAdPtqPIfq/jY0QczS12qFZH7zt ```
330 lines
9.3 KiB
Go
330 lines
9.3 KiB
Go
package config
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/rancher/os/config/cmdline"
|
|
"github.com/rancher/os/pkg/util"
|
|
|
|
yaml "github.com/cloudfoundry-incubator/candiedyaml"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestFilterKey(t *testing.T) {
|
|
assert := require.New(t)
|
|
data := map[interface{}]interface{}{
|
|
"ssh_authorized_keys": []string{"pubk1", "pubk2"},
|
|
"hostname": "ros-test",
|
|
"rancher": map[interface{}]interface{}{
|
|
"ssh": map[interface{}]interface{}{
|
|
"keys": map[interface{}]interface{}{
|
|
"dsa": "dsa-test1",
|
|
"dsa-pub": "dsa-test2",
|
|
},
|
|
},
|
|
"docker": map[interface{}]interface{}{
|
|
"ca_key": "ca_key-test3",
|
|
"ca_cert": "ca_cert-test4",
|
|
"args": []string{"args_test5"},
|
|
},
|
|
},
|
|
}
|
|
expectedFiltered := map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"ssh": map[interface{}]interface{}{
|
|
"keys": map[interface{}]interface{}{
|
|
"dsa": "dsa-test1",
|
|
"dsa-pub": "dsa-test2",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
expectedRest := map[interface{}]interface{}{
|
|
"ssh_authorized_keys": []string{"pubk1", "pubk2"},
|
|
"hostname": "ros-test",
|
|
"rancher": map[interface{}]interface{}{
|
|
"docker": map[interface{}]interface{}{
|
|
"ca_key": "ca_key-test3",
|
|
"ca_cert": "ca_cert-test4",
|
|
"args": []string{"args_test5"},
|
|
},
|
|
},
|
|
}
|
|
filtered, rest := filterKey(data, []string{"rancher", "ssh"})
|
|
assert.Equal(expectedFiltered, filtered)
|
|
assert.Equal(expectedRest, rest)
|
|
}
|
|
|
|
func TestUnmarshalOrReturnString(t *testing.T) {
|
|
assert := require.New(t)
|
|
|
|
assert.Equal("ab", cmdline.UnmarshalOrReturnString("ab"))
|
|
assert.Equal("a\nb", cmdline.UnmarshalOrReturnString("a\nb"))
|
|
assert.Equal("a\n", cmdline.UnmarshalOrReturnString("a\n"))
|
|
assert.Equal("\nb", cmdline.UnmarshalOrReturnString("\nb"))
|
|
assert.Equal("a,b", cmdline.UnmarshalOrReturnString("a,b"))
|
|
assert.Equal("a,", cmdline.UnmarshalOrReturnString("a,"))
|
|
assert.Equal(",b", cmdline.UnmarshalOrReturnString(",b"))
|
|
|
|
assert.Equal(int64(10), cmdline.UnmarshalOrReturnString("10"))
|
|
assert.Equal(true, cmdline.UnmarshalOrReturnString("true"))
|
|
assert.Equal(false, cmdline.UnmarshalOrReturnString("false"))
|
|
|
|
assert.Equal([]interface{}{"a"}, cmdline.UnmarshalOrReturnString("[a]"))
|
|
assert.Equal([]interface{}{"a"}, cmdline.UnmarshalOrReturnString("[\"a\"]"))
|
|
|
|
assert.Equal([]interface{}{"a,"}, cmdline.UnmarshalOrReturnString("[\"a,\"]"))
|
|
assert.Equal([]interface{}{" a, "}, cmdline.UnmarshalOrReturnString("[\" a, \"]"))
|
|
assert.Equal([]interface{}{",a"}, cmdline.UnmarshalOrReturnString("[\",a\"]"))
|
|
assert.Equal([]interface{}{" ,a "}, cmdline.UnmarshalOrReturnString("[\" ,a \"]"))
|
|
|
|
assert.Equal([]interface{}{"a\n"}, cmdline.UnmarshalOrReturnString("[\"a\n\"]"))
|
|
assert.Equal([]interface{}{" a\n "}, cmdline.UnmarshalOrReturnString("[\" a\n \"]"))
|
|
assert.Equal([]interface{}{"\na"}, cmdline.UnmarshalOrReturnString("[\"\na\"]"))
|
|
assert.Equal([]interface{}{" \na "}, cmdline.UnmarshalOrReturnString("[\" \na \"]"))
|
|
|
|
assert.Equal([]interface{}{"a", "b"}, cmdline.UnmarshalOrReturnString("[a,b]"))
|
|
assert.Equal([]interface{}{"a", "b"}, cmdline.UnmarshalOrReturnString("[\"a\",\"b\"]"))
|
|
|
|
assert.Equal([]interface{}{"a,", "b"}, cmdline.UnmarshalOrReturnString("[\"a,\",b]"))
|
|
assert.Equal([]interface{}{"a", ",b"}, cmdline.UnmarshalOrReturnString("[a,\",b\"]"))
|
|
assert.Equal([]interface{}{" a, ", " ,b "}, cmdline.UnmarshalOrReturnString("[\" a, \",\" ,b \"]"))
|
|
|
|
assert.Equal([]interface{}{"a\n", "b"}, cmdline.UnmarshalOrReturnString("[\"a\n\",b]"))
|
|
assert.Equal([]interface{}{"a", "\nb"}, cmdline.UnmarshalOrReturnString("[a,\"\nb\"]"))
|
|
assert.Equal([]interface{}{" a\n ", " \nb "}, cmdline.UnmarshalOrReturnString("[\" a\n \",\" \nb \"]"))
|
|
|
|
assert.Equal([]interface{}{"a", int64(10)}, cmdline.UnmarshalOrReturnString("[a,10]"))
|
|
assert.Equal([]interface{}{int64(10), "a"}, cmdline.UnmarshalOrReturnString("[10,a]"))
|
|
|
|
assert.Equal([]interface{}{"a", true}, cmdline.UnmarshalOrReturnString("[a,true]"))
|
|
assert.Equal([]interface{}{false, "a"}, cmdline.UnmarshalOrReturnString("[false,a]"))
|
|
}
|
|
|
|
func TestCmdlineParse(t *testing.T) {
|
|
assert := require.New(t)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"key1": "value1",
|
|
"key2": "value2",
|
|
},
|
|
}, cmdline.Parse("a b rancher.key1=value1 c rancher.key2=value2", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"key": "a,b",
|
|
},
|
|
}, cmdline.Parse("rancher.key=a,b", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"key": "a\nb",
|
|
},
|
|
}, cmdline.Parse("rancher.key=a\nb", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"key": "a b",
|
|
},
|
|
}, cmdline.Parse("rancher.key='a b'", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"key": "a:b",
|
|
},
|
|
}, cmdline.Parse("rancher.key=a:b", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"key": int64(5),
|
|
},
|
|
}, cmdline.Parse("rancher.key=5", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"rescue": true,
|
|
},
|
|
}, cmdline.Parse("rancher.rescue", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"keyArray": []interface{}{int64(1), int64(2)},
|
|
},
|
|
}, cmdline.Parse("rancher.keyArray=[1,2]", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"strArray": []interface{}{"url:http://192.168.1.100/cloud-config?a=b"},
|
|
},
|
|
}, cmdline.Parse("rancher.strArray=[\"url:http://192.168.1.100/cloud-config?a=b\"]", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"strArray": []interface{}{"url:http://192.168.1.100/cloud-config?a=b"},
|
|
},
|
|
}, cmdline.Parse("rancher.strArray=[url:http://192.168.1.100/cloud-config?a=b]", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"strArray": []interface{}{"part1 part2", "part3"},
|
|
},
|
|
}, cmdline.Parse("rancher.strArray=['part1 part2',part3]", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"strArray": []interface{}{"part1 part2", "part3"},
|
|
},
|
|
}, cmdline.Parse("rancher.strArray=[\"part1 part2\",part3]", false), false)
|
|
|
|
assert.Equal(map[interface{}]interface{}{
|
|
"rancher": map[interface{}]interface{}{
|
|
"strArray": []interface{}{"part1 part2", "part3"},
|
|
},
|
|
}, cmdline.Parse("rancher.strArray=[ \"part1 part2\", part3 ]", false), false)
|
|
}
|
|
|
|
func TestGet(t *testing.T) {
|
|
assert := require.New(t)
|
|
|
|
data := map[interface{}]interface{}{
|
|
"key": "value",
|
|
"rancher": map[interface{}]interface{}{
|
|
"key2": map[interface{}]interface{}{
|
|
"subkey": "subvalue",
|
|
"subnum": 42,
|
|
},
|
|
},
|
|
}
|
|
|
|
tests := map[string]interface{}{
|
|
"key": "value",
|
|
"rancher.key2.subkey": "subvalue",
|
|
"rancher.key2.subnum": 42,
|
|
"rancher.key2.subkey2": "",
|
|
"foo": "",
|
|
}
|
|
|
|
for k, v := range tests {
|
|
val, _ := cmdline.GetOrSetVal(k, data, nil)
|
|
assert.Equal(v, val)
|
|
}
|
|
}
|
|
|
|
func TestSet(t *testing.T) {
|
|
assert := require.New(t)
|
|
|
|
data := map[interface{}]interface{}{
|
|
"key": "value",
|
|
"rancher": map[interface{}]interface{}{
|
|
"key2": map[interface{}]interface{}{
|
|
"subkey": "subvalue",
|
|
"subnum": 42,
|
|
},
|
|
},
|
|
}
|
|
|
|
expected := map[interface{}]interface{}{
|
|
"key": "value2",
|
|
"rancher": map[interface{}]interface{}{
|
|
"key2": map[interface{}]interface{}{
|
|
"subkey": "subvalue2",
|
|
"subkey2": "value",
|
|
"subkey3": 43,
|
|
"subnum": 42,
|
|
},
|
|
"key3": map[interface{}]interface{}{
|
|
"subkey3": 44,
|
|
},
|
|
},
|
|
"key4": "value4",
|
|
}
|
|
|
|
tests := map[string]interface{}{
|
|
"key": "value2",
|
|
"rancher.key2.subkey": "subvalue2",
|
|
"rancher.key2.subkey2": "value",
|
|
"rancher.key2.subkey3": 43,
|
|
"rancher.key3.subkey3": 44,
|
|
"key4": "value4",
|
|
}
|
|
|
|
for k, v := range tests {
|
|
_, tData := cmdline.GetOrSetVal(k, data, v)
|
|
val, _ := cmdline.GetOrSetVal(k, tData, nil)
|
|
data = tData
|
|
assert.Equal(v, val)
|
|
}
|
|
|
|
assert.Equal(expected, data)
|
|
}
|
|
|
|
type OuterData struct {
|
|
One Data `yaml:"one"`
|
|
}
|
|
|
|
type Data struct {
|
|
Two bool `yaml:"two"`
|
|
Three bool `yaml:"three"`
|
|
}
|
|
|
|
func TestMapMerge(t *testing.T) {
|
|
assert := require.New(t)
|
|
one := `
|
|
one:
|
|
two: true`
|
|
two := `
|
|
one:
|
|
three: true`
|
|
|
|
data := map[string]map[string]bool{}
|
|
yaml.Unmarshal([]byte(one), &data)
|
|
yaml.Unmarshal([]byte(two), &data)
|
|
|
|
assert.NotNil(data["one"])
|
|
assert.True(data["one"]["three"])
|
|
assert.False(data["one"]["two"])
|
|
|
|
data2 := &OuterData{}
|
|
yaml.Unmarshal([]byte(one), data2)
|
|
yaml.Unmarshal([]byte(two), data2)
|
|
|
|
assert.True(data2.One.Three)
|
|
assert.True(data2.One.Two)
|
|
}
|
|
|
|
func TestUserDocker(t *testing.T) {
|
|
assert := require.New(t)
|
|
|
|
config := &CloudConfig{
|
|
Rancher: RancherConfig{
|
|
Docker: DockerConfig{
|
|
TLS: true,
|
|
},
|
|
},
|
|
}
|
|
|
|
bytes, err := yaml.Marshal(config)
|
|
assert.Nil(err)
|
|
|
|
config = &CloudConfig{}
|
|
assert.False(config.Rancher.Docker.TLS)
|
|
err = yaml.Unmarshal(bytes, config)
|
|
assert.Nil(err)
|
|
assert.True(config.Rancher.Docker.TLS)
|
|
|
|
data := map[interface{}]interface{}{}
|
|
err = util.Convert(config, &data)
|
|
assert.Nil(err)
|
|
|
|
val, ok := data["rancher"].(map[interface{}]interface{})["docker"]
|
|
assert.True(ok)
|
|
|
|
m, ok := val.(map[interface{}]interface{})
|
|
assert.True(ok)
|
|
v, ok := m["tls"]
|
|
assert.True(ok)
|
|
assert.True(v.(bool))
|
|
|
|
}
|