Return better errors for unavailable error codes

private/buf/bufcli/errors.go

@@ -174,7 +174,9 @@ func wrapError(err error) error {
 			if dnsError := (&net.DNSError{}); errors.As(err, &dnsError) && dnsError.IsNotFound {
 				return fmt.Errorf(`%s Are you sure "%s" is a valid remote address?`, msg, dnsError.Name)
 			}
-
+			if tlsErr := wrappedTLSError(err); tlsErr != nil {
+				return fmt.Errorf("tls certificate verification: %w", tlsErr)
+			}
 			return errors.New(msg)
 		}
 		return fmt.Errorf("Failure: %s", connectErr.Message())

private/buf/bufcli/errors_tls_go119.go

@@ -0,0 +1,34 @@
+// Copyright 2020-2023 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build !go1.20
+
+package bufcli
+
+import (
+	"errors"
+	"strings"
+)
+
+// wrappedTLSError returns an unwrapped TLS error or nil if the error is another type of error.
+func wrappedTLSError(err error) error {
+	wrapped := errors.Unwrap(err)
+	if wrapped == nil {
+		return nil
+	}
+	if strings.HasPrefix(wrapped.Error(), "x509:") && strings.HasSuffix(wrapped.Error(), "certificate is not trusted") {
+		return wrapped
+	}
+	return nil
+}

private/buf/bufcli/errors_tls_go120.go

@@ -0,0 +1,30 @@
+// Copyright 2020-2023 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build go1.20
+
+package bufcli
+
+import (
+	"crypto/tls"
+	"errors"
+)
+
+// wrappedTLSError returns an unwrapped TLS error or nil if the error is another type of error.
+func wrappedTLSError(err error) error {
+	if tlsErr := (&tls.CertificateVerificationError{}); errors.As(err, &tlsErr) {
+		return tlsErr
+	}
+	return nil
+}

private/buf/cmd/buf/command/registry/registrylogin/registrylogin.go

@@ -188,6 +188,9 @@ func inner(
 	authnService := connectclient.Make(clientConfig, remote, registryv1alpha1connect.NewAuthnServiceClient)
 	resp, err := authnService.GetCurrentUser(ctx, connect.NewRequest(&registryv1alpha1.GetCurrentUserRequest{}))
 	if err != nil {
+		if connectErr := new(connect.Error); errors.As(err, &connectErr) && connectErr.Code() == connect.CodeUnavailable {
+			return connectErr
+		}
 		// We don't want to use the default error from wrapError here if the error
 		// an unauthenticated error.
 		return errors.New("invalid token provided")