Skip to content

Commit 1a4f81e

Browse files
jkakavasjkakavas
authored
Partly revert globalInfo.ready check (#45960)
This check was introduced in #41392 but had the unwanted side-effect that the keystore settings in such blocks would note be added in the node's keystore. Given that we have a mid-term plan for FIPS testing that would made such checks unnecessary, and that the conditional in these two cases is not really that important, this change removes this conditional logic so that full-cluster-restart and rolling upgrade tests will run with PEM files for key/certificate material no matter if we're in a FIPS JVM or not. Resolves: #45475
1 parent 5761b0a commit 1a4f81e

File tree

2 files changed

+20
-48
lines changed

2 files changed

+20
-48
lines changed

‎x-pack/qa/full-cluster-restart/build.gradle‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ task bwcTest {
8080

8181
task copyTestNodeKeyMaterial(type: Copy) {
8282
from project(':x-pack:plugin:core').files('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem',
83-
'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt',
84-
'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')
83+
'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt')
8584
into outputDir
8685
}
8786

@@ -116,21 +115,15 @@ for (Version version : bwcVersions.indexCompatible) {
116115

117116
setting 'xpack.security.enabled', 'true'
118117
setting 'xpack.security.transport.ssl.enabled', 'true'
119-
rootProject.globalInfo.ready {
120-
if (project.inFipsJvm) {
121-
setting 'xpack.security.transport.ssl.key', 'testnode.pem'
122-
setting 'xpack.security.transport.ssl.certificate', 'testnode.crt'
123-
keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
124-
} else {
125-
setting 'xpack.security.transport.ssl.keystore.path', 'testnode.jks'
126-
setting 'xpack.security.transport.ssl.keystore.password', 'testnode'
127-
}
128-
}
118+
119+
setting 'xpack.security.transport.ssl.key', 'testnode.pem'
120+
setting 'xpack.security.transport.ssl.certificate', 'testnode.crt'
121+
keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
122+
129123
setting 'xpack.license.self_generated.type', 'trial'
130124
dependsOn copyTestNodeKeyMaterial
131125
extraConfigFile 'testnode.pem', new File(outputDir + '/testnode.pem')
132126
extraConfigFile 'testnode.crt', new File(outputDir + '/testnode.crt')
133-
extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
134127

135128
keystoreFile 'xpack.watcher.encryption_key', "${project.projectDir}/src/test/resources/system_key"
136129
setting 'xpack.watcher.encrypt_sensitive_data', 'true'
@@ -162,19 +155,13 @@ for (Version version : bwcVersions.indexCompatible) {
162155
// some tests rely on the translog not being flushed
163156
setting 'indices.memory.shard_inactive_time', '20m'
164157
setting 'xpack.security.enabled', 'true'
165-
rootProject.globalInfo.ready {
166-
if (project.inFipsJvm) {
167-
setting 'xpack.security.transport.ssl.key', 'testnode.pem'
168-
setting 'xpack.security.transport.ssl.certificate', 'testnode.crt'
169-
keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
170-
} else {
171-
setting 'xpack.security.transport.ssl.keystore.path', 'testnode.jks'
172-
setting 'xpack.security.transport.ssl.keystore.password', 'testnode'
173-
}
174-
}
158+
159+
setting 'xpack.security.transport.ssl.key', 'testnode.pem'
160+
setting 'xpack.security.transport.ssl.certificate', 'testnode.crt'
161+
keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
162+
175163
setting 'xpack.license.self_generated.type', 'trial'
176164
dependsOn copyTestNodeKeyMaterial
177-
extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
178165
extraConfigFile 'testnode.pem', new File(outputDir + '/testnode.pem')
179166
extraConfigFile 'testnode.crt', new File(outputDir + '/testnode.crt')
180167

‎x-pack/qa/rolling-upgrade/build.gradle‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ task bwcTest {
8383

8484
task copyTestNodeKeyMaterial(type: Copy) {
8585
from project(':x-pack:plugin:core').files('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem',
86-
'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt',
87-
'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')
86+
'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt')
8887
into outputDir
8988
}
9089

@@ -122,18 +121,11 @@ for (Version version : bwcVersions.wireCompatible) {
122121
setting 'xpack.security.authc.token.enabled', 'true'
123122
setting 'xpack.security.authc.token.timeout', '60m'
124123
setting 'xpack.security.audit.enabled', 'true'
125-
rootProject.globalInfo.ready {
126-
if (project.inFipsJvm) {
127-
setting 'xpack.security.transport.ssl.key', 'testnode.pem'
128-
setting 'xpack.security.transport.ssl.certificate', 'testnode.crt'
129-
keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
130-
} else {
131-
setting 'xpack.security.transport.ssl.keystore.path', 'testnode.jks'
132-
setting 'xpack.security.transport.ssl.keystore.password', 'testnode'
133-
}
134-
}
124+
setting 'xpack.security.transport.ssl.key', 'testnode.pem'
125+
setting 'xpack.security.transport.ssl.certificate', 'testnode.crt'
126+
keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
127+
135128
dependsOn copyTestNodeKeyMaterial
136-
extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
137129
extraConfigFile 'testnode.pem', new File(outputDir + '/testnode.pem')
138130
extraConfigFile 'testnode.crt', new File(outputDir + '/testnode.crt')
139131
if (version.onOrAfter('7.0.0')) {
@@ -188,22 +180,15 @@ for (Version version : bwcVersions.wireCompatible) {
188180
setting 'xpack.security.enabled', 'true'
189181
setting 'xpack.security.transport.ssl.enabled', 'true'
190182
setting 'xpack.security.authc.token.timeout', '60m'
191-
rootProject.globalInfo.ready {
192-
if (project.inFipsJvm) {
193-
setting 'xpack.security.transport.ssl.key', 'testnode.pem'
194-
setting 'xpack.security.transport.ssl.certificate', 'testnode.crt'
195-
keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
196-
} else {
197-
setting 'xpack.security.transport.ssl.keystore.path', 'testnode.jks'
198-
setting 'xpack.security.transport.ssl.keystore.password', 'testnode'
199-
}
200-
}
183+
setting 'xpack.security.transport.ssl.key', 'testnode.pem'
184+
setting 'xpack.security.transport.ssl.certificate', 'testnode.crt'
185+
keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
186+
201187
setting 'node.attr.upgraded', 'true'
202188
setting 'xpack.security.authc.token.enabled', 'true'
203189
setting 'xpack.security.audit.enabled', 'true'
204190
setting 'node.name', "upgraded-node-${stopNode}"
205191
dependsOn copyTestNodeKeyMaterial
206-
extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
207192
extraConfigFile 'testnode.pem', new File(outputDir + '/testnode.pem')
208193
extraConfigFile 'testnode.crt', new File(outputDir + '/testnode.crt')
209194
if (version.onOrAfter('7.0.0')) {

0 commit comments

Comments
 (0)