Skip to content

Commit

Permalink
use two structs
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe Williams committed Aug 4, 2020
1 parent 582ed8e commit 2415008
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 54 deletions.
4 changes: 2 additions & 2 deletions v2/examples/spiffe-grpc/client/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ func main() {
serverID := spiffeid.Must("example.org", "server")

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
log.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
log.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
4 changes: 2 additions & 2 deletions v2/examples/spiffe-grpc/server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ func main() {
clientID := spiffeid.Must("example.org", "client")

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
log.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
log.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
4 changes: 2 additions & 2 deletions v2/examples/spiffe-http/client/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ func main() {
serverID := spiffeid.Must("example.org", "server")

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
log.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
log.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
4 changes: 2 additions & 2 deletions v2/examples/spiffe-http/server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ func main() {
clientID := spiffeid.Must("example.org", "client")

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
log.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
log.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
4 changes: 2 additions & 2 deletions v2/examples/spiffe-jwt-using-proxy/proxy/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ func main() {
http.HandleFunc("/", handler(proxy))

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
log.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
log.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
4 changes: 2 additions & 2 deletions v2/examples/spiffe-jwt-using-proxy/server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ func main() {
http.Handle("/", auth.authenticateClient(http.HandlerFunc(index)))

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
log.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
log.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
4 changes: 2 additions & 2 deletions v2/examples/spiffe-jwt/server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ func main() {
defer x509Source.Close()

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
log.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
log.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
4 changes: 2 additions & 2 deletions v2/federation/examples_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ func ExampleHandler_sPIFFEAuth() {
defer bundleSource.Close()

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
log.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
log.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
4 changes: 2 additions & 2 deletions v2/internal/test/fakebundleendpoint/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ func WithTestBundles(bundles ...*spiffebundle.Bundle) ServerOption {

func WithSPIFFEAuth(bundle *spiffebundle.Bundle, svid *x509svid.SVID) ServerOption {
localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
6 changes: 3 additions & 3 deletions v2/spiffetls/tlsconfig/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,13 @@ func WrapVerifyPeerCertificate(wrapped func([][]byte, [][]*x509.Certificate) err
func getTLSCertificate(svid x509svid.Source, trace Trace) (*tls.Certificate, error) {
start := time.Now()
if trace.GetTLSCertificateStart != nil {
trace.GetTLSCertificateStart(GetTLSCertificate{Start: start})
trace.GetTLSCertificateStart(GetTLSCertificateStart{Start: start})
}

s, err := svid.GetX509SVID()
if err != nil {
if trace.GetTLSCertificateEnd != nil {
trace.GetTLSCertificateEnd(GetTLSCertificate{Start: start, End: time.Now(), Err: err})
trace.GetTLSCertificateEnd(GetTLSCertificateEnd{Start: start, End: time.Now(), Err: err})
return nil, err
}
}
Expand All @@ -198,7 +198,7 @@ func getTLSCertificate(svid x509svid.Source, trace Trace) (*tls.Certificate, err
}

if trace.GetTLSCertificateEnd != nil {
trace.GetTLSCertificateEnd(GetTLSCertificate{Start: start, End: time.Now(), Cert: cert})
trace.GetTLSCertificateEnd(GetTLSCertificateEnd{Start: start, End: time.Now(), Cert: cert})
}

return cert, nil
Expand Down
52 changes: 26 additions & 26 deletions v2/spiffetls/tlsconfig/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ func TestMTLSClientConfig(t *testing.T) {
svid := &x509svid.SVID{}

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand All @@ -89,10 +89,10 @@ func TestHookMTLSClientConfig(t *testing.T) {
config := createTestTLSConfig(base)

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand All @@ -115,10 +115,10 @@ func TestMTLSWebClientConfig(t *testing.T) {
roots := x509.NewCertPool()

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand All @@ -142,10 +142,10 @@ func TestHookMTLSWebClientConfig(t *testing.T) {
roots := x509.NewCertPool()

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand All @@ -168,10 +168,10 @@ func TestTLSServerConfig(t *testing.T) {
svid := &x509svid.SVID{}

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand All @@ -194,10 +194,10 @@ func TestHookTLSServerConfig(t *testing.T) {
config := createTestTLSConfig(base)

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand All @@ -221,10 +221,10 @@ func TestMTLSServerConfig(t *testing.T) {
svid := &x509svid.SVID{}

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand All @@ -249,10 +249,10 @@ func TestHookMTLSServerConfig(t *testing.T) {
config := createTestTLSConfig(base)

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down Expand Up @@ -337,10 +337,10 @@ func TestGetCertificate(t *testing.T) {
}

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down Expand Up @@ -394,10 +394,10 @@ func TestGetClientCertificate(t *testing.T) {
}

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down Expand Up @@ -568,10 +568,10 @@ func TestTLSHandshake(t *testing.T) {
bundle3 := ca3.Bundle()

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down Expand Up @@ -643,10 +643,10 @@ func TestMTLSHandshake(t *testing.T) {
client3SVID := ca3.CreateX509SVID(svid3ID)

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down Expand Up @@ -734,10 +734,10 @@ func TestMTLSWebHandshake(t *testing.T) {
client3SVID := ca3.CreateX509SVID(svid3ID)

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
8 changes: 4 additions & 4 deletions v2/spiffetls/tlsconfig/examples_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ func ExampleMTLSServerConfig_fileSource() {
}

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand All @@ -54,10 +54,10 @@ func ExampleMTLSServerConfig_workloadAPISource() {
defer source.Close()

localTrace := tlsconfig.Trace{
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateStart: func(tlsconfig.GetTLSCertificateStart) {
fmt.Printf("got start of GetTLSCertificate\n")
},
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificate) {
GetTLSCertificateEnd: func(tlsconfig.GetTLSCertificateEnd) {
fmt.Printf("got end of GetTLSCertificate\n")
},
}
Expand Down
13 changes: 10 additions & 3 deletions v2/spiffetls/tlsconfig/trace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,21 @@ import (
"time"
)

type GetTLSCertificate struct {
type GetTLSCertificateStart struct {
Start time.Time
End time.Time
Cert *tls.Certificate
Err error
}

type GetTLSCertificateEnd struct {
Start time.Time
End time.Time
Cert *tls.Certificate
Err error
}

type Trace struct {
GetTLSCertificateStart func(GetTLSCertificate)
GetTLSCertificateEnd func(GetTLSCertificate)
GetTLSCertificateStart func(GetTLSCertificateStart)
GetTLSCertificateEnd func(GetTLSCertificateEnd)
}

0 comments on commit 2415008

Please sign in to comment.