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

feat: support generic token formats in IdentityPoolCredentials #484

Merged
merged 9 commits into from
Oct 15, 2020
Merged

feat: support generic token formats in IdentityPoolCredentials #484

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
edfe081
feat: adds text/json credential source support to IdentityPoolCredent…
lsirac Oct 7, 2020
800d4e5
fix: format
lsirac Oct 7, 2020
ee4dcc4
fix: format
lsirac Oct 7, 2020
0abf35f
fix: add missing changes to MockExternalAccountCredentialsTransport
lsirac Oct 8, 2020
655a3d5
fix: change parseToken to take an InputStream
lsirac Oct 8, 2020
1e28d2d
fix: charsets
lsirac Oct 9, 2020
9582648
fix: merge
lsirac Oct 12, 2020
b8715f7
fix: broken build
lsirac Oct 13, 2020
05d879c
fix: type null check
lsirac Oct 13, 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
23 changes: 16 additions & 7 deletions oauth2_http/java/com/google/auth/oauth2/IdentityPoolCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@
import com.google.auth.http.HttpTransportFactory;
import com.google.auth.oauth2.IdentityPoolCredentials.IdentityPoolCredentialSource.CredentialFormatType;
import com.google.common.annotations.VisibleForTesting;
import java.io.ByteArrayInputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Paths;
Expand Down Expand Up @@ -211,22 +214,28 @@ private String retrieveSubjectTokenFromCredentialFile() throws IOException {
"Invalid credential location. The file at %s does not exist.", credentialFilePath));
}
try {
return parseToken(Files.readAllBytes(Paths.get(credentialFilePath)));
return parseToken(new FileInputStream(new File(credentialFilePath)));
} catch (IOException e) {
throw new IOException(
"Error when attempting to read the subject token from the credential file.", e);
}
}

private String parseToken(byte[] token) throws IOException {
private String parseToken(InputStream inputStream) throws IOException {
if (identityPoolCredentialSource.credentialFormatType == CredentialFormatType.TEXT) {
return new String(token);
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
StringBuilder token = new StringBuilder();
String line;
while ((line = reader.readLine()) != null) {
token.append(line);
}
return token.toString();
}

JsonFactory jsonFactory = OAuth2Utils.JSON_FACTORY;
JsonObjectParser parser = new JsonObjectParser(jsonFactory);
GenericJson fileContents =
parser.parseAndClose(new ByteArrayInputStream(token), OAuth2Utils.UTF_8, GenericJson.class);
parser.parseAndClose(inputStream, OAuth2Utils.UTF_8, GenericJson.class);

if (!fileContents.containsKey(identityPoolCredentialSource.subjectTokenFieldName)) {
throw new IOException("Invalid subject token field name. No subject token was found.");
Expand All @@ -250,7 +259,7 @@ private String getSubjectTokenFromMetadataServer() throws IOException {

try {
HttpResponse response = request.execute();
return parseToken(response.parseAsString().getBytes(StandardCharsets.UTF_8));
return parseToken(response.getContent());
} catch (IOException e) {
throw new IOException(
String.format("Error getting subject token from metadata server: %s", e.getMessage()), e);
Expand Down