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: allow unset/null privateKeyId for JwtCredentials #336

Merged
merged 4 commits into from Aug 22, 2019
Merged

fix: allow unset/null privateKeyId for JwtCredentials #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7caddf
fix: add failing test for unset/null privateKeyId
chingor13 Aug 22, 2019
83f0dc6
fix: relax preconditions to allow null privateKeyId
chingor13 Aug 22, 2019
98a8f34
chore: fix lint
chingor13 Aug 22, 2019
1772ff1
fix: remove invalid test
chingor13 Aug 22, 2019
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
4 changes: 2 additions & 2 deletions oauth2_http/java/com/google/auth/oauth2/JwtCredentials.java
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ public class JwtCredentials extends Credentials implements JwtProvider {

private JwtCredentials(Builder builder) {
this.privateKey = Preconditions.checkNotNull(builder.getPrivateKey());
this.privateKeyId = Preconditions.checkNotNull(builder.getPrivateKeyId());
this.privateKeyId = builder.getPrivateKeyId();
this.jwtClaims = Preconditions.checkNotNull(builder.getJwtClaims());
Preconditions.checkState(jwtClaims.isComplete(), JWT_INCOMPLETE_ERROR_MESSAGE);
this.lifeSpanSeconds = Preconditions.checkNotNull(builder.getLifeSpanSeconds());
Expand Down Expand Up @@ -220,7 +220,7 @@ public PrivateKey getPrivateKey() {
}

public Builder setPrivateKeyId(String privateKeyId) {
this.privateKeyId = Preconditions.checkNotNull(privateKeyId);
this.privateKeyId = privateKeyId;
return this;
}

Expand Down
50 changes: 34 additions & 16 deletions oauth2_http/javatests/com/google/auth/oauth2/JwtCredentialsTest.java
View file
Open in desktop
Expand Up @@ -114,22 +114,6 @@ public void builder_requiresPrivateKey() {
}
}

@Test
public void builder_requiresPrivateKeyId() {
try {
JwtClaims claims =
JwtClaims.newBuilder()
.setAudience("some-audience")
.setIssuer("some-issuer")
.setSubject("some-subject")
.build();
JwtCredentials.newBuilder().setJwtClaims(claims).setPrivateKey(getPrivateKey()).build();
fail("Should throw exception");
} catch (NullPointerException ex) {
// expected
}
}

@Test
public void builder_requiresClaims() {
try {
Expand Down Expand Up @@ -248,6 +232,40 @@ public void getRequestMetadata_withAdditionalClaims_hasJwtAccess() throws IOExce
Collections.singletonMap("foo", "bar"));
}

@Test
public void privateKeyIdNull() throws IOException {
JwtClaims claims =
JwtClaims.newBuilder()
.setAudience("some-audience")
.setIssuer("some-issuer")
.setSubject("some-subject")
.build();
JwtCredentials credentials =
JwtCredentials.newBuilder()
.setJwtClaims(claims)
.setPrivateKey(getPrivateKey())
.setPrivateKeyId(null)
.build();

Map<String, List<String>> metadata = credentials.getRequestMetadata();
verifyJwtAccess(metadata, "some-audience", "some-issuer", "some-subject", null);
}

@Test
public void privateKeyIdNotSpecified() throws IOException {
JwtClaims claims =
JwtClaims.newBuilder()
.setAudience("some-audience")
.setIssuer("some-issuer")
.setSubject("some-subject")
.build();
JwtCredentials credentials =
JwtCredentials.newBuilder().setJwtClaims(claims).setPrivateKey(getPrivateKey()).build();

Map<String, List<String>> metadata = credentials.getRequestMetadata();
verifyJwtAccess(metadata, "some-audience", "some-issuer", "some-subject", null);
}

private void verifyJwtAccess(
Map<String, List<String>> metadata,
String expectedAudience,
Expand Down