Skip to content

Commit

Permalink
google/internal/externalaccount: update serviceAccountImpersonationRE…
Browse files Browse the repository at this point in the history
… to support universe domain

Change-Id: Iafe35c293209bd88997c876341ebde7ac9ecda93
Reviewed-on: https://go-review.googlesource.com/c/oauth2/+/557195
TryBot-Bypass: Cody Oss <[email protected]>
Reviewed-by: Cody Oss <[email protected]>
Auto-Submit: Cody Oss <[email protected]>
  • Loading branch information
quartzmo authored and gopherbot committed Jan 19, 2024
1 parent deefa7e commit adffd94
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 1 deletion.
2 changes: 1 addition & 1 deletion google/internal/externalaccount/executablecredsource.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"
)

var serviceAccountImpersonationRE = regexp.MustCompile("https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/(.*@.*):generateAccessToken")
var serviceAccountImpersonationRE = regexp.MustCompile("https://iamcredentials\\..+/v1/projects/-/serviceAccounts/(.*@.*):generateAccessToken")

const (
executableSupportedMaxVersion = 1
Expand Down
34 changes: 34 additions & 0 deletions google/internal/externalaccount/executablecredsource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1021,3 +1021,37 @@ func TestRetrieveOutputFileSubjectTokenJwt(t *testing.T) {
})
}
}

func TestServiceAccountImpersonationRE(t *testing.T) {
tests := []struct {
name string
serviceAccountImpersonationURL string
want string
}{
{
name: "universe domain Google Default Universe (GDU) googleapis.com",
serviceAccountImpersonationURL: "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/[email protected]:generateAccessToken",
want: "[email protected]",
},
{
name: "email does not match",
serviceAccountImpersonationURL: "[email protected]",
want: "",
},
{
name: "universe domain non-GDU",
serviceAccountImpersonationURL: "https://iamcredentials.apis-tpclp.goog/v1/projects/-/serviceAccounts/[email protected]:generateAccessToken",
want: "[email protected]",
},
}
for _, tt := range tests {
matches := serviceAccountImpersonationRE.FindStringSubmatch(tt.serviceAccountImpersonationURL)
if matches == nil {
if tt.want != "" {
t.Errorf("%q: got nil, want %q", tt.name, tt.want)
}
} else if matches[1] != tt.want {
t.Errorf("%q: got %q, want %q", tt.name, matches[1], tt.want)
}
}
}

0 comments on commit adffd94

Please sign in to comment.