diff --git a/src/main/java/org/example/SteamPriceParser.java b/src/main/java/org/example/SteamPriceParser.java index 2a0113f..e1912a0 100644 --- a/src/main/java/org/example/SteamPriceParser.java +++ b/src/main/java/org/example/SteamPriceParser.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import redis.clients.jedis.*; import javax.net.ssl.*; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -53,7 +54,7 @@ public class SteamPriceParser System.out.println("Current id = " + i); System.out.println(json.toPrettyString()); - System.out.println("jedis value for " + i + "\n" + jedis.get(String.valueOf(i))); + System.out.println("jedis value for " + i + "\n" + jedis.get(String.valueOf(i))); } } @@ -87,37 +88,31 @@ public class SteamPriceParser public static DefaultJedisClientConfig prepareRedisConfig() throws GeneralSecurityException, IOException { - SSLSocketFactory sslFactory = createSslSocketFactory( - "C:\\truststore.jks", - CA_CERT_PASS, // use the password specified for keytool command - "C:\\redis-keystore.p12", - USER_CERT_PASS // use the password specified for openssl command - ); + //Hack for building absolute path for user certificate + String keystorePath = new File("src/main/resources/redis-keystore.p12").getAbsolutePath(); - return DefaultJedisClientConfig.builder() - .ssl(true) - .sslSocketFactory(sslFactory) - .user("default") - .password(REDIS_PASS) - .build(); + //Hack for building absolute path for CA certificate + String truststorePath = new File("src/main/resources/truststore.jks").getAbsolutePath(); + + SSLSocketFactory sslFactory = createSslSocketFactory(truststorePath, keystorePath); + + return DefaultJedisClientConfig.builder().ssl(true).sslSocketFactory(sslFactory).user("default").password(REDIS_PASS).build(); } - private static SSLSocketFactory createSslSocketFactory( - String caCertPath, String caCertPassword, String userCertPath, String userCertPassword) - throws IOException, GeneralSecurityException + private static SSLSocketFactory createSslSocketFactory(String caCertPath, String userCertPath) throws IOException, GeneralSecurityException { KeyStore keyStore = KeyStore.getInstance("pkcs12"); - keyStore.load(Files.newInputStream(Paths.get(userCertPath)), userCertPassword.toCharArray()); + keyStore.load(Files.newInputStream(Paths.get(userCertPath)), USER_CERT_PASS.toCharArray()); KeyStore trustStore = KeyStore.getInstance("jks"); - trustStore.load(Files.newInputStream(Paths.get(caCertPath)), caCertPassword.toCharArray()); + trustStore.load(Files.newInputStream(Paths.get(caCertPath)), CA_CERT_PASS.toCharArray()); TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("X509"); trustManagerFactory.init(trustStore); KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("PKIX"); - keyManagerFactory.init(keyStore, userCertPassword.toCharArray()); + keyManagerFactory.init(keyStore, USER_CERT_PASS.toCharArray()); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null); diff --git a/src/main/resources/redis-keystore.p12 b/src/main/resources/redis-keystore.p12 new file mode 100644 index 0000000..ae2de6e Binary files /dev/null and b/src/main/resources/redis-keystore.p12 differ diff --git a/src/main/resources/truststore.jks b/src/main/resources/truststore.jks new file mode 100644 index 0000000..1417dac Binary files /dev/null and b/src/main/resources/truststore.jks differ