Skip to content

fix(auth): Migrate IAM SignBlob to IAMCredentials SignBlob #480

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

Merged
merged 2 commits into from
Sep 30, 2020
Merged

fix(auth): Migrate IAM SignBlob to IAMCredentials SignBlob #480

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
8afb51f
Migrate IAM SignBlob to IAMCredentials SignBlob
kentengjin Sep 30, 2020
7c7de59
Fix FirebaseToken tests
kentengjin Sep 30, 2020
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
10 changes: 5 additions & 5 deletions src/main/java/com/google/firebase/auth/internal/CryptoSigners.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ public String getAccount() {

/**
* @ {@link CryptoSigner} implementation that uses the
* <a href="https://cloud.google.com/iam/reference/rest/v1/projects.serviceAccounts/signBlob">
* Google IAM service</a> to sign data.
* <a href=https://cloud.google.com/iam/docs/reference/credentials/rest/v1/projects.serviceAccounts/signBlob">
* Google IAMCredentials service</a> to sign data.
*/
static class IAMCryptoSigner implements CryptoSigner {

private static final String IAM_SIGN_BLOB_URL =
"https://iam.googleapis.com/v1/projects/-/serviceAccounts/%s:signBlob";
"https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/%s:signBlob";

private final String serviceAccount;
private final ErrorHandlingHttpClient<FirebaseAuthException> httpClient;
Expand All @@ -95,11 +95,11 @@ void setInterceptor(HttpResponseInterceptor interceptor) {
@Override
public byte[] sign(byte[] payload) throws FirebaseAuthException {
String encodedPayload = BaseEncoding.base64().encode(payload);
Map<String, String> content = ImmutableMap.of("bytesToSign", encodedPayload);
Map<String, String> content = ImmutableMap.of("payload", encodedPayload);
String encodedUrl = String.format(IAM_SIGN_BLOB_URL, serviceAccount);
HttpRequestInfo requestInfo = HttpRequestInfo.buildJsonPostRequest(encodedUrl, content);
GenericJson parsed = httpClient.sendAndParse(requestInfo, GenericJson.class);
return BaseEncoding.base64().decode((String) parsed.get("signature"));
return BaseEncoding.base64().decode((String) parsed.get("signedBlob"));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/google/firebase/auth/FirebaseCustomTokenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void testCreateCustomTokenWithDeveloperClaims() throws Exception {
public void testCreateCustomTokenWithoutServiceAccountCredentials() throws Exception {
MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
String content = Utils.getDefaultJsonFactory().toString(
ImmutableMap.of("signature", BaseEncoding.base64().encode("test-signature".getBytes())));
ImmutableMap.of("signedBlob", BaseEncoding.base64().encode("test-signature".getBytes())));
response.setContent(content);
MockHttpTransport transport = new MultiRequestMockHttpTransport(ImmutableList.of(response));

Expand All @@ -117,7 +117,7 @@ public void testCreateCustomTokenWithoutServiceAccountCredentials() throws Excep
@Test
public void testCreateCustomTokenWithDiscoveredServiceAccount() throws Exception {
String content = Utils.getDefaultJsonFactory().toString(
ImmutableMap.of("signature", BaseEncoding.base64().encode("test-signature".getBytes())));
ImmutableMap.of("signedBlob", BaseEncoding.base64().encode("test-signature".getBytes())));
List<MockLowLevelHttpResponse> responses = ImmutableList.of(
// Service account discovery response
new MockLowLevelHttpResponse().setContent("[email protected]"),
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/google/firebase/auth/internal/CryptoSignersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void testInvalidServiceAccountCryptoSigner() {
public void testIAMCryptoSigner() throws Exception {
String signature = BaseEncoding.base64().encode("signed-bytes".getBytes());
String response = Utils.getDefaultJsonFactory().toString(
ImmutableMap.of("signature", signature));
ImmutableMap.of("signedBlob", signature));
MockHttpTransport transport = new MockHttpTransport.Builder()
.setLowLevelHttpResponse(new MockLowLevelHttpResponse().setContent(response))
.build();
Expand All @@ -84,7 +84,7 @@ public void testIAMCryptoSigner() throws Exception {

byte[] data = signer.sign("foo".getBytes());
assertArrayEquals("signed-bytes".getBytes(), data);
final String url = "https://iam.googleapis.com/v1/projects/-/serviceAccounts/"
final String url = "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/"
+ "[email protected]:signBlob";
assertEquals(url, interceptor.getResponse().getRequest().getUrl().toString());
}
Expand Down Expand Up @@ -150,7 +150,7 @@ public void testInvalidIAMCryptoSigner() {
public void testMetadataService() throws Exception {
String signature = BaseEncoding.base64().encode("signed-bytes".getBytes());
String response = Utils.getDefaultJsonFactory().toString(
ImmutableMap.of("signature", signature));
ImmutableMap.of("signedBlob", signature));
MockHttpTransport transport = new MultiRequestMockHttpTransport(
ImmutableList.of(
new MockLowLevelHttpResponse().setContent("[email protected]"),
Expand All @@ -168,7 +168,7 @@ public void testMetadataService() throws Exception {

byte[] data = signer.sign("foo".getBytes());
assertArrayEquals("signed-bytes".getBytes(), data);
final String url = "https://iam.googleapis.com/v1/projects/-/serviceAccounts/"
final String url = "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/"
+ "[email protected]:signBlob";
HttpRequest request = interceptor.getResponse().getRequest();
assertEquals(url, request.getUrl().toString());
Expand All @@ -179,7 +179,7 @@ public void testMetadataService() throws Exception {
public void testExplicitServiceAccountEmail() throws Exception {
String signature = BaseEncoding.base64().encode("signed-bytes".getBytes());
String response = Utils.getDefaultJsonFactory().toString(
ImmutableMap.of("signature", signature));
ImmutableMap.of("signedBlob", signature));

// Explicit service account should get precedence
MockHttpTransport transport = new MultiRequestMockHttpTransport(
Expand All @@ -198,7 +198,7 @@ public void testExplicitServiceAccountEmail() throws Exception {

byte[] data = signer.sign("foo".getBytes());
assertArrayEquals("signed-bytes".getBytes(), data);
final String url = "https://iam.googleapis.com/v1/projects/-/serviceAccounts/"
final String url = "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/"
+ "[email protected]:signBlob";
HttpRequest request = interceptor.getResponse().getRequest();
assertEquals(url, request.getUrl().toString());
Expand Down