From b22d4a7f6f262d6174170d13cd4f95f67658f3bf Mon Sep 17 00:00:00 2001 From: goodwin Date: Sat, 27 Jan 2024 23:59:03 +0300 Subject: [PATCH] moved certs inside of project --- .../java/org/example/SteamPriceParser.java | 33 ++++++++---------- src/main/resources/redis-keystore.p12 | Bin 0 -> 2514 bytes src/main/resources/truststore.jks | Bin 0 -> 1622 bytes 3 files changed, 14 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/redis-keystore.p12 create mode 100644 src/main/resources/truststore.jks 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 0000000000000000000000000000000000000000..ae2de6e798db0e94b8e1b9541c3404b5986a0d42 GIT binary patch literal 2514 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 U{*ApU54SnL96@1k4FUou5K?>z_W%F@ literal 0 HcmV?d00001