sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-24 15:49:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

[client] Name only the refusals, not every FailedPrecondition

Browse Source 
The classifier gained a blanket FailedPrecondition -> change_refused fallback
so a refusal would stop reading as "Operation failed". It reaches too far:
the daemon returns that code for two dozen states that are not settings
refusals — "not logged in", "client is not running", "another capture is
already running", "session can no longer be extended, log in again to
reconnect" — and errorClassifier is shared with the session and connection
services, not just the settings save.

So the user was told the service had refused their change while what they
actually had to do was log in again. The two refusals the daemon composes
stay named by their message; everything else goes back to the generic
message, which says nothing rather than something wrong.

Reported by cubic on the PR.
This commit is contained in:
riccardom
2026-09-22 12:06:12 +02:00
parent 9f0d68d12d
commit 286d86d0ad
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/services/errors.go
+7 -5
View File
@@ -140,6 +140,13 @@ func (c errorClassifier) classify(err error) *ClientError {
code = "settings_managed_by_mdm"
}
// Deliberately no blanket mapping for FailedPrecondition below: the daemon
// returns it for two dozen states that are not settings refusals at all —
// "not logged in", "client is not running", "session can no longer be
// extended" — and this classifier is shared with the session and connection
// services. Only the two refusals the daemon composes are named, by their
// message.
// Fall back to the gRPC status code when the message didn't match a known
// substring — the daemon now forwards the innermost code with a clean desc
// that no longer contains the English marker text.
@@ -149,11 +156,6 @@ func (c errorClassifier) classify(err error) *ClientError {
code = "permission_denied"
case gcodes.Unavailable, gcodes.DeadlineExceeded:
code = "daemon_unreachable"
case gcodes.FailedPrecondition:
// The daemon answered and refused. The two refusals it composes
// are matched above; anything else that reaches here is still a
// refusal, so say that rather than "operation failed".
code = "change_refused"
}
}
client/ui/services/errors_test.go
+5 -4
View File
@@ -50,10 +50,11 @@ func TestErrorClassifier_Classify(t *testing.T) {
require.Equal(t, "settings_managed_by_mdm", c.classify(err).Code)
})
t.Run("any other refusal is still a refusal", func(t *testing.T) {
// FailedPrecondition means the daemon answered and declined; falling
// through to "unknown" showed "Operation failed" instead.
require.Equal(t, "change_refused", c.classify(gstatus.Error(gcodes.FailedPrecondition, "something else")).Code)
t.Run("an unrelated FailedPrecondition is not called a refusal", func(t *testing.T) {
// The daemon uses this code for states that are not settings refusals,
// and this classifier is shared with the session and connection
// services, so only the two refusals it composes are named.
require.Equal(t, "unknown", c.classify(gstatus.Error(gcodes.FailedPrecondition, "not logged in")).Code)
})
t.Run("unavailable code maps to daemon_unreachable", func(t *testing.T) {