-
Notifications
You must be signed in to change notification settings - Fork 4.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
credentials: support google default creds #2315
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
f87ea88
credentials: add Bundle interface and allow balancer to set Bundle fo…
menghanl 4c1cbdd
use bundle in grpclb
menghanl 342dae0
comments, names
menghanl 6814f06
Implement google transport creds
cesarghali f449e15
Credentials Bundle API change
cesarghali 9c214e4
fix bugs found in tests
menghanl 62af2e5
remove token scope from creds.New
menghanl a8fe6c4
call cancel from context
menghanl 2e25347
delete client binary...
menghanl b0e6b80
set grpc dial grpclb server target to remoteLBName that comes from re…
menghanl 63987d0
fix review comments
menghanl cb5920e
change google default creds commandline flag
menghanl b97d223
refactor interop client
menghanl 4a2f887
fix review comments 2
menghanl 7a1e421
fix comments
menghanl cfc7076
not checking IsOnGCP in google default creds
menghanl 0c17045
one more deletion
menghanl 5b91244
review comments
menghanl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
/* | ||
* | ||
* Copyright 2018 gRPC authors. | ||
* | ||
* 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 google | ||
|
||
import ( | ||
"fmt" | ||
"time" | ||
|
||
"golang.org/x/net/context" | ||
"google.golang.org/grpc/credentials" | ||
"google.golang.org/grpc/credentials/alts" | ||
"google.golang.org/grpc/credentials/oauth" | ||
"google.golang.org/grpc/grpclog" | ||
"google.golang.org/grpc/internal" | ||
) | ||
|
||
const tokenRequestTimeout = 30 * time.Second | ||
|
||
// NewDefaultCredentials returns a credentials bundle that is configured to work | ||
// with google services. | ||
// | ||
// This API is experimental. | ||
func NewDefaultCredentials() credentials.Bundle { | ||
c := &creds{} | ||
bundle, err := c.NewWithMode(internal.CredsBundleModeFallback) | ||
if err != nil { | ||
grpclog.Warningf("google default creds: failed to create new creds: %v", err) | ||
} | ||
return bundle | ||
} | ||
|
||
// creds implements credentials.Bundle. | ||
type creds struct { | ||
// Supported modes are defined in internal/internal.go. | ||
mode string | ||
// The transport credentials associated with this bundle. | ||
transportCreds credentials.TransportCredentials | ||
// The per RPC credentials associated with this bundle. | ||
perRPCCreds credentials.PerRPCCredentials | ||
} | ||
|
||
func (c *creds) TransportCredentials() credentials.TransportCredentials { | ||
return c.transportCreds | ||
} | ||
|
||
func (c *creds) PerRPCCredentials() credentials.PerRPCCredentials { | ||
if c == nil { | ||
return nil | ||
} | ||
return c.perRPCCreds | ||
} | ||
|
||
// NewWithMode should make a copy of Bundle, and switch mode. Modifying the | ||
// existing Bundle may cause races. | ||
func (c *creds) NewWithMode(mode string) (credentials.Bundle, error) { | ||
newCreds := &creds{mode: mode} | ||
|
||
// Create transport credentials. | ||
switch mode { | ||
case internal.CredsBundleModeFallback: | ||
newCreds.transportCreds = credentials.NewTLS(nil) | ||
case internal.CredsBundleModeBackendFromBalancer, internal.CredsBundleModeBalancer: | ||
// Only the clients can use google default credentials, so we only need | ||
// to create new ALTS client creds here. | ||
newCreds.transportCreds = alts.NewClientCreds(alts.DefaultClientOptions()) | ||
default: | ||
return nil, fmt.Errorf("google default creds: unsupported mode: %v", mode) | ||
} | ||
|
||
if mode == internal.CredsBundleModeFallback || mode == internal.CredsBundleModeBackendFromBalancer { | ||
// Create per RPC credentials. | ||
// For the time being, we required per RPC credentials for both TLS and | ||
// ALTS. In the future, this will only be required for TLS. | ||
ctx, cancel := context.WithTimeout(context.Background(), tokenRequestTimeout) | ||
defer cancel() | ||
var err error | ||
newCreds.perRPCCreds, err = oauth.NewApplicationDefault(ctx) | ||
if err != nil { | ||
grpclog.Warningf("google default creds: failed to create application oauth: %v", err) | ||
} | ||
} | ||
|
||
return newCreds, nil | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please add a comment that Google Default Credentials are only use by clients, so we only create a new ALTS client creds, or something like that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done