Skip to content

Commit 3756021

Browse files
aeitzmanaeitzman
committed
fixing formatting
1 parent 27c497e commit 3756021

File tree

3 files changed

+46
-39
lines changed

3 files changed

+46
-39
lines changed

‎oauth2_http/java/com/google/auth/mtls/WorkloadCertificateConfiguration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public String getPrivateKeyPath() {
2727
return privateKeyPath;
2828
}
2929

30-
public static WorkloadCertificateConfiguration fromCertificateConfigurationStream (InputStream certConfigStream) throws IOException {
30+
public static WorkloadCertificateConfiguration fromCertificateConfigurationStream(
31+
InputStream certConfigStream) throws IOException {
3132
JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
3233
JsonObjectParser parser = new JsonObjectParser(jsonFactory);
3334

‎oauth2_http/java/com/google/auth/mtls/X509Provider.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public X509Provider(String certConfigPathOverride) {
2121
this.certConfigPathOverride = certConfigPathOverride;
2222
}
2323

24-
public X509Provider(){
24+
public X509Provider() {
2525
this.certConfigPathOverride = null;
2626
}
2727

@@ -37,7 +37,8 @@ public KeyStore getKeyStore() throws IOException {
3737
InputStream privateKeyStream = readStream(privateKeyFile);
3838

3939
// Merge the two streams into a single stream.
40-
SequenceInputStream certAndPrivateKeyStream = new SequenceInputStream(certStream, privateKeyStream);
40+
SequenceInputStream certAndPrivateKeyStream =
41+
new SequenceInputStream(certStream, privateKeyStream);
4142

4243
// Build a key store using the combined stream.
4344
return SecurityUtils.createMtlsKeyStore(certAndPrivateKeyStream);
@@ -46,7 +47,8 @@ public KeyStore getKeyStore() throws IOException {
4647
}
4748
}
4849

49-
private WorkloadCertificateConfiguration getWorkloadCertificateConfiguration() throws IOException {
50+
private WorkloadCertificateConfiguration getWorkloadCertificateConfiguration()
51+
throws IOException {
5052
String envCredentialsPath = getEnv(CERTIFICATE_CONFIGURATION_ENV_VARIABLE);
5153
File certConfig;
5254
if (this.certConfigPathOverride != null) {

‎oauth2_http/javatests/com/google/auth/mtls/X509ProviderTest.java‎

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,24 @@
2121

2222
public class X509ProviderTest {
2323

24-
static String TEST_CERT = "-----BEGIN CERTIFICATE-----\n"
25-
+ "MIICGzCCAYSgAwIBAgIIWrt6xtmHPs4wDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UE\n"
26-
+ "AxMoMTAwOTEyMDcyNjg3OC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbTAeFw0x\n"
27-
+ "MjEyMDExNjEwNDRaFw0yMjExMjkxNjEwNDRaMDMxMTAvBgNVBAMTKDEwMDkxMjA3\n"
28-
+ "MjY4NzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20wgZ8wDQYJKoZIhvcNAQEB\n"
29-
+ "BQADgY0AMIGJAoGBAL1SdY8jTUVU7O4/XrZLYTw0ON1lV6MQRGajFDFCqD2Fd9tQ\n"
30-
+ "GLW8Iftx9wfXe1zuaehJSgLcyCxazfyJoN3RiONBihBqWY6d3lQKqkgsRTNZkdFJ\n"
31-
+ "Wdzl/6CxhK9sojh2p0r3tydtv9iwq5fuuWIvtODtT98EgphhncQAqkKoF3zVAgMB\n"
32-
+ "AAGjODA2MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQM\n"
33-
+ "MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAD8XQEqzGePa9VrvtEGpf+R4\n"
34-
+ "fkxKbcYAzqYq202nKu0kfjhIYkYSBj6gi348YaxE64yu60TVl42l5HThmswUheW4\n"
35-
+ "uQIaq36JvwvsDP5Zoj5BgiNSnDAFQp+jJFBRUA5vooJKgKgMDf/r/DCOsbO6VJF1\n"
36-
+ "kWwa9n19NFiV0z3m6isj\n"
37-
+ "-----END CERTIFICATE-----\n";
38-
39-
static String TEST_PRIVATE_KEY = "-----BEGIN PRIVATE KEY-----\n"
24+
static String TEST_CERT =
25+
"-----BEGIN CERTIFICATE-----\n"
26+
+ "MIICGzCCAYSgAwIBAgIIWrt6xtmHPs4wDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UE\n"
27+
+ "AxMoMTAwOTEyMDcyNjg3OC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbTAeFw0x\n"
28+
+ "MjEyMDExNjEwNDRaFw0yMjExMjkxNjEwNDRaMDMxMTAvBgNVBAMTKDEwMDkxMjA3\n"
29+
+ "MjY4NzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20wgZ8wDQYJKoZIhvcNAQEB\n"
30+
+ "BQADgY0AMIGJAoGBAL1SdY8jTUVU7O4/XrZLYTw0ON1lV6MQRGajFDFCqD2Fd9tQ\n"
31+
+ "GLW8Iftx9wfXe1zuaehJSgLcyCxazfyJoN3RiONBihBqWY6d3lQKqkgsRTNZkdFJ\n"
32+
+ "Wdzl/6CxhK9sojh2p0r3tydtv9iwq5fuuWIvtODtT98EgphhncQAqkKoF3zVAgMB\n"
33+
+ "AAGjODA2MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQM\n"
34+
+ "MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAD8XQEqzGePa9VrvtEGpf+R4\n"
35+
+ "fkxKbcYAzqYq202nKu0kfjhIYkYSBj6gi348YaxE64yu60TVl42l5HThmswUheW4\n"
36+
+ "uQIaq36JvwvsDP5Zoj5BgiNSnDAFQp+jJFBRUA5vooJKgKgMDf/r/DCOsbO6VJF1\n"
37+
+ "kWwa9n19NFiV0z3m6isj\n"
38+
+ "-----END CERTIFICATE-----\n";
39+
40+
static String TEST_PRIVATE_KEY =
41+
"-----BEGIN PRIVATE KEY-----\n"
4042
+ "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAL1SdY8jTUVU7O4/\n"
4143
+ "XrZLYTw0ON1lV6MQRGajFDFCqD2Fd9tQGLW8Iftx9wfXe1zuaehJSgLcyCxazfyJ\n"
4244
+ "oN3RiONBihBqWY6d3lQKqkgsRTNZkdFJWdzl/6CxhK9sojh2p0r3tydtv9iwq5fu\n"
@@ -57,7 +59,10 @@ public class X509ProviderTest {
5759
public void X509Provider_FileDoesntExist_Throws() {
5860
String certConfigPath = "badfile.txt";
5961
X509Provider testProvider = new TestX509Provider(certConfigPath);
60-
String expectedErrorMessage = String.format("Error reading certificate configuration file value '%s': File does not exist.", certConfigPath);
62+
String expectedErrorMessage =
63+
String.format(
64+
"Error reading certificate configuration file value '%s': File does not exist.",
65+
certConfigPath);
6166

6267
try {
6368
testProvider.getKeyStore();
@@ -74,7 +79,10 @@ public void X509Provider_EmptyFile_Throws() {
7479
InputStream certConfigStream = new ByteArrayInputStream("".getBytes());
7580
TestX509Provider testProvider = new TestX509Provider(certConfigPath);
7681
testProvider.addFile(certConfigPath, certConfigStream);
77-
String expectedErrorMessage = String.format("Error reading certificate configuration file value '%s': no JSON input found", certConfigPath);
82+
String expectedErrorMessage =
83+
String.format(
84+
"Error reading certificate configuration file value '%s': no JSON input found",
85+
certConfigPath);
7886

7987
try {
8088
testProvider.getKeyStore();
@@ -95,29 +103,25 @@ public void X509Provider_Succeeds() throws IOException, KeyStoreException, Certi
95103
TestX509Provider testProvider = new TestX509Provider(certConfigPath);
96104
testProvider.addFile(certConfigPath, certConfigStream);
97105
testProvider.addFile(certPath, new ByteArrayInputStream(TEST_CERT.getBytes()));
98-
testProvider.addFile(keyPath, new ByteArrayInputStream(TEST_PRIVATE_KEY.getBytes()));
106+
testProvider.addFile(keyPath, new ByteArrayInputStream(TEST_PRIVATE_KEY.getBytes()));
99107

100108
CertificateFactory cf = CertificateFactory.getInstance("X.509");
101-
Certificate expectedCert = cf.generateCertificate(new ByteArrayInputStream(TEST_CERT.getBytes()));
109+
Certificate expectedCert =
110+
cf.generateCertificate(new ByteArrayInputStream(TEST_CERT.getBytes()));
102111

103112
// Assert that the store has the expected certificate and only the expected certificate.
104113
KeyStore store = testProvider.getKeyStore();
105114
assertTrue(store.size() == 1);
106115
assertTrue(store.getCertificateAlias(expectedCert) != null);
107116
}
108117

109-
static InputStream writeWorkloadCertificateConfigStream(
110-
String certPath,
111-
String privateKeyPath)
118+
static InputStream writeWorkloadCertificateConfigStream(String certPath, String privateKeyPath)
112119
throws IOException {
113-
GenericJson json =
114-
writeWorkloadCertificateConfigJson(certPath, privateKeyPath);
120+
GenericJson json = writeWorkloadCertificateConfigJson(certPath, privateKeyPath);
115121
return TestUtils.jsonToInputStream(json);
116122
}
117123

118-
static GenericJson writeWorkloadCertificateConfigJson(
119-
String certPath,
120-
String privateKeyPath) {
124+
static GenericJson writeWorkloadCertificateConfigJson(String certPath, String privateKeyPath) {
121125
GenericJson json = new GenericJson();
122126
json.put("version", 1);
123127
GenericJson certConfigs = new GenericJson();
@@ -136,24 +140,24 @@ static GenericJson writeWorkloadCertificateConfigJson(
136140
static class TestX509Provider extends X509Provider {
137141
private final Map<String, InputStream> files = new HashMap<>();
138142

139-
TestX509Provider () {}
143+
TestX509Provider() {}
140144

141-
TestX509Provider (String filePathOverride) {
145+
TestX509Provider(String filePathOverride) {
142146
super(filePathOverride);
143147
}
144148

145149
void addFile(String file, InputStream stream) {
146150
files.put(file, stream);
147151
}
148152

149-
//@Override
150-
//String getEnv(String name) {
153+
// @Override
154+
// String getEnv(String name) {
151155
// return variables.get(name);
152-
//}
156+
// }
153157

154-
//void setEnv(String name, String value) {
158+
// void setEnv(String name, String value) {
155159
// variables.put(name, value);
156-
//}
160+
// }
157161

158162
@Override
159163
boolean isFile(File file) {

0 commit comments

Comments
 (0)