mirror of
https://github.com/ScuroNeko/mtg.git
synced 2026-08-31 10:54:02 +03:00
Move cert noise calibration into doppelganger scout
Instead of a separate cert_probe.go that duplicates the scout's TLS connection logic, measure the cert chain size directly from the same HTTPS connections the scout already makes. Changes: - Extend ScoutConnResult with payloadLen field - Add Write interception to ScoutConn for handshake boundary detection - Scout.learn() now computes cert size (sum of ApplicationData between CCS and first client Write) alongside inter-record durations - Ganger aggregates cert sizes across raids and exposes NoiseParams() via atomic pointer for lock-free reads from proxy goroutines - Proxy reads NoiseParams from Ganger on each handshake instead of probing at startup - Remove cert_probe.go, disk cache, and related config options (noise-cache-path, noise-cache-ttl, noise-probe-count) Falls back to legacy 2500-4700 range until the first scout raid completes (typically within 1-2 seconds of startup).
This commit is contained in:
@@ -12,36 +12,46 @@ import (
|
||||
"github.com/9seconds/mtg/v2/mtglib/internal/tls"
|
||||
)
|
||||
|
||||
// ScoutResult holds measurements from a single scout HTTP request.
|
||||
type ScoutResult struct {
|
||||
Durations []time.Duration
|
||||
CertSize int // total ApplicationData bytes during TLS handshake; 0 if unknown
|
||||
}
|
||||
|
||||
type Scout struct {
|
||||
network Network
|
||||
urls []string
|
||||
}
|
||||
|
||||
func (s Scout) Learn(ctx context.Context) ([]time.Duration, error) {
|
||||
var durations []time.Duration
|
||||
func (s Scout) Learn(ctx context.Context) (ScoutResult, error) {
|
||||
var combined ScoutResult
|
||||
|
||||
for _, url := range s.urls {
|
||||
learned, err := s.learn(ctx, url)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return ScoutResult{}, err
|
||||
}
|
||||
|
||||
durations = append(durations, learned...)
|
||||
combined.Durations = append(combined.Durations, learned.Durations...)
|
||||
|
||||
if learned.CertSize > 0 && combined.CertSize == 0 {
|
||||
combined.CertSize = learned.CertSize
|
||||
}
|
||||
}
|
||||
|
||||
return durations, nil
|
||||
return combined, nil
|
||||
}
|
||||
|
||||
func (s Scout) learn(ctx context.Context, url string) ([]time.Duration, error) {
|
||||
func (s Scout) learn(ctx context.Context, url string) (ScoutResult, error) {
|
||||
client, results := s.makeClient()
|
||||
|
||||
if !strings.HasPrefix(url, "https://") {
|
||||
return nil, fmt.Errorf("url %s must be https", url)
|
||||
return ScoutResult{}, fmt.Errorf("url %s must be https", url)
|
||||
}
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return ScoutResult{}, err
|
||||
}
|
||||
|
||||
resp, err := client.Do(req)
|
||||
@@ -52,10 +62,12 @@ func (s Scout) learn(ctx context.Context, url string) ([]time.Duration, error) {
|
||||
}
|
||||
|
||||
if err != nil || len(results.data) == 0 {
|
||||
return nil, err
|
||||
return ScoutResult{}, err
|
||||
}
|
||||
|
||||
durations := []time.Duration{}
|
||||
var result ScoutResult
|
||||
|
||||
// Compute inter-record durations (existing logic).
|
||||
lastTimestamp := time.Time{}
|
||||
|
||||
for i, v := range results.data {
|
||||
@@ -71,11 +83,34 @@ func (s Scout) learn(ctx context.Context, url string) ([]time.Duration, error) {
|
||||
}
|
||||
}
|
||||
|
||||
durations = append(durations, v.timestamp.Sub(lastTimestamp))
|
||||
result.Durations = append(result.Durations, v.timestamp.Sub(lastTimestamp))
|
||||
lastTimestamp = v.timestamp
|
||||
}
|
||||
|
||||
return durations, nil
|
||||
// Compute cert size: sum of ApplicationData payload between CCS and
|
||||
// the first client Write (which marks the end of server handshake).
|
||||
seenCCS := false
|
||||
boundary := results.writeIndex
|
||||
if boundary < 0 {
|
||||
boundary = len(results.data)
|
||||
}
|
||||
|
||||
for i, v := range results.data {
|
||||
if i >= boundary {
|
||||
break
|
||||
}
|
||||
|
||||
if v.recordType == tls.TypeChangeCipherSpec {
|
||||
seenCCS = true
|
||||
continue
|
||||
}
|
||||
|
||||
if seenCCS && v.recordType == tls.TypeApplicationData {
|
||||
result.CertSize += v.payloadLen
|
||||
}
|
||||
}
|
||||
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (s Scout) makeClient() (*http.Client, *ScoutConnCollected) {
|
||||
|
||||
Reference in New Issue
Block a user