Skip to content

Update tests to allow chains in any order. Fixes #68. #69

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
merged 1 commit into from
Aug 12, 2020
Merged

Update tests to allow chains in any order. Fixes #68. #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 29 additions & 20 deletions command_sign_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ import (
"github.com/stretchr/testify/require"
)

func chainContains(chain []*x509.Certificate, want *x509.Certificate) bool {
for _, cert := range chain {
if cert.Equal(want) {
return true
}
}
return false
}

func TestSign(t *testing.T) {
defer testSetup(t, "--sign", "-u", certHexFingerprint(leaf.Certificate))()

Expand Down Expand Up @@ -37,8 +46,8 @@ func TestSignIncludeCertsAIA(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 2, len(certs))
Copy link
Contributor Author

@lgarron lgarron Jul 30, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that we already check the chain size, so we'll still be testing that the chains are "equal" to what is expected.

require.True(t, certs[0].Equal(aiaLeaf.Certificate))
require.True(t, certs[1].Equal(intermediate.Certificate))
require.True(t, chainContains(certs, aiaLeaf.Certificate))
require.True(t, chainContains(certs, intermediate.Certificate))
}

func TestSignIncludeCertsDefault(t *testing.T) {
Expand All @@ -57,8 +66,8 @@ func TestSignIncludeCertsDefault(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 2, len(certs))
require.True(t, certs[0].Equal(leaf.Certificate))
require.True(t, certs[1].Equal(intermediate.Certificate))
require.True(t, chainContains(certs, leaf.Certificate))
require.True(t, chainContains(certs, intermediate.Certificate))
}

func TestSignIncludeCertsMinus3(t *testing.T) {
Expand All @@ -77,8 +86,8 @@ func TestSignIncludeCertsMinus3(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 2, len(certs))
require.True(t, certs[0].Equal(leaf.Certificate))
require.True(t, certs[1].Equal(intermediate.Certificate))
require.True(t, chainContains(certs, leaf.Certificate))
require.True(t, chainContains(certs, intermediate.Certificate))
}

func TestSignIncludeCertsMinus2(t *testing.T) {
Expand All @@ -97,8 +106,8 @@ func TestSignIncludeCertsMinus2(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 2, len(certs))
require.True(t, certs[0].Equal(leaf.Certificate))
require.True(t, certs[1].Equal(intermediate.Certificate))
require.True(t, chainContains(certs, leaf.Certificate))
require.True(t, chainContains(certs, intermediate.Certificate))
}

func TestSignIncludeCertsMinus1(t *testing.T) {
Expand All @@ -117,9 +126,9 @@ func TestSignIncludeCertsMinus1(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 3, len(certs))
require.True(t, certs[0].Equal(leaf.Certificate))
require.True(t, certs[1].Equal(intermediate.Certificate))
require.True(t, certs[2].Equal(ca.Certificate))
require.True(t, chainContains(certs, leaf.Certificate))
require.True(t, chainContains(certs, intermediate.Certificate))
require.True(t, chainContains(certs, ca.Certificate))
}

func TestSignIncludeCerts0(t *testing.T) {
Expand Down Expand Up @@ -156,7 +165,7 @@ func TestSignIncludeCerts1(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 1, len(certs))
require.True(t, certs[0].Equal(leaf.Certificate))
require.True(t, chainContains(certs, leaf.Certificate))
}

func TestSignIncludeCerts2(t *testing.T) {
Expand All @@ -175,8 +184,8 @@ func TestSignIncludeCerts2(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 2, len(certs))
require.True(t, certs[0].Equal(leaf.Certificate))
require.True(t, certs[1].Equal(intermediate.Certificate))
require.True(t, chainContains(certs, leaf.Certificate))
require.True(t, chainContains(certs, intermediate.Certificate))
}

func TestSignIncludeCerts3(t *testing.T) {
Expand All @@ -195,9 +204,9 @@ func TestSignIncludeCerts3(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 3, len(certs))
require.True(t, certs[0].Equal(leaf.Certificate))
require.True(t, certs[1].Equal(intermediate.Certificate))
require.True(t, certs[2].Equal(ca.Certificate))
require.True(t, chainContains(certs, leaf.Certificate))
require.True(t, chainContains(certs, intermediate.Certificate))
require.True(t, chainContains(certs, ca.Certificate))
}

func TestSignIncludeCerts4(t *testing.T) {
Expand All @@ -216,7 +225,7 @@ func TestSignIncludeCerts4(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 3, len(certs))
require.True(t, certs[0].Equal(leaf.Certificate))
require.True(t, certs[1].Equal(intermediate.Certificate))
require.True(t, certs[2].Equal(ca.Certificate))
require.True(t, chainContains(certs, leaf.Certificate))
require.True(t, chainContains(certs, intermediate.Certificate))
require.True(t, chainContains(certs, ca.Certificate))
}