c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(tracex): internally store just the raw certificate (#787)

Browse source 
By just storing the raw certificate we simplify the internal data
structure we use. In turn, this enables us to write better unit tests
using github.com/google/go-cmp where we can construct the expected
result and compare with that. (Yeah, in principle we could also
construct the full certificate but I'm not sure it's worth the effort
since we basically only care about the raw certificate.)

The general idea here is to make tracex more tested. Once it's more
tested, I will create separate structs for each event, which is
something that measurex also does. Once that is done, we can start
ensuring that the code in measurex and the code in tracex do the
same thing in terms of storing observations. When also this is done,
we can then rewrite measurex to use tracex directly.

The overall goal is https://github.com/ooni/probe/issues/2035.
This commit is contained in:
Simone Basso 2022-06-02 11:07:02 +02:00 • committed by GitHub
commit 9354191b85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 59 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/tracex/tls_test.go
View file

@ -57,7 +57,7 @@ func TestTLSHandshakerSaver(t *testing.T) {
if value.TLSNegotiatedProto != "h2" {
t.Fatal("invalid negotiated protocol")
}
if diff := cmp.Diff(value.TLSPeerCerts, []*x509.Certificate{}); diff != "" {
if diff := cmp.Diff(value.TLSPeerCerts, [][]byte{{1, 2, 3, 4}}); diff != "" {
t.Fatal(diff)
}
if value.TLSVersion != "TLSv1.3" {
@ -79,8 +79,10 @@ func TestTLSHandshakerSaver(t *testing.T) {
returnedConnState := tls.ConnectionState{
CipherSuite: tls.TLS_RSA_WITH_RC4_128_SHA,
NegotiatedProtocol: "h2",
PeerCertificates: []*x509.Certificate{},
Version: tls.VersionTLS13,
PeerCertificates: []*x509.Certificate{{
Raw: []byte{1, 2, 3, 4},
}},
Version: tls.VersionTLS13,
}
returnedConn := &mocks.TLSConn{
MockConnectionState: func() tls.ConnectionState {
@ -200,7 +202,7 @@ func Test_tlsPeerCerts(t *testing.T) {
tests := []struct {
name string
args args
want []*x509.Certificate
want [][]byte
}{{
name: "no error",
args: args{
@ -208,7 +210,7 @@ func Test_tlsPeerCerts(t *testing.T) {
PeerCertificates: []*x509.Certificate{cert0},
},
},
want: []*x509.Certificate{cert0},
want: [][]byte{cert0.Raw},
}, {
name: "all empty",
args: args{},
@ -221,7 +223,7 @@ func Test_tlsPeerCerts(t *testing.T) {
Certificate: cert0,
},
},
want: []*x509.Certificate{cert0},
want: [][]byte{cert0.Raw},
}, {
name: "x509.UnknownAuthorityError",
args: args{
@ -230,7 +232,7 @@ func Test_tlsPeerCerts(t *testing.T) {
Cert: cert0,
},
},
want: []*x509.Certificate{cert0},
want: [][]byte{cert0.Raw},
}, {
name: "x509.CertificateInvalidError",
args: args{
@ -239,7 +241,7 @@ func Test_tlsPeerCerts(t *testing.T) {
Cert: cert0,
},
},
want: []*x509.Certificate{cert0},
want: [][]byte{cert0.Raw},
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {