Re-vendor distribution, which has better error messages for login aut…

…h errors

Signed-off-by: Ying Li <ying.li@docker.com>

cmd/notary/tuf.go

@@ -13,6 +13,8 @@ import (
 	"strings"
 	"time"
 
+	"golang.org/x/crypto/ssh/terminal"
+
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/distribution/registry/client/auth"
 	"github.com/docker/distribution/registry/client/transport"
@@ -757,7 +759,8 @@ type passwordStore struct {
 }
 
 func (ps passwordStore) Basic(u *url.URL) (string, string) {
-	if ps.anonymous {
+	// if it's not a terminal, don't wait on input
+	if ps.anonymous || !terminal.IsTerminal(int(os.Stdin.Fd())) {
 		return "", ""
 	}
 
@@ -784,6 +787,15 @@ func (ps passwordStore) Basic(u *url.URL) (string, string) {
 	return username, password
 }
 
+// to comply with the CredentialStore interface
+func (ps passwordStore) RefreshToken(u *url.URL, service string) string {
+	return ""
+}
+
+// to comply with the CredentialStore interface
+func (ps passwordStore) SetRefreshToken(u *url.URL, service string, token string) {
+}
+
 type httpAccess int
 
 const (

cmd/notary/tuf_test.go

@@ -3,10 +3,12 @@ package main
 import (
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"github.com/docker/distribution/registry/client/auth"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
@@ -219,3 +221,18 @@ func TestGetTrustPinningErrors(t *testing.T) {
 	tc.sha256 = "88b76b34ab83a9e4d5abe3697950fb73f940aab1aa5b534f80cf9de9708942be"
 	require.Error(t, tc.tufAddByHash(&cobra.Command{}, []string{"gun", "test1", "100"}))
 }
+
+func TestPasswordStore(t *testing.T) {
+	myurl, err := url.Parse("https://docker.io")
+	require.NoError(t, err)
+
+	// whether or not we're anonymous, because this isn't a terminal,
+	for _, ps := range []auth.CredentialStore{passwordStore{}, passwordStore{anonymous: true}} {
+		username, passwd := ps.Basic(myurl)
+		require.Equal(t, "", username)
+		require.Equal(t, "", passwd)
+
+		ps.SetRefreshToken(myurl, "someService", "token") // doesn't return an error, just want to make sure no state changes
+		require.Equal(t, "", ps.RefreshToken(myurl, "someService"))
+	}
+}