vendor: update all dependencies to latest versions

2017-09-30 15:27:27 +01:00
parent 911d121bb9
commit b017fcfe9a
3048 changed files with 537055 additions and 189679 deletions
@@ -15,24 +15,90 @@
 package internal

 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"time"

 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 )

-// ServiceAcctTokenSource reads a JWT config from filename and returns
+// Creds returns credential information obtained from DialSettings, or if none, then
+// it returns default credential information.
+func Creds(ctx context.Context, ds *DialSettings) (*google.DefaultCredentials, error) {
+	if ds.CredentialsFile != "" {
+		return credFileTokenSource(ctx, ds.CredentialsFile, ds.Scopes...)
+	}
+	if ds.TokenSource != nil {
+		return &google.DefaultCredentials{TokenSource: ds.TokenSource}, nil
+	}
+	return google.FindDefaultCredentials(ctx, ds.Scopes...)
+}
+
+// credFileTokenSource reads a refresh token file or a service account and returns
 // a TokenSource constructed from the config.
-func ServiceAcctTokenSource(ctx context.Context, filename string, scope ...string) (oauth2.TokenSource, error) {
+func credFileTokenSource(ctx context.Context, filename string, scope ...string) (*google.DefaultCredentials, error) {
 	data, err := ioutil.ReadFile(filename)
 	if err != nil {
-		return nil, fmt.Errorf("cannot read service account file: %v", err)
+		return nil, fmt.Errorf("cannot read credentials file: %v", err)
 	}
+	// See if it is a refresh token credentials file first.
+	ts, ok, err := refreshTokenTokenSource(ctx, data, scope...)
+	if err != nil {
+		return nil, err
+	}
+	if ok {
+		return &google.DefaultCredentials{
+			TokenSource: ts,
+			JSON:        data,
+		}, nil
+	}
+
+	// If not, it should be a service account.
 	cfg, err := google.JWTConfigFromJSON(data, scope...)
 	if err != nil {
 		return nil, fmt.Errorf("google.JWTConfigFromJSON: %v", err)
 	}
-	return cfg.TokenSource(ctx), nil
+	// jwt.Config does not expose the project ID, so re-unmarshal to get it.
+	var pid struct {
+		ProjectID string `json:"project_id"`
+	}
+	if err := json.Unmarshal(data, &pid); err != nil {
+		return nil, err
+	}
+	return &google.DefaultCredentials{
+		ProjectID:   pid.ProjectID,
+		TokenSource: cfg.TokenSource(ctx),
+		JSON:        data,
+	}, nil
+}
+
+func refreshTokenTokenSource(ctx context.Context, data []byte, scope ...string) (oauth2.TokenSource, bool, error) {
+	var c cred
+	if err := json.Unmarshal(data, &c); err != nil {
+		return nil, false, fmt.Errorf("cannot unmarshal credentials file: %v", err)
+	}
+	if c.ClientID == "" || c.ClientSecret == "" || c.RefreshToken == "" || c.Type != "authorized_user" {
+		return nil, false, nil
+	}
+	cfg := &oauth2.Config{
+		ClientID:     c.ClientID,
+		ClientSecret: c.ClientSecret,
+		Endpoint:     google.Endpoint,
+		RedirectURL:  "urn:ietf:wg:oauth:2.0:oob",
+		Scopes:       scope,
+	}
+	return cfg.TokenSource(ctx, &oauth2.Token{
+		RefreshToken: c.RefreshToken,
+		Expiry:       time.Now(),
+	}), true, nil
+}
+
+type cred struct {
+	ClientID     string `json:"client_id"`
+	ClientSecret string `json:"client_secret"`
+	RefreshToken string `json:"refresh_token"`
+	Type         string `json:"type"`
 }
@@ -0,0 +1,130 @@
+// Copyright 2017 Google Inc. All Rights Reserved.
+//
+// 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.
+
+package internal
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"golang.org/x/net/context"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
+)
+
+type dummyTokenSource struct {
+	oauth2.TokenSource
+}
+
+func TestTokenSource(t *testing.T) {
+	ctx := context.Background()
+
+	// Pass in a TokenSource, get it back.
+	ts := &dummyTokenSource{}
+	ds := &DialSettings{TokenSource: ts}
+	got, err := Creds(ctx, ds)
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := &google.DefaultCredentials{TokenSource: ts}
+	if !cmp.Equal(got, want) {
+		t.Error("did not get the same TokenSource back")
+	}
+
+	// Load a valid JSON file. No way to really test the contents; we just
+	// verify that there is no error.
+	ds = &DialSettings{CredentialsFile: "service-account.json"}
+	if _, err := Creds(ctx, ds); err != nil {
+		t.Errorf("got %v, wanted no error", err)
+	}
+
+	// If both a file and TokenSource are passed, the file takes precedence
+	// (existing behavior).
+	// TODO(jba): make this an error?
+	ds = &DialSettings{
+		TokenSource:     ts,
+		CredentialsFile: "service-account.json",
+	}
+	got, err = Creds(ctx, ds)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cmp.Equal(got, want) {
+		t.Error("got the same TokenSource back, wanted one from the JSON file")
+	}
+	// TODO(jba): find a way to test the call to google.DefaultTokenSource.
+}
+
+const validRefeshTokenJSON = `{
+  "client_id": "764-aaaaa.apps.googleusercontent.com",
+  "client_secret": "d-988888888",
+  "refresh_token": "1/88888aaaaaaaaa",
+  "type": "authorized_user"
+}`
+
+const validServiceAccountJSON = `{
+  "type": "service_account",
+  "project_id": "dumba-504",
+  "private_key_id": "adsfsdd",
+  "private_key": "-----BEGIN PRIVATE KEY-----\n\n-----END PRIVATE KEY-----\n",
+  "client_email": "dumba-504@appspot.gserviceaccount.com",
+  "client_id": "111",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://accounts.google.com/o/oauth2/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/dumba-504%40appspot.gserviceaccount.com"
+}`
+
+func TestRefreshTokenTokenSource(t *testing.T) {
+	tests := []struct {
+		name    string
+		data    []byte
+		wantOK  bool
+		wantErr bool
+	}{
+		{
+			name:    "empty",
+			data:    []byte{},
+			wantOK:  false,
+			wantErr: true, // not valid JSON
+		},
+		{
+			name:    "non refresh token JSON",
+			data:    []byte("{}"),
+			wantOK:  false,
+			wantErr: false,
+		},
+		{
+			name:    "service account JSON",
+			data:    []byte(validServiceAccountJSON),
+			wantOK:  false,
+			wantErr: false,
+		},
+		{
+			name:    "valid refresh token JSON",
+			data:    []byte(validRefeshTokenJSON),
+			wantOK:  true,
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		_, ok, err := refreshTokenTokenSource(context.Background(), tt.data)
+		if (err != nil) != tt.wantErr {
+			t.Errorf("%v: refreshTokenTokenSource() err = %v, wantErr %v", tt.name, err, tt.wantErr)
+		}
+		if ok != tt.wantOK {
+			t.Errorf("%v: refreshTokenTokenSource() ok = %v, want %v", tt.name, ok, tt.wantOK)
+		}
+	}
+}
@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "project_id",
+  "private_key_id": "private_key_id",
+  "private_key": "private_key",
+  "client_email": "xyz@developer.gserviceaccount.com",
+  "client_id": "123",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://accounts.google.com/o/oauth2/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/xyz%40developer.gserviceaccount.com"
+}
@@ -25,13 +25,13 @@ import (
 // DialSettings holds information needed to establish a connection with a
 // Google API service.
 type DialSettings struct {
-	Endpoint                   string
-	Scopes                     []string
-	ServiceAccountJSONFilename string // if set, TokenSource is ignored.
-	TokenSource                oauth2.TokenSource
-	UserAgent                  string
-	APIKey                     string
-	HTTPClient                 *http.Client
-	GRPCDialOpts               []grpc.DialOption
-	GRPCConn                   *grpc.ClientConn
+	Endpoint        string
+	Scopes          []string
+	TokenSource     oauth2.TokenSource
+	CredentialsFile string // if set, Token Source is ignored.
+	UserAgent       string
+	APIKey          string
+	HTTPClient      *http.Client
+	GRPCDialOpts    []grpc.DialOption
+	GRPCConn        *grpc.ClientConn
 }