Fix auth (google#462)

* Use github.com/docker/cli/cli/config

* Convert authn.Authenticator type

This now returns a struct instead of a string.

* Handle oauth token flow

Author: jonjohnsonjr

.gitattributes

@@ -4,3 +4,5 @@
 
 **/zz_deepcopy_generated.go linguist-generated=true
 cmd/crane/doc/crane*.md linguist-generated=true
+go.mod linguist-generated=true
+go.sum linguist-generated=true

go.mod

@@ -18,8 +18,8 @@ package authn
 type anonymous struct{}
 
 // Authorization implements Authenticator.
-func (a *anonymous) Authorization() (string, error) {
-	return "", nil
+func (a *anonymous) Authorization() (*AuthConfig, error) {
+	return &AuthConfig{}, nil
 }
 
 // Anonymous is a singleton Authenticator for providing anonymous auth.

go.sum

@@ -15,15 +15,17 @@
 package authn
 
 import (
+	"reflect"
 	"testing"
 )
 
 func TestAnonymous(t *testing.T) {
-	hdr, err := Anonymous.Authorization()
+	cfg, err := Anonymous.Authorization()
 	if err != nil {
-		t.Errorf("Authorization() = %v", err)
+		t.Fatalf("Authorization() = %v", err)
 	}
-	if hdr != "" {
-		t.Errorf("Authorization(); got %v, wanted empty string", hdr)
+	want := &AuthConfig{}
+	if !reflect.DeepEqual(cfg, want) {
+		t.Errorf("Authorization(); got %v, wanted {}", cfg)
 	}
 }

pkg/authn/anon.go

@@ -14,16 +14,17 @@
 
 package authn
 
-import (
-	"fmt"
-)
-
-// auth implements Authenticator for an "auth" entry of the docker config.
+// auth is an Authenticator that simply returns the wrapped AuthConfig.
 type auth struct {
-	token string
+	config AuthConfig
+}
+
+// FromConfig returns an Authenticator that just returns the given AuthConfig.
+func FromConfig(cfg AuthConfig) Authenticator {
+	return &auth{cfg}
 }
 
 // Authorization implements Authenticator.
-func (a *auth) Authorization() (string, error) {
-	return fmt.Sprintf("Basic %s", a.token), nil
+func (a *auth) Authorization() (*AuthConfig, error) {
+	return &a.config, nil
 }

pkg/authn/anon_test.go

@@ -14,8 +14,23 @@
 
 package authn
 
+// AuthConfig contains authorization information for connecting to a Registry
+// Inlined what we use from github.com/cli/cli/config/types
+type AuthConfig struct {
+	Username string `json:"username,omitempty"`
+	Password string `json:"password,omitempty"`
+	Auth     string `json:"auth,omitempty"`
+
+	// IdentityToken is used to authenticate the user and get
+	// an access token for the registry.
+	IdentityToken string `json:"identitytoken,omitempty"`
+
+	// RegistryToken is a bearer token to be sent to a registry
+	RegistryToken string `json:"registrytoken,omitempty"`
+}
+
 // Authenticator is used to authenticate Docker transports.
 type Authenticator interface {
 	// Authorization returns the value to use in an http transport's Authorization header.
-	Authorization() (string, error)
+	Authorization() (*AuthConfig, error)
 }

pkg/authn/auth.go

@@ -14,20 +14,16 @@
 
 package authn
 
-import (
-	"encoding/base64"
-	"fmt"
-)
-
 // Basic implements Authenticator for basic authentication.
 type Basic struct {
 	Username string
 	Password string
 }
 
 // Authorization implements Authenticator.
-func (b *Basic) Authorization() (string, error) {
-	delimited := fmt.Sprintf("%s:%s", b.Username, b.Password)
-	encoded := base64.StdEncoding.EncodeToString([]byte(delimited))
-	return fmt.Sprintf("Basic %s", encoded), nil
+func (b *Basic) Authorization() (*AuthConfig, error) {
+	return &AuthConfig{
+		Username: b.Username,
+		Password: b.Password,
+	}, nil
 }

pkg/authn/authn.go

@@ -15,18 +15,19 @@
 package authn
 
 import (
+	"reflect"
 	"testing"
 )
 
 func TestBasic(t *testing.T) {
-	anon := &Basic{Username: "foo", Password: "bar"}
+	basic := &Basic{Username: "foo", Password: "bar"}
 
-	got, err := anon.Authorization()
+	got, err := basic.Authorization()
 	if err != nil {
-		t.Errorf("Authorization() = %v", err)
+		t.Fatalf("Authorization() = %v", err)
 	}
-	want := "Basic Zm9vOmJhcg=="
-	if got != want {
+	want := &AuthConfig{Username: "foo", Password: "bar"}
+	if !reflect.DeepEqual(got, want) {
 		t.Errorf("Authorization(); got %v, want %v", got, want)
 	}
 }

pkg/authn/basic.go

@@ -14,16 +14,14 @@
 
 package authn
 
-import (
-	"fmt"
-)
-
 // Bearer implements Authenticator for bearer authentication.
 type Bearer struct {
 	Token string `json:"token"`
 }
 
 // Authorization implements Authenticator.
-func (b *Bearer) Authorization() (string, error) {
-	return fmt.Sprintf("Bearer %s", b.Token), nil
+func (b *Bearer) Authorization() (*AuthConfig, error) {
+	return &AuthConfig{
+		RegistryToken: b.Token,
+	}, nil
 }

pkg/authn/basic_test.go

@@ -21,12 +21,11 @@ import (
 func TestBearer(t *testing.T) {
 	anon := &Bearer{Token: "bazinga"}
 
-	got, err := anon.Authorization()
+	auth, err := anon.Authorization()
 	if err != nil {
 		t.Errorf("Authorization() = %v", err)
 	}
-	want := "Bearer bazinga"
-	if got != want {
+	if got, want := auth.RegistryToken, "bazinga"; got != want {
 		t.Errorf("Authorization(); got %v, want %v", got, want)
 	}
 }