You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2018/01/30 20:00:40 UTC
[bookkeeper] branch master updated: URLDecode key/cert paths in
TestTLS
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 1ea725d URLDecode key/cert paths in TestTLS
1ea725d is described below
commit 1ea725d1755995a004f191b24bc6742e100a7899
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Tue Jan 30 12:00:34 2018 -0800
URLDecode key/cert paths in TestTLS
In TestTLS we load keys/certs from the classpath, which means we get
the filename as a URL. Since it is a URL it is URL encoded for special
characters. Usually this is not an issue, but in the case that there
are special characters in the path, these will be encoded, and then
when we try to open the file we get a FileNotFoundException. This
occurs on jenkins, when there are two parallel builds on the same
job (it adds a N to the workspace name), and was causing all TLS
tests to fail in that case.
Author: Ivan Kelly <iv...@apache.org>
Reviewers: Sijie Guo <si...@apache.org>
This closes #1074 from ivankelly/tls-fix
---
.../java/org/apache/bookkeeper/tls/TestTLS.java | 60 ++++++++++------------
1 file changed, 26 insertions(+), 34 deletions(-)
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
index 501fff8..0f51dcf 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
@@ -99,6 +99,10 @@ public class TestTLS extends BookKeeperClusterTestCase {
this.serverTrustStoreFormat = TLSContextFactory.KeyStoreType.valueOf(trustStoreFormat);
}
+ private String getResourcePath(String resource) throws Exception {
+ return this.getClass().getClassLoader().getResource(resource).toURI().getPath();
+ }
+
@Before
@Override
public void setUp() throws Exception {
@@ -109,23 +113,20 @@ public class TestTLS extends BookKeeperClusterTestCase {
switch (clientKeyStoreFormat) {
case PEM:
baseClientConf.setTLSKeyStoreType("PEM");
- baseClientConf.setTLSKeyStore(this.getClass().getClassLoader().getResource("client-key.pem").getPath());
- baseClientConf.setTLSCertificatePath(
- this.getClass().getClassLoader().getResource("client-cert.pem").getPath());
+ baseClientConf.setTLSKeyStore(getResourcePath("client-key.pem"));
+ baseClientConf.setTLSCertificatePath(getResourcePath("client-cert.pem"));
break;
case JKS:
baseClientConf.setTLSKeyStoreType("JKS");
- baseClientConf.setTLSKeyStore(this.getClass().getClassLoader().getResource("client-key.jks").getPath());
- baseClientConf.setTLSKeyStorePasswordPath(
- this.getClass().getClassLoader().getResource("keyStoreClientPassword.txt").getPath());
+ baseClientConf.setTLSKeyStore(getResourcePath("client-key.jks"));
+ baseClientConf.setTLSKeyStorePasswordPath(getResourcePath("keyStoreClientPassword.txt"));
break;
case PKCS12:
baseClientConf.setTLSKeyStoreType("PKCS12");
- baseClientConf.setTLSKeyStore(this.getClass().getClassLoader().getResource("client-key.p12").getPath());
- baseClientConf.setTLSKeyStorePasswordPath(
- this.getClass().getClassLoader().getResource("keyStoreClientPassword.txt").getPath());
+ baseClientConf.setTLSKeyStore(getResourcePath("client-key.p12"));
+ baseClientConf.setTLSKeyStorePasswordPath(getResourcePath("keyStoreClientPassword.txt"));
break;
default:
@@ -135,24 +136,19 @@ public class TestTLS extends BookKeeperClusterTestCase {
switch (clientTrustStoreFormat) {
case PEM:
baseClientConf.setTLSTrustStoreType("PEM");
- baseClientConf
- .setTLSTrustStore(this.getClass().getClassLoader().getResource("server-cert.pem").getPath());
+ baseClientConf.setTLSTrustStore(getResourcePath("server-cert.pem"));
break;
case JKS:
baseClientConf.setTLSTrustStoreType("JKS");
- baseClientConf
- .setTLSTrustStore(this.getClass().getClassLoader().getResource("server-key.jks").getPath());
- baseClientConf.setTLSTrustStorePasswordPath(
- this.getClass().getClassLoader().getResource("keyStoreServerPassword.txt").getPath());
+ baseClientConf.setTLSTrustStore(getResourcePath("server-key.jks"));
+ baseClientConf.setTLSTrustStorePasswordPath(getResourcePath("keyStoreServerPassword.txt"));
break;
case PKCS12:
baseClientConf.setTLSTrustStoreType("PKCS12");
- baseClientConf
- .setTLSTrustStore(this.getClass().getClassLoader().getResource("server-key.p12").getPath());
- baseClientConf.setTLSTrustStorePasswordPath(
- this.getClass().getClassLoader().getResource("keyStoreServerPassword.txt").getPath());
+ baseClientConf.setTLSTrustStore(getResourcePath("server-key.p12"));
+ baseClientConf.setTLSTrustStorePasswordPath(getResourcePath("keyStoreServerPassword.txt"));
break;
default:
@@ -166,22 +162,20 @@ public class TestTLS extends BookKeeperClusterTestCase {
switch (serverKeyStoreFormat) {
case PEM:
baseConf.setTLSKeyStoreType("PEM");
- baseConf.setTLSKeyStore(this.getClass().getClassLoader().getResource("server-key.pem").getPath());
- baseConf.setTLSCertificatePath(this.getClass().getClassLoader().getResource("server-cert.pem").getPath());
+ baseConf.setTLSKeyStore(getResourcePath("server-key.pem"));
+ baseConf.setTLSCertificatePath(getResourcePath("server-cert.pem"));
break;
case JKS:
baseConf.setTLSKeyStoreType("JKS");
- baseConf.setTLSKeyStore(this.getClass().getClassLoader().getResource("server-key.jks").getPath());
- baseConf.setTLSKeyStorePasswordPath(
- this.getClass().getClassLoader().getResource("keyStoreServerPassword.txt").getPath());
+ baseConf.setTLSKeyStore(getResourcePath("server-key.jks"));
+ baseConf.setTLSKeyStorePasswordPath(getResourcePath("keyStoreServerPassword.txt"));
break;
case PKCS12:
baseConf.setTLSKeyStoreType("PKCS12");
- baseConf.setTLSKeyStore(this.getClass().getClassLoader().getResource("server-key.p12").getPath());
- baseConf.setTLSKeyStorePasswordPath(
- this.getClass().getClassLoader().getResource("keyStoreServerPassword.txt").getPath());
+ baseConf.setTLSKeyStore(getResourcePath("server-key.p12"));
+ baseConf.setTLSKeyStorePasswordPath(getResourcePath("keyStoreServerPassword.txt"));
break;
default:
@@ -191,22 +185,20 @@ public class TestTLS extends BookKeeperClusterTestCase {
switch (serverTrustStoreFormat) {
case PEM:
baseConf.setTLSTrustStoreType("PEM");
- baseConf.setTLSTrustStore(this.getClass().getClassLoader().getResource("client-cert.pem").getPath());
+ baseConf.setTLSTrustStore(getResourcePath("client-cert.pem"));
break;
case JKS:
baseConf.setTLSTrustStoreType("JKS");
- baseConf.setTLSTrustStore(this.getClass().getClassLoader().getResource("client-key.jks").getPath());
- baseConf.setTLSTrustStorePasswordPath(
- this.getClass().getClassLoader().getResource("keyStoreClientPassword.txt").getPath());
+ baseConf.setTLSTrustStore(getResourcePath("client-key.jks"));
+ baseConf.setTLSTrustStorePasswordPath(getResourcePath("keyStoreClientPassword.txt"));
break;
case PKCS12:
baseConf.setTLSTrustStoreType("PKCS12");
- baseConf.setTLSTrustStore(this.getClass().getClassLoader().getResource("client-key.p12").getPath());
- baseConf.setTLSTrustStorePasswordPath(
- this.getClass().getClassLoader().getResource("keyStoreClientPassword.txt").getPath());
+ baseConf.setTLSTrustStore(getResourcePath("client-key.p12"));
+ baseConf.setTLSTrustStorePasswordPath(getResourcePath("keyStoreClientPassword.txt"));
break;
default:
--
To stop receiving notification emails like this one, please contact
sijie@apache.org.