Skip to content

Fix audience and scopes when using WIF and non-default universes. #522

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

Open
juliocc wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −5
Open

Fix audience and scopes when using WIF and non-default universes. #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/main/index.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions src/client/workload_identity_federation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Google LLC
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -56,8 +56,12 @@ export class WorkloadIdentityFederationClient extends Client implements AuthClie
this.#workloadIdentityProviderName = opts.workloadIdentityProviderName;
this.#serviceAccount = opts.serviceAccount;

const iamHost = new URL(this._endpoints.iam).host;
this.#audience = `//${iamHost}/${this.#workloadIdentityProviderName}`;
if (opts.audience) {
this.#audience = opts.audience;
} else {
const iamHost = new URL(this._endpoints.iam).host;
this.#audience = `//${iamHost}/${this.#workloadIdentityProviderName}`;
}
this._logger.debug(`Computed audience`, this.#audience);
}

Expand Down Expand Up @@ -88,7 +92,7 @@ export class WorkloadIdentityFederationClient extends Client implements AuthClie
audience: this.#audience,
grantType: `urn:ietf:params:oauth:grant-type:token-exchange`,
requestedTokenType: `urn:ietf:params:oauth:token-type:access_token`,
scope: `${this._endpoints.www}/auth/cloud-platform`,
scope: `https://www.googleapis.com/auth/cloud-platform`,
Copy link

@R2wenD2 R2wenD2 Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change? this._enpoints.www takes the universe into consideration.

subjectTokenType: `urn:ietf:params:oauth:token-type:jwt`,
subjectToken: this.#githubOIDCToken,
};
Expand Down
1 change: 1 addition & 0 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export async function run(logger: Logger) {
githubOIDCTokenAudience: oidcTokenAudience,
workloadIdentityProviderName: workloadIdentityProvider,
serviceAccount: serviceAccount,
audience: getInput('audience'),
});
} else {
logger.debug(`Using credentials JSON`);
Expand Down