ipn/ipnlocal: log errors while fetching serial numbers

knyar · knyar · commit 94fa6d97c5a2 · 2024-10-29T14:36:08.000Z
If the client cannot fetch a serial number, write a log message helping the user understand what happened. Also, don't just return the error immediately, since we still have a chance to collect network interface addresses. Updates tailscale#5902 Signed-off-by: Anton Tolchanov <anton@tailscale.com>
diff --git a/ipn/ipnlocal/c2n.go b/ipn/ipnlocal/c2n.go
@@ -332,12 +332,10 @@ func handleC2NPostureIdentityGet(b *LocalBackend, w http.ResponseWriter, r *http
 	}
 
 	if choice.ShouldEnable(b.Prefs().PostureChecking()) {
-		sns, err := posture.GetSerialNumbers(b.logf)
+		res.SerialNumbers, err = posture.GetSerialNumbers(b.logf)
 		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
+			b.logf("c2n: GetSerialNumbers returned error: %v", err)
 		}
-		res.SerialNumbers = sns
 
 		// TODO(tailscale/corp#21371, 2024-07-10): once this has landed in a stable release
 		// and looks good in client metrics, remove this parameter and always report MAC

Original file line number	Diff line number	Diff line change
`@@ -332,12 +332,10 @@ func handleC2NPostureIdentityGet(b LocalBackend, w http.ResponseWriter, r http`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`if choice.ShouldEnable(b.Prefs().PostureChecking()) {`
`335`		`- sns, err := posture.GetSerialNumbers(b.logf)`
	`335`	`+ res.SerialNumbers, err = posture.GetSerialNumbers(b.logf)`
`336`	`336`	`if err != nil {`
`337`		`- http.Error(w, err.Error(), http.StatusInternalServerError)`
`338`		`- return`
	`337`	`+ b.logf("c2n: GetSerialNumbers returned error: %v", err)`
`339`	`338`	`}`
`340`		`- res.SerialNumbers = sns`
`341`	`339`
`342`	`340`	`// TODO(tailscale/corp#21371, 2024-07-10): once this has landed in a stable release`
`343`	`341`	`// and looks good in client metrics, remove this parameter and always report MAC`