Skip to content
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.

Sign up for GitHub

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

Jump to bottom

credentials/alts: ClientAuthorizationCheck to case-fold compare of peer SA #3792

Merged
merged 2 commits into from Sep 1, 2020
Merged

credentials/alts: ClientAuthorizationCheck to case-fold compare of peer SA #3792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a52456
ClientAuthorizationCheck ignore-case on SA compare
AntonNep Aug 5, 2020
3e04e03
Update utils_test.go
AntonNep Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions credentials/alts/utils.go
View file
Open in desktop
Expand Up @@ -152,12 +152,13 @@ func AuthInfoFromPeer(p *peer.Peer) (AuthInfo, error) {
func ClientAuthorizationCheck(ctx context.Context, expectedServiceAccounts []string) error {
authInfo, err := AuthInfoFromContext(ctx)
if err != nil {
return status.Newf(codes.PermissionDenied, "The context is not an ALTS-compatible context: %v", err).Err()
return status.Errorf(codes.PermissionDenied, "The context is not an ALTS-compatible context: %v", err)
}
peer := authInfo.PeerServiceAccount()
for _, sa := range expectedServiceAccounts {
if authInfo.PeerServiceAccount() == sa {
if strings.EqualFold(peer, sa) {
return nil
}
}
return status.Newf(codes.PermissionDenied, "Client %v is not authorized", authInfo.PeerServiceAccount()).Err()
return status.Errorf(codes.PermissionDenied, "Client %v is not authorized", peer)
}
7 changes: 7 additions & 0 deletions credentials/alts/utils_test.go
View file
Open in desktop
Expand Up @@ -175,6 +175,13 @@ func (s) TestClientAuthorizationCheck(t *testing.T) {
true,
codes.OK, // err is nil, code is OK.
},
{
"working case (case ignored)",
peer.NewContext(ctx, p),
[]string{strings.ToUpper(testServiceAccount1), testServiceAccount2},
true,
codes.OK, // err is nil, code is OK.
},
{
"context does not have AuthInfo",
ctx,
Expand Down