@@ -69,7 +69,7 @@ public void loadSigningConfig(String clusterAlias, @Nullable Settings settings,
6969 settings ,
7070 updateSecureSettings
7171 );
72-
72+ assert effectiveSettings != null : "Signing config settings must not be null" ;
7373 logger .trace ("Loading signing config for [{}] with settings [{}]" , clusterAlias , effectiveSettings );
7474
7575 SigningConfig signingConfig = new SigningConfig (null , null , effectiveSettings );
@@ -109,7 +109,6 @@ public X509CertificateSignature sign(String clusterAlias, String... headers) {
109109 return null ;
110110 }
111111 var keyPair = signingConfig .keyPair ();
112-
113112 try {
114113 String algorithm = keyPair .signatureAlgorithm ();
115114 Signature signature = Signature .getInstance (algorithm );
@@ -195,6 +194,8 @@ private X509KeyPair buildKeyPair(SslKeyConfig keyConfig) {
195194 }
196195
197196 private X509KeyPair buildKeyPair (SslKeyConfig keyConfig , String alias ) {
197+ assert alias != null ;
198+
198199 final X509KeyManager keyManager = keyConfig .createKeyManager ();
199200 if (keyManager == null ) {
200201 return null ;
@@ -233,8 +234,8 @@ private static String calculateFingerprint(X509Certificate certificate) {
233234 private record X509KeyPair (X509Certificate certificate , PrivateKey privateKey , String signatureAlgorithm , String fingerprint ) {
234235 X509KeyPair (X509Certificate certificate , PrivateKey privateKey ) {
235236 this (
236- certificate ,
237- privateKey ,
237+ Objects . requireNonNull ( certificate ) ,
238+ Objects . requireNonNull ( privateKey ) ,
238239 Optional .ofNullable (SIGNATURE_ALGORITHM_BY_TYPE .get (privateKey .getAlgorithm ()))
239240 .orElseThrow (
240241 () -> new IllegalArgumentException (
@@ -246,6 +247,6 @@ private record X509KeyPair(X509Certificate certificate, PrivateKey privateKey, S
246247 }
247248 }
248249
249- private record SigningConfig (@ Nullable X509KeyPair keyPair , @ Nullable Collection <Path > dependentFiles , @ Nullable Settings settings ) {}
250+ private record SigningConfig (@ Nullable X509KeyPair keyPair , @ Nullable Collection <Path > dependentFiles , Settings settings ) {}
250251
251252}
0 commit comments