Skip to content

Commit e7eb047

Browse files
kpumukkpumuk
committed
Updated Java keys for cross-platform tests
The truststore and keystore were regenerated using keys in test/keys: # keytool does not support "replace" operation: keytool -delete \ -alias localhost \ -keystore lib/java/src/crossTest/resources/.truststore \ -storepass thrift keytool -import \ -alias localhost \ -file test/keys/CA.pem \ -keystore lib/java/src/crossTest/resources/.truststore \ -storepass thrift # server keystore keytool -importkeystore \ -srckeystore test/keys/server.p12 \ -srcstoretype PKCS12 \ -srcstorepass thrift \ -destkeystore lib/java/src/crossTest/resources/.serverkeystore \ -deststoretype pkcs12 \ -deststorepass thrift # client keystore keytool -importkeystore \ -srckeystore test/keys/client.p12 \ -srcstoretype PKCS12 \ -srcstorepass thrift \ -destkeystore lib/java/src/crossTest/resources/.clientkeystore \ -deststoretype pkcs12 \ -deststorepass thrift Java tests were updated to use separate keystores for client and server.
1 parent 6d04f12 commit e7eb047

File tree

7 files changed

+7
-90
lines changed

7 files changed

+7
-90
lines changed

‎lib/java/gradle/functionalTests.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ def javaExe = file("${System.getProperty('java.home')}/bin/java${execExt}").cano
9696
// The common Uber jar path
9797
def jarPath = shadowJar.archiveFile.get().asFile.canonicalPath
9898
def trustStore = file("${projectDir}/src/crossTest/resources/.truststore").canonicalPath
99-
def keyStore = file("${projectDir}/src/crossTest/resources/.keystore").canonicalPath
99+
def serverKeyStore = file("${projectDir}/src/crossTest/resources/.serverkeystore").canonicalPath
100+
def clientKeyStore = file("${projectDir}/src/crossTest/resources/.clientkeystore").canonicalPath
100101

101102
task generateRunnerScriptForClient(group: 'Build') {
102103
description = 'Generate a runner script for cross-check tests with TestClient'
@@ -106,7 +107,7 @@ task generateRunnerScriptForClient(group: 'Build') {
106107
def runClientText = """\
107108
${scriptHead}
108109
109-
"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.trustStore=$trustStore" -Djavax.net.ssl.trustStorePassword=thrift org.apache.thrift.test.TestClient $args
110+
"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$clientKeyStore" -Djavax.net.ssl.keyStorePassword=thrift "-Djavax.net.ssl.trustStore=$trustStore" -Djavax.net.ssl.trustStorePassword=thrift org.apache.thrift.test.TestClient $args
110111
"""
111112
inputs.property 'runClientText', runClientText
112113
outputs.file clientFile
@@ -126,7 +127,7 @@ task generateRunnerScriptForServer(group: 'Build') {
126127
def runServerText = """\
127128
${scriptHead}
128129
129-
"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$keyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestServer $args
130+
"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$serverKeyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestServer $args
130131
"""
131132

132133
inputs.property 'runServerText', runServerText
@@ -147,7 +148,7 @@ task generateRunnerScriptForNonblockingServer(group: 'Build') {
147148
def runServerText = """\
148149
${scriptHead}
149150
150-
"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$keyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestNonblockingServer $args
151+
"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$serverKeyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestNonblockingServer $args
151152
"""
152153

153154
inputs.property 'runServerText', runServerText
@@ -168,7 +169,7 @@ task generateRunnerScriptForTServletServer(group: 'Build') {
168169
def runServerText = """\
169170
${scriptHead}
170171
171-
"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$keyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestTServletServer $args
172+
"${javaExe}" -cp "$jarPath" "-Djavax.net.ssl.keyStore=$serverKeyStore" -Djavax.net.ssl.keyStorePassword=thrift org.apache.thrift.test.TestTServletServer $args
172173
"""
173174

174175
inputs.property 'runServerText', runServerText

‎lib/java/gradle/unitTests.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ test {
8282
'test.port': "${testPort}",
8383
'javax.net.ssl.trustStore': "${projectDir}/src/crossTest/resources/.truststore",
8484
'javax.net.ssl.trustStorePassword': 'thrift',
85-
'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.keystore",
85+
'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.serverkeystore",
8686
'javax.net.ssl.keyStorePassword': 'thrift'
8787
]
8888
}

‎lib/java/src/crossTest/resources/.clientkeystore‎

3 KB
Binary file not shown.

‎lib/java/src/crossTest/resources/.keystore‎

-2.37 KB
Binary file not shown.

‎lib/java/src/crossTest/resources/.serverkeystore‎

4.59 KB
Binary file not shown.

‎lib/java/src/crossTest/resources/.truststore‎

642 Bytes
Binary file not shown.

‎test/known_failures_Linux.json‎

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -85,60 +85,24 @@
8585
"cpp-go_multih-header_http-ip-ssl",
8686
"cpp-go_multij-json_http-ip",
8787
"cpp-go_multij-json_http-ip-ssl",
88-
"cpp-java_binary_buffered-ip-ssl",
89-
"cpp-java_binary_framed-fastframed-ip-ssl",
90-
"cpp-java_binary_framed-ip-ssl",
9188
"cpp-java_binary_http-ip",
9289
"cpp-java_binary_http-ip-ssl",
93-
"cpp-java_binary_zlib-ip-ssl",
94-
"cpp-java_compact_buffered-ip-ssl",
95-
"cpp-java_compact_framed-fastframed-ip-ssl",
96-
"cpp-java_compact_framed-ip-ssl",
9790
"cpp-java_compact_http-ip",
9891
"cpp-java_compact_http-ip-ssl",
99-
"cpp-java_compact_zlib-ip-ssl",
100-
"cpp-java_json_buffered-ip-ssl",
101-
"cpp-java_json_framed-fastframed-ip-ssl",
102-
"cpp-java_json_framed-ip-ssl",
10392
"cpp-java_json_http-ip",
10493
"cpp-java_json_http-ip-ssl",
105-
"cpp-java_json_zlib-ip-ssl",
106-
"cpp-java_multi-binary_buffered-ip-ssl",
107-
"cpp-java_multi-binary_framed-fastframed-ip-ssl",
108-
"cpp-java_multi-binary_framed-ip-ssl",
10994
"cpp-java_multi-binary_http-ip",
11095
"cpp-java_multi-binary_http-ip-ssl",
111-
"cpp-java_multi-binary_zlib-ip-ssl",
112-
"cpp-java_multi_buffered-ip-ssl",
113-
"cpp-java_multi_framed-fastframed-ip-ssl",
114-
"cpp-java_multi_framed-ip-ssl",
11596
"cpp-java_multi_http-ip",
11697
"cpp-java_multi_http-ip-ssl",
117-
"cpp-java_multi_zlib-ip-ssl",
118-
"cpp-java_multic-compact_buffered-ip-ssl",
119-
"cpp-java_multic-compact_framed-fastframed-ip-ssl",
120-
"cpp-java_multic-compact_framed-ip-ssl",
12198
"cpp-java_multic-compact_http-ip",
12299
"cpp-java_multic-compact_http-ip-ssl",
123-
"cpp-java_multic-compact_zlib-ip-ssl",
124-
"cpp-java_multic_buffered-ip-ssl",
125-
"cpp-java_multic_framed-fastframed-ip-ssl",
126-
"cpp-java_multic_framed-ip-ssl",
127100
"cpp-java_multic_http-ip",
128101
"cpp-java_multic_http-ip-ssl",
129-
"cpp-java_multic_zlib-ip-ssl",
130-
"cpp-java_multij-json_buffered-ip-ssl",
131-
"cpp-java_multij-json_framed-fastframed-ip-ssl",
132-
"cpp-java_multij-json_framed-ip-ssl",
133102
"cpp-java_multij-json_http-ip",
134103
"cpp-java_multij-json_http-ip-ssl",
135-
"cpp-java_multij-json_zlib-ip-ssl",
136-
"cpp-java_multij_buffered-ip-ssl",
137-
"cpp-java_multij_framed-fastframed-ip-ssl",
138-
"cpp-java_multij_framed-ip-ssl",
139104
"cpp-java_multij_http-ip",
140105
"cpp-java_multij_http-ip-ssl",
141-
"cpp-java_multij_zlib-ip-ssl",
142106
"cpp-netstd_binary_buffered-ip",
143107
"cpp-netstd_binary_buffered-ip-ssl",
144108
"cpp-netstd_binary_framed-ip",
@@ -513,24 +477,12 @@
513477
"go-dart_binary_http-ip",
514478
"go-dart_compact_http-ip",
515479
"go-dart_json_http-ip",
516-
"go-java_binary_buffered-ip-ssl",
517-
"go-java_binary_framed-fastframed-ip-ssl",
518-
"go-java_binary_framed-ip-ssl",
519480
"go-java_binary_http-ip",
520481
"go-java_binary_http-ip-ssl",
521-
"go-java_binary_zlib-ip-ssl",
522-
"go-java_compact_buffered-ip-ssl",
523-
"go-java_compact_framed-fastframed-ip-ssl",
524-
"go-java_compact_framed-ip-ssl",
525482
"go-java_compact_http-ip",
526483
"go-java_compact_http-ip-ssl",
527-
"go-java_compact_zlib-ip-ssl",
528-
"go-java_json_buffered-ip-ssl",
529-
"go-java_json_framed-fastframed-ip-ssl",
530-
"go-java_json_framed-ip-ssl",
531484
"go-java_json_http-ip",
532485
"go-java_json_http-ip-ssl",
533-
"go-java_json_zlib-ip-ssl",
534486
"go-netstd_binary_buffered-ip",
535487
"go-netstd_binary_buffered-ip-ssl",
536488
"go-netstd_binary_framed-ip",
@@ -557,42 +509,6 @@
557509
"hs-php_binary-accel_framed-ip",
558510
"hs-php_json_buffered-ip",
559511
"hs-php_json_framed-ip",
560-
"java-cpp_binary_buffered-ip-ssl",
561-
"java-cpp_binary_fastframed-framed-ip-ssl",
562-
"java-cpp_binary_framed-ip-ssl",
563-
"java-cpp_binary_zlib-ip-ssl",
564-
"java-cpp_compact_buffered-ip-ssl",
565-
"java-cpp_compact_fastframed-framed-ip-ssl",
566-
"java-cpp_compact_framed-ip-ssl",
567-
"java-cpp_compact_zlib-ip-ssl",
568-
"java-cpp_json_buffered-ip-ssl",
569-
"java-cpp_json_fastframed-framed-ip-ssl",
570-
"java-cpp_json_framed-ip-ssl",
571-
"java-cpp_json_zlib-ip-ssl",
572-
"java-cpp_multi-binary_buffered-ip-ssl",
573-
"java-cpp_multi-binary_fastframed-framed-ip-ssl",
574-
"java-cpp_multi-binary_framed-ip-ssl",
575-
"java-cpp_multi-binary_zlib-ip-ssl",
576-
"java-cpp_multi_buffered-ip-ssl",
577-
"java-cpp_multi_fastframed-framed-ip-ssl",
578-
"java-cpp_multi_framed-ip-ssl",
579-
"java-cpp_multi_zlib-ip-ssl",
580-
"java-cpp_multic-compact_buffered-ip-ssl",
581-
"java-cpp_multic-compact_fastframed-framed-ip-ssl",
582-
"java-cpp_multic-compact_framed-ip-ssl",
583-
"java-cpp_multic-compact_zlib-ip-ssl",
584-
"java-cpp_multic_buffered-ip-ssl",
585-
"java-cpp_multic_fastframed-framed-ip-ssl",
586-
"java-cpp_multic_framed-ip-ssl",
587-
"java-cpp_multic_zlib-ip-ssl",
588-
"java-cpp_multij-json_buffered-ip-ssl",
589-
"java-cpp_multij-json_fastframed-framed-ip-ssl",
590-
"java-cpp_multij-json_framed-ip-ssl",
591-
"java-cpp_multij-json_zlib-ip-ssl",
592-
"java-cpp_multij_buffered-ip-ssl",
593-
"java-cpp_multij_fastframed-framed-ip-ssl",
594-
"java-cpp_multij_framed-ip-ssl",
595-
"java-cpp_multij_zlib-ip-ssl",
596512
"java-erl_binary_buffered-ip-ssl",
597513
"java-erl_binary_fastframed-framed-ip-ssl",
598514
"java-erl_binary_framed-ip-ssl",

0 commit comments

Comments
 (0)