Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(enginenetx): gracefully handle more nil cases #1316

Merged
merged 2 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/enginenetx/statsmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func statsContainerRemoveOldEntries(input *statsContainer) (output *statsContain
// At the name implies, this function MUST be called while holding the [*statsManager] mutex.
func (c *statsContainer) GetStatsTacticLocked(tactic *httpsDialerTactic) (*statsTactic, bool) {
domainEpntRecord, found := c.DomainEndpoints[tactic.domainEndpointKey()]
if !found {
if !found || domainEpntRecord == nil {
return nil, false
}
tacticRecord, found := domainEpntRecord.Tactics[tactic.tacticSummaryKey()]
Expand Down
27 changes: 27 additions & 0 deletions internal/enginenetx/statsmanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1016,3 +1016,30 @@ func TestStatsSafeIncrementMapStringInt64(t *testing.T) {
}
})
}

func TestStatsContainer(t *testing.T) {
t.Run("GetStatsTacticLocked", func(t *testing.T) {
t.Run("is robust with respect to c.DomainEndpoints containing a nil entry", func(t *testing.T) {
sc := &statsContainer{
DomainEndpoints: map[string]*statsDomainEndpoint{
"api.ooni.io:443": nil,
},
Version: statsContainerVersion,
}
tactic := &httpsDialerTactic{
Address: "162.55.247.208",
InitialDelay: 0,
Port: "443",
SNI: "www.example.com",
VerifyHostname: "api.ooni.io",
}
record, good := sc.GetStatsTacticLocked(tactic)
if good {
t.Fatal("expected not good")
}
if record != nil {
t.Fatal("expected nil")
}
})
})
}
31 changes: 16 additions & 15 deletions internal/enginenetx/statspolicy.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (p *statsPolicy) LookupTactics(ctx context.Context, domain string, port str
}

// give priority to what we know from stats
for _, t := range p.statsLookupTactics(domain, port) {
for _, t := range statsPolicyPostProcessTactics(p.Stats.LookupTactics(domain, port)) {
maybeEmitTactic(t)
}

Expand All @@ -73,39 +73,40 @@ func (p *statsPolicy) LookupTactics(ctx context.Context, domain string, port str
return out
}

func (p *statsPolicy) statsLookupTactics(domain string, port string) (out []*httpsDialerTactic) {

// obtain information from the stats--here the result may be false if the
// stats do not contain any information about the domain and port
tactics, good := p.Stats.LookupTactics(domain, port)
func statsPolicyPostProcessTactics(tactics []*statsTactic, good bool) (out []*httpsDialerTactic) {
// when good is false, it means p.Stats.LookupTactics failed
if !good {
return
}

// successRate is a convenience function for computing the success rate
successRate := func(t *statsTactic) (rate float64) {
if t.CountStarted > 0 {
// nilSafeSuccessRate is a convenience function for computing the success rate
// which returns zero as the success rate if CountStarted is zero
//
// for robustness, be paranoid about nils here because the stats are
// written on the disk and a user could potentially edit them
nilSafeSuccessRate := func(t *statsTactic) (rate float64) {
if t != nil && t.CountStarted > 0 {
rate = float64(t.CountSuccess) / float64(t.CountStarted)
}
return
}

// Implementation note: the function should implement the "less" semantics
// but we want descending sorting not ascending, so we're using a "more" semantics
// Implementation note: the function should implement the "less" semantics for
// ascending sorting, but we want descending sorting, so we use `>` instead
sort.SliceStable(tactics, func(i, j int) bool {
// TODO(bassosimone): should we also consider the number of samples
// we have and how recent a sample is?
return successRate(tactics[i]) > successRate(tactics[j])
return nilSafeSuccessRate(tactics[i]) > nilSafeSuccessRate(tactics[j])
})

for _, t := range tactics {
// make sure we only include samples with 1+ successes; we don't want this policy
// to return what we already know it's not working and it will be the purpose of the
// fallback policy to generate new tactics to test
//
// additionally, as a precautionary and defensive measure, make sure t.Tactic
// is not nil before adding the real tactic to the return list
if t.CountSuccess > 0 && t.Tactic != nil {
// additionally, as a precautionary and defensive measure, make sure t and t.Tactic
// are not nil before adding a malformed tactic to the return list
if t != nil && t.CountSuccess > 0 && t.Tactic != nil {
out = append(out, t.Tactic)
}
}
Expand Down
41 changes: 41 additions & 0 deletions internal/enginenetx/statspolicy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/ooni/probe-cli/v3/internal/netemx"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/runtimex"
"github.com/ooni/probe-cli/v3/internal/testingx"
)

func TestStatsPolicyWorkingAsIntended(t *testing.T) {
Expand Down Expand Up @@ -314,3 +315,43 @@ var _ httpsDialerPolicy = &mocksPolicy{}
func (p *mocksPolicy) LookupTactics(ctx context.Context, domain string, port string) <-chan *httpsDialerTactic {
return p.MockLookupTactics(ctx, domain, port)
}

func TestStatsPolicyPostProcessTactics(t *testing.T) {
t.Run("we do nothing when good is false", func(t *testing.T) {
tactics := statsPolicyPostProcessTactics(nil, false)
if len(tactics) != 0 {
t.Fatal("expected zero-lenght return value")
}
})

t.Run("we filter out cases in which t or t.Tactic are nil", func(t *testing.T) {
expected := &statsTactic{}
ff := &testingx.FakeFiller{}
ff.Fill(&expected)

input := []*statsTactic{nil, {
CountStarted: 0,
CountTCPConnectError: 0,
CountTCPConnectInterrupt: 0,
CountTLSHandshakeError: 0,
CountTLSHandshakeInterrupt: 0,
CountTLSVerificationError: 0,
CountSuccess: 0,
HistoTCPConnectError: map[string]int64{},
HistoTLSHandshakeError: map[string]int64{},
HistoTLSVerificationError: map[string]int64{},
LastUpdated: time.Time{},
Tactic: nil,
}, nil, expected}

got := statsPolicyPostProcessTactics(input, true)

if len(got) != 1 {
t.Fatal("expected just one element")
}

if diff := cmp.Diff(expected.Tactic, got[0]); diff != "" {
t.Fatal(diff)
}
})
}