Skip to content

Commit 80a2eae

Browse files
committed
Fix spotbugs failure
Signed-off-by: Gantigmaa Selenge <[email protected]>
1 parent a84074f commit 80a2eae

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

kafka-agent/src/main/java/io/strimzi/kafka/agent/KafkaAgent.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import java.lang.reflect.Method;
4040
import java.nio.charset.StandardCharsets;
4141
import java.security.GeneralSecurityException;
42+
import java.security.SecureRandom;
43+
import java.util.Base64;
4244
import java.util.HashMap;
4345
import java.util.Map;
4446
import java.util.Properties;
@@ -76,6 +78,7 @@ public class KafkaAgent {
7678
private static final byte BROKER_RUNNING_STATE = 3;
7779
private static final byte BROKER_RECOVERY_STATE = 2;
7880
private static final byte BROKER_UNKNOWN_STATE = 127;
81+
private static final SecureRandom RANDOM = new SecureRandom();
7982
private Secret caCertSecret;
8083
private Secret nodeCertSecret;
8184
private MetricName brokerStateName;
@@ -263,7 +266,10 @@ private SslContextFactory.Server getSSLContextFactory() throws GeneralSecurityEx
263266
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
264267
sslContextFactory.setTrustStore(KafkaAgentUtils.jksTrustStore(caCertSecret));
265268

266-
String password = KafkaAgentUtils.generateRandomPassword();
269+
byte[] random = new byte[24];
270+
RANDOM.nextBytes(random);
271+
String password = Base64.getUrlEncoder().withoutPadding().encodeToString(random).substring(0, 32);
272+
267273
sslContextFactory.setKeyStore(KafkaAgentUtils.jksKeyStore(nodeCertSecret, password.toCharArray()));
268274
sslContextFactory.setKeyStorePassword(password);
269275
sslContextFactory.setNeedClientAuth(true);

kafka-agent/src/main/java/io/strimzi/kafka/agent/KafkaAgentUtils.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import java.security.KeyFactory;
1414
import java.security.KeyStore;
1515
import java.security.PrivateKey;
16-
import java.security.SecureRandom;
1716
import java.security.cert.Certificate;
1817
import java.security.cert.CertificateException;
1918
import java.security.cert.CertificateFactory;
@@ -78,12 +77,6 @@ static KeyStore jksKeyStore(Secret secret, char[] password) throws GeneralSecuri
7877
return nodeKeyStore;
7978
}
8079

81-
static String generateRandomPassword() {
82-
byte[] random = new byte[24];
83-
new SecureRandom().nextBytes(random);
84-
return Base64.getUrlEncoder().withoutPadding().encodeToString(random).substring(0, 32);
85-
}
86-
8780
/**
8881
* Extract all public keys (all .crt records) from a secret.
8982
*/

0 commit comments

Comments
 (0)