lock masquerade during json.Marshal

getlantern · Aug 12, 2024 · 32cdfc3 · 32cdfc3
1 parent 9369ca3
commit 32cdfc3
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/masquerade.go b/masquerade.go
@@ -1,6 +1,7 @@
 package fronted
 
 import (
+	"encoding/json"
 	"fmt"
 	"hash/crc32"
 	"net"
@@ -48,6 +49,18 @@ type masquerade struct {
 	mx         sync.RWMutex
 }
 
+func (m *masquerade) MarshalJSON() ([]byte, error) {
+	m.mx.RLock()
+	defer m.mx.RUnlock()
+	// Type alias for masquerade
+	type Alias masquerade
+	return json.Marshal(&struct {
+		*Alias
+	}{
+		Alias: (*Alias)(m),
+	})
+}
+
 func (m *masquerade) lastSucceeded() time.Time {
 	m.mx.RLock()
 	defer m.mx.RUnlock()