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

fix: use orginal url as audience for self signed jwt if scheme or host is null #642

Merged
merged 4 commits into from Apr 27, 2021
Merged

fix: use orginal url as audience for self signed jwt if scheme or host is null #642

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74471ff
fix: fix self signed jwt uri computation
arithmetic1728 Apr 26, 2021
5974335
chore: run lint
arithmetic1728 Apr 26, 2021
483fdd0
chore: update test
arithmetic1728 Apr 26, 2021
8569d35
chore: update code
arithmetic1728 Apr 26, 2021
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
2 changes: 1 addition & 1 deletion oauth2_http/java/com/google/auth/oauth2/ServiceAccountJwtAccessCredentials.java
View file
Open in desktop
Expand Up @@ -339,7 +339,7 @@ public boolean hasRequestMetadataOnly() {
*/
@VisibleForTesting
static URI getUriForSelfSignedJWT(URI uri) {
if (uri == null) {
if (uri == null || (uri.getScheme() == null && uri.getHost() == null)) {
return uri;
}
try {
Expand Down
9 changes: 9 additions & 0 deletions oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountJwtAccessCredentialsTest.java
View file
Open in desktop
Expand Up @@ -181,6 +181,15 @@ public void getUriForSelfSignedJWT() {
assertEquals(expected, ServiceAccountJwtAccessCredentials.getUriForSelfSignedJWT(uri));
}

@Test
public void getUriForSelfSignedJWT_forStaticAudience_returnsURI() {
assertNull(ServiceAccountJwtAccessCredentials.getUriForSelfSignedJWT(null));

URI uri = URI.create("compute.googleapis.com");
URI expected = URI.create("compute.googleapis.com");
assertEquals(expected, ServiceAccountJwtAccessCredentials.getUriForSelfSignedJWT(uri));
}

arithmetic1728 marked this conversation as resolved.
Show resolved Hide resolved
@Test
public void hasRequestMetadata_returnsTrue() throws IOException {
Credentials credentials =
Expand Down