Skip to content

pkg/asset/installconfig/ssh: Discover ~/.ssh/*.pub #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Sep 4, 2018
Merged

pkg/asset/installconfig/ssh: Discover ~/.ssh/*.pub #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfe4048
installer/pkg/validate: Move the pkg/asset/tls dep to validate_test
wking Sep 2, 2018
b598764
pkg/asset/installconfig/ssh: Discover ~/.ssh/*.pub
wking Sep 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion installer/pkg/validate/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_test(
name = "go_default_test",
size = "small",
srcs = ["validate_test.go"],
srcs = [
"last_ip_test.go",
"validate_test.go",
],
embed = [":go_default_library"],
deps = ["//pkg/asset/tls:go_default_library"],
)
Expand Down
49 changes: 49 additions & 0 deletions installer/pkg/validate/last_ip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package validate

import (
"net"
"testing"
)

func TestLastIP(t *testing.T) {
cases := []struct {
in net.IPNet
out net.IP
}{
{
in: net.IPNet{
IP: net.ParseIP("192.168.0.0").To4(),
Mask: net.CIDRMask(24, 32),
},
out: net.ParseIP("192.168.0.255"),
},
{
in: net.IPNet{
IP: net.ParseIP("192.168.0.0").To4(),
Mask: net.CIDRMask(22, 32),
},
out: net.ParseIP("192.168.3.255"),
},
{
in: net.IPNet{
IP: net.ParseIP("192.168.0.0").To4(),
Mask: net.CIDRMask(32, 32),
},
out: net.ParseIP("192.168.0.0"),
},
{
in: net.IPNet{
IP: net.ParseIP("0.0.0.0").To4(),
Mask: net.CIDRMask(0, 32),
},
out: net.ParseIP("255.255.255.255"),
},
}

var out net.IP
for i, c := range cases {
if out = lastIP(&c.in); out.String() != c.out.String() {
t.Errorf("test case %d: expected %s but got %s", i, c.out, out)
}
}
}
91 changes: 24 additions & 67 deletions installer/pkg/validate/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package validate
package validate_test

import (
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
"io/ioutil"
"net"
"os"
"strings"
"testing"

"github.com/openshift/installer/installer/pkg/validate"
"github.com/openshift/installer/pkg/asset/tls"
)

Expand Down Expand Up @@ -46,7 +46,7 @@ func TestNonEmpty(t *testing.T) {
{".", ""},
{"日本語", ""},
}
runTests(t, "NonEmpty", NonEmpty, tests)
runTests(t, "NonEmpty", validate.NonEmpty, tests)
}

func TestInt(t *testing.T) {
Expand All @@ -64,7 +64,7 @@ func TestInt(t *testing.T) {
{"999999", ""},
{"-1", ""},
}
runTests(t, "Int", Int, tests)
runTests(t, "Int", validate.Int, tests)
}

func TestIntRange(t *testing.T) {
Expand All @@ -88,7 +88,7 @@ func TestIntRange(t *testing.T) {
}

for _, test := range tests {
err := IntRange(test.in, test.min, test.max)
err := validate.IntRange(test.in, test.min, test.max)
if (err == nil && test.expected != "") || (err != nil && err.Error() != test.expected) {
t.Errorf("For IntRange(%q, %v, %v), expected %q, got %q", test.in, test.min, test.max, test.expected, err)
}
Expand All @@ -109,7 +109,7 @@ func TestIntOdd(t *testing.T) {
{"1 abc", invalidIntMsg},
{"日本語", invalidIntMsg},
}
runTests(t, "IntOdd", IntOdd, tests)
runTests(t, "IntOdd", validate.IntOdd, tests)
}

func TestClusterName(t *testing.T) {
Expand Down Expand Up @@ -145,7 +145,7 @@ func TestClusterName(t *testing.T) {
{maxSizeSegment + ".abc", ""},
{maxSizeSegment + "a.abc", segmentLengthMsg},
}
runTests(t, "ClusterName", ClusterName, tests)
runTests(t, "ClusterName", validate.ClusterName, tests)
}

func TestAWSClusterName(t *testing.T) {
Expand Down Expand Up @@ -174,7 +174,7 @@ func TestAWSClusterName(t *testing.T) {
{"12345678901234567890123456789", lengthMsg},
{"A2345678901234567890123456789", lengthMsg},
}
runTests(t, "AWSClusterName", AWSClusterName, tests)
runTests(t, "AWSClusterName", validate.AWSClusterName, tests)
}

func TestMAC(t *testing.T) {
Expand All @@ -189,7 +189,7 @@ func TestMAC(t *testing.T) {
{"12:34:45:78:9X:YZ", invalidMsg},
{"12.34.45.78.9A.BC", invalidMsg},
}
runTests(t, "MAC", MAC, tests)
runTests(t, "MAC", validate.MAC, tests)
}

func TestIPv4(t *testing.T) {
Expand All @@ -203,7 +203,7 @@ func TestIPv4(t *testing.T) {
{"1.2.3.a", invalidIPMsg},
{"255.255.255.255", ""},
}
runTests(t, "IPv4", IPv4, tests)
runTests(t, "IPv4", validate.IPv4, tests)
}

func TestSubnetCIDR(t *testing.T) {
Expand Down Expand Up @@ -234,7 +234,7 @@ func TestSubnetCIDR(t *testing.T) {
{"255.255.255.255/1", ""},
{"255.255.255.255/32", ""},
}
runTests(t, "SubnetCIDR", SubnetCIDR, tests)
runTests(t, "SubnetCIDR", validate.SubnetCIDR, tests)
}

func TestAWSsubnetCIDR(t *testing.T) {
Expand All @@ -250,7 +250,7 @@ func TestAWSsubnetCIDR(t *testing.T) {
{"1.2.3.4/28", ""},
{"1.2.3.4/29", awsNetmaskSizeMsg},
}
runTests(t, "AWSSubnetCIDR", AWSSubnetCIDR, tests)
runTests(t, "AWSSubnetCIDR", validate.AWSSubnetCIDR, tests)
}

func TestDomainName(t *testing.T) {
Expand Down Expand Up @@ -279,7 +279,7 @@ func TestDomainName(t *testing.T) {
{".abc.com", invalidDomainMsg},
{".abc.com", invalidDomainMsg},
}
runTests(t, "DomainName", DomainName, tests)
runTests(t, "DomainName", validate.DomainName, tests)
}

func TestHost(t *testing.T) {
Expand Down Expand Up @@ -308,7 +308,7 @@ func TestHost(t *testing.T) {
{".abc.com", invalidHostMsg},
{".abc.com", invalidHostMsg},
}
runTests(t, "Host", Host, tests)
runTests(t, "Host", validate.Host, tests)
}

func TestPort(t *testing.T) {
Expand All @@ -325,7 +325,7 @@ func TestPort(t *testing.T) {
{"65535", ""},
{"65536", invalidPortMsg},
}
runTests(t, "Port", Port, tests)
runTests(t, "Port", validate.Port, tests)
}

func TestHostPort(t *testing.T) {
Expand All @@ -345,7 +345,7 @@ func TestHostPort(t *testing.T) {
{"1.2.3.4:abc", invalidPortMsg},
{"日本語:1234", invalidHostMsg},
}
runTests(t, "HostPort", HostPort, tests)
runTests(t, "HostPort", validate.HostPort, tests)
}

func TestEmail(t *testing.T) {
Expand All @@ -369,7 +369,7 @@ func TestEmail(t *testing.T) {
{"[email protected]", invalidDomainMsg},
{"@abc.com", invalidMsg},
}
runTests(t, "Email", Email, tests)
runTests(t, "Email", validate.Email, tests)
}

func TestCertificate(t *testing.T) {
Expand Down Expand Up @@ -426,7 +426,7 @@ func TestCertificate(t *testing.T) {
{"-----BEGIN CERTIFICATE-----\na\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\na\n-----END CERTIFICATE-----", badPem},
{string(keyinPem), privateKeyMsg},
}
runTests(t, "Certificate", Certificate, tests)
runTests(t, "Certificate", validate.Certificate, tests)
}

func TestPrivateKey(t *testing.T) {
Expand Down Expand Up @@ -463,7 +463,7 @@ func TestPrivateKey(t *testing.T) {
{"-----BEGIN RSA PRIVATE KEY-----\na\n-----END RSA PRIVATE KEY-----\n-----BEGIN CERTIFICATE-----\na\n-----END CERTIFICATE-----", invalidMsg},
{"-----BEGIN CERTIFICATE-----\na\n-----END CERTIFICATE-----", invalidMsg},
}
runTests(t, "PrivateKey", PrivateKey, tests)
runTests(t, "PrivateKey", validate.PrivateKey, tests)
}

func TestOpenSSHPublicKey(t *testing.T) {
Expand All @@ -489,7 +489,7 @@ func TestOpenSSHPublicKey(t *testing.T) {
{"-----BEGIN CERTIFICATE-----abcd-----END CERTIFICATE-----", invalidMsg},
{"-----BEGIN RSA PRIVATE KEY-----\nabc\n-----END RSA PRIVATE KEY-----", privateKeyMsg},
}
runTests(t, "OpenSSHPublicKey", OpenSSHPublicKey, tests)
runTests(t, "OpenSSHPublicKey", validate.OpenSSHPublicKey, tests)
}

func TestCIDRsDontOverlap(t *testing.T) {
Expand Down Expand Up @@ -526,7 +526,7 @@ func TestCIDRsDontOverlap(t *testing.T) {
}

for i, c := range cases {
if err := CIDRsDontOverlap(c.a, c.b); (err != nil) != c.err {
if err := validate.CIDRsDontOverlap(c.a, c.b); (err != nil) != c.err {
no := "no"
if c.err {
no = "an"
Expand All @@ -536,49 +536,6 @@ func TestCIDRsDontOverlap(t *testing.T) {
}
}

func TestLastIP(t *testing.T) {
cases := []struct {
in net.IPNet
out net.IP
}{
{
in: net.IPNet{
IP: net.ParseIP("192.168.0.0").To4(),
Mask: net.CIDRMask(24, 32),
},
out: net.ParseIP("192.168.0.255"),
},
{
in: net.IPNet{
IP: net.ParseIP("192.168.0.0").To4(),
Mask: net.CIDRMask(22, 32),
},
out: net.ParseIP("192.168.3.255"),
},
{
in: net.IPNet{
IP: net.ParseIP("192.168.0.0").To4(),
Mask: net.CIDRMask(32, 32),
},
out: net.ParseIP("192.168.0.0"),
},
{
in: net.IPNet{
IP: net.ParseIP("0.0.0.0").To4(),
Mask: net.CIDRMask(0, 32),
},
out: net.ParseIP("255.255.255.255"),
},
}

var out net.IP
for i, c := range cases {
if out = lastIP(&c.in); out.String() != c.out.String() {
t.Errorf("test case %d: expected %s but got %s", i, c.out, out)
}
}
}

func TestJSONFile(t *testing.T) {
cases := []struct {
buf []byte
Expand Down Expand Up @@ -617,7 +574,7 @@ func TestJSONFile(t *testing.T) {
if _, err := f.Write(c.buf); err != nil {
t.Errorf("test case %d: failed to write to temporary file: %v", i, err)
}
if err := JSONFile(f.Name()); (err != nil) != c.err {
if err := validate.JSONFile(f.Name()); (err != nil) != c.err {
no := "no"
if c.err {
no = "an"
Expand All @@ -644,7 +601,7 @@ func TestFileExists(t *testing.T) {
},
}
for i, c := range cases {
if err := FileExists(c.path); (err != nil) != c.err {
if err := validate.FileExists(c.path); (err != nil) != c.err {
no := "no"
if c.err {
no = "an"
Expand Down Expand Up @@ -692,7 +649,7 @@ func TestFileHeader(t *testing.T) {
t.Errorf("test case %d: failed to write to temporary file: %v", i, err)
}
f.Close()
if err := FileHeader(f.Name(), c.expected); (err != nil) != c.err {
if err := validate.FileHeader(f.Name(), c.expected); (err != nil) != c.err {
no := "no"
if c.err {
no = "an"
Expand Down
2 changes: 2 additions & 0 deletions pkg/asset/installconfig/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ go_library(
"doc.go",
"installconfig.go",
"platform.go",
"ssh.go",
"stock.go",
],
importpath = "github.com/openshift/installer/pkg/asset/installconfig",
visibility = ["//visibility:public"],
deps = [
"//installer/pkg/validate:go_default_library",
"//pkg/asset:go_default_library",
"//pkg/types:go_default_library",
"//vendor/github.com/ghodss/yaml:go_default_library",
Expand Down
Loading