From 2f978fe41cfe50e68799c254dfc01dbdd3bf2df8 Mon Sep 17 00:00:00 2001
From: Alec Thomas <alec@swapoff.org>
Date: Sat, 23 Sep 2023 19:23:05 +1000
Subject: [PATCH] fix: don't error if we can't access the keyring

Use of the keyring to cache credentials is just for convenience.
---
 authn/authn.go | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/authn/authn.go b/authn/authn.go
index eafc1f8a2d..6670603dc3 100644
--- a/authn/authn.go
+++ b/authn/authn.go
@@ -48,7 +48,7 @@ func GetAuthenticationHeaders(ctx context.Context, endpoint *url.URL, authentica
 	if errors.Is(err, keyring.ErrNotFound) {
 		logger.Tracef("No credentials found in keyring")
 	} else if err != nil {
-		return nil, errors.WithStack(err)
+		logger.Debugf("Failed to get credentials from keyring: %s", err)
 	} else {
 		logger.Tracef("Credentials found in keyring: %s", creds)
 		if headers, err := checkAuth(ctx, logger, endpoint, creds); err != nil {
@@ -75,24 +75,25 @@ func GetAuthenticationHeaders(ctx context.Context, endpoint *url.URL, authentica
 	}
 
 	creds = out.String()
-	if headers, err := checkAuth(ctx, logger, endpoint, creds); err != nil {
+	headers, err := checkAuth(ctx, logger, endpoint, creds)
+	if err != nil {
 		return nil, errors.WithStack(err)
-	} else if headers != nil {
-		logger.Debugf("Authenticator %s succeeded", authenticator)
-		w := &strings.Builder{}
-		for name, values := range headers {
-			for _, value := range values {
-				fmt.Fprintf(w, "%s: %s\r\n", name, value)
-			}
-		}
-		err = keyring.Set(keyringKey, usr.Name, w.String())
-		if err != nil {
-			logger.Warnf("Failed to save credentials to keyring: %s", err)
-		}
-		return headers, nil
+	} else if headers == nil {
+		return nil, nil
 	}
 
-	return nil, nil
+	logger.Debugf("Authenticator %s succeeded", authenticator)
+	w := &strings.Builder{}
+	for name, values := range headers {
+		for _, value := range values {
+			fmt.Fprintf(w, "%s: %s\r\n", name, value)
+		}
+	}
+	err = keyring.Set(keyringKey, usr.Name, w.String())
+	if err != nil {
+		logger.Debugf("Failed to save credentials to keyring: %s", err)
+	}
+	return headers, nil
 }
 
 // Check credentials and return authenticating headers if we're able to successfully authenticate.