Skip to content

Check the returned cert index in tests, and test deduplication behaviour #237

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 2 commits into from
Apr 8, 2025
Merged

Check the returned cert index in tests, and test deduplication behaviour #237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a97c7d6
check cert index and deduplication
phbnf Apr 4, 2025
59e4061
address comments
phbnf Apr 8, 2025
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
90 changes: 63 additions & 27 deletions internal/scti/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/transparency-dev/static-ct/internal/testdata"
"github.com/transparency-dev/static-ct/internal/testonly/storage/posix"
"github.com/transparency-dev/static-ct/internal/types/rfc6962"
"github.com/transparency-dev/static-ct/internal/types/staticct"
"github.com/transparency-dev/static-ct/internal/x509util"
"github.com/transparency-dev/static-ct/storage"
"github.com/transparency-dev/static-ct/storage/bbolt"
Expand Down Expand Up @@ -429,10 +430,11 @@ func TestAddChainWhitespace(t *testing.T) {

func TestAddChain(t *testing.T) {
var tests = []struct {
descr string
chain []string
want int
err error
descr string
chain []string
want int
wantIdx uint64
err error
}{
{
descr: "leaf-only",
Expand All @@ -445,14 +447,28 @@ func TestAddChain(t *testing.T) {
want: http.StatusBadRequest,
},
{
descr: "success-without-root",
chain: []string{testdata.CertFromIntermediate, testdata.IntermediateFromRoot},
want: http.StatusOK,
descr: "success",
chain: []string{testdata.CertFromIntermediate, testdata.IntermediateFromRoot, testdata.CACertPEM},
wantIdx: 0,
want: http.StatusOK,
},
{
descr: "success",
chain: []string{testdata.CertFromIntermediate, testdata.IntermediateFromRoot, testdata.CACertPEM},
want: http.StatusOK,
descr: "success-duplicate",
chain: []string{testdata.CertFromIntermediate, testdata.IntermediateFromRoot, testdata.CACertPEM},
wantIdx: 0,
want: http.StatusOK,
},
{
descr: "success-not-duplicate",
chain: []string{testdata.TestCertPEM, testdata.CACertPEM},
wantIdx: 1,
want: http.StatusOK,
},
{
descr: "success-without-root",
chain: []string{testdata.CertFromIntermediate, testdata.IntermediateFromRoot},
wantIdx: 0,
want: http.StatusOK,
},
}

Expand Down Expand Up @@ -489,21 +505,27 @@ func TestAddChain(t *testing.T) {
if got, want := hex.EncodeToString(gotRsp.Signature), "040300067369676e6564"; got != want {
t.Errorf("resp.Signature=%s; want %s", got, want)
}
idx, err := staticct.ParseCTExtensions(gotRsp.Extensions)
if err != nil {
t.Errorf("Failed to parse extensions %q: %v", gotRsp.Extensions, err)
}
if got, want := idx, test.wantIdx; got != want {
t.Errorf("resp.Extensions.Index=%d; want %d", got, want)
}
// TODO(phboneff): read from the log and compare values
// TODO(phboneff): add a test with a backend write failure
// TODO(phboneff): check that the index is in the SCT
// TODO(phboneff): add duplicate tests
}
})
}
}

func TestAddPreChain(t *testing.T) {
var tests = []struct {
descr string
chain []string
want int
err error
descr string
chain []string
want int
wantIdx uint64
err error
}{
{
descr: "leaf-signed-by-different",
Expand All @@ -516,19 +538,28 @@ func TestAddPreChain(t *testing.T) {
want: http.StatusBadRequest,
},
{
descr: "success",
chain: []string{testdata.PrecertPEMValid, testdata.CACertPEM},
want: http.StatusOK,
descr: "success",
chain: []string{testdata.PrecertPEMValid, testdata.CACertPEM},
want: http.StatusOK,
wantIdx: 0,
},
{
descr: "success-with-intermediate",
chain: []string{testdata.PreCertFromIntermediate, testdata.IntermediateFromRoot, testdata.CACertPEM},
want: http.StatusOK,
descr: "success-duplicate",
chain: []string{testdata.PrecertPEMValid, testdata.CACertPEM},
want: http.StatusOK,
wantIdx: 0,
},
{
descr: "success-without-root",
chain: []string{testdata.PrecertPEMValid},
want: http.StatusOK,
descr: "success-with-intermediate",
chain: []string{testdata.PreCertFromIntermediate, testdata.IntermediateFromRoot, testdata.CACertPEM},
want: http.StatusOK,
wantIdx: 1,
},
{
descr: "success-without-root",
chain: []string{testdata.PrecertPEMValid},
want: http.StatusOK,
wantIdx: 0,
},
}

Expand Down Expand Up @@ -565,10 +596,15 @@ func TestAddPreChain(t *testing.T) {
if got, want := hex.EncodeToString(gotRsp.Signature), "040300067369676e6564"; got != want {
t.Errorf("resp.Signature=%s; want %s", got, want)
}
idx, err := staticct.ParseCTExtensions(gotRsp.Extensions)
if err != nil {
t.Errorf("Failed to parse extensions %q: %v", gotRsp.Extensions, err)
}
if got, want := idx, test.wantIdx; got != want {
t.Errorf("resp.Extensions.Index=%d; want %d", got, want)
}
// TODO(phboneff): read from the log and compare values
// TODO(phboneff): add a test with a backend write failure
// TODO(phboneff): check that the index is in the SCT
// TODO(phboneff): add duplicate tests
}
})
}
Expand Down
Loading