Skip to content

Building 70 Projects ranging from beginner to advanced so anyone can β€” learn from, build upon, use as a reference, or even copy directly. Owned by my cybersecurity company πŸ‘‡

fix(khaos): the authority's serve goroutines raced its own shutdown

CarterPerez-deve4287d850e15
diff --git a/PROJECTS/intermediate/chaos-engineering-tool/internal/pki/server.go b/PROJECTS/intermediate/chaos-engineering-tool/internal/pki/server.go
index 987c29d6..a1006c1f 100644
--- a/PROJECTS/intermediate/chaos-engineering-tool/internal/pki/server.go
+++ b/PROJECTS/intermediate/chaos-engineering-tool/internal/pki/server.go
@@ -102,21 +102,26 @@ func (a *Authority) Listen(addr string) error {
return fmt.Errorf(errBindFailed, ErrListener, addr, err)
}
- a.listener.revocation = listener
- a.listener.revSrv = &http.Server{
+ server := &http.Server{
Handler: a.routes(),
ReadHeaderTimeout: readHeaderTimeout,
}
+ a.listener.revocation = listener
+ a.listener.revSrv = server
+
if a.listener.base == "" {
a.listener.base = schemeHTTP + listener.Addr().String()
}
a.listener.wg.Add(1)
+ // The goroutine serves the LOCAL, not the field. Reading a.listener.revSrv
+ // in here is a data race against shutdown, which nils it under the mutex
+ // this goroutine does not hold, and `go test -race` catches it.
go func() {
defer a.listener.wg.Done()
- _ = a.listener.revSrv.Serve(listener)
+ _ = server.Serve(listener)
}()
return nil
@@ -143,8 +148,7 @@ func (a *Authority) ListenTLS(addr string) error {
return fmt.Errorf(errBindFailed, ErrListener, addr, err)
}
- a.listener.dependency = listener
- a.listener.depSrv = &http.Server{
+ server := &http.Server{
Handler: a.dependencyRoutes(),
ReadHeaderTimeout: readHeaderTimeout,
TLSConfig: &tls.Config{
@@ -153,11 +157,15 @@ func (a *Authority) ListenTLS(addr string) error {
},
}
+ a.listener.dependency = listener
+ a.listener.depSrv = server
+
a.listener.wg.Add(1)
+ // Serves the LOCAL, for the same reason Listen does.
go func() {
defer a.listener.wg.Done()
- _ = a.listener.depSrv.ServeTLS(listener, "", "")
+ _ = server.ServeTLS(listener, "", "")
}()
return nil