sijie closed pull request #1074: URLDecode key/cert paths in TestTLS
URL: https://github.com/apache/bookkeeper/pull/1074
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 501fff839..0f51dcfaa 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 TestTLS(String keyStoreFormat, String
trustStoreFormat) {
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 void setUp() throws Exception {
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 void setUp() throws Exception {
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 void setUp() throws Exception {
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 void setUp() throws Exception {
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:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
