From 907332ff061b938a445caa22f0997116c92bc996 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Mon, 27 Jan 2025 20:20:27 +0700
Subject: [PATCH] [FEATURE] Fix truststore path

---
 .../java/pro/gravit/launchserver/LaunchServerStarter.java   | 2 +-
 .../gravit/launchserver/manangers/CertificateManager.java   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java
index 3db4c2be..34a6fd26 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java
@@ -63,7 +63,7 @@ public static void main(String[] args) throws Exception {
         directories.collect();
         CertificateManager certificateManager = new CertificateManager();
         try {
-            certificateManager.readTrustStore(dir.resolve("truststore"));
+            certificateManager.readTrustStore(directories.trustStore);
         } catch (CertificateException e) {
             throw new IOException(e);
         }
diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java
index fa822fcf..81f7f68b 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java
@@ -29,6 +29,7 @@
 public class CertificateManager {
     private transient final Logger logger = LogManager.getLogger();
     public LauncherTrustManager trustManager;
+    private Path truststorePath;
 
     public void writePrivateKey(Path file, PrivateKey privateKey) throws IOException {
         writePrivateKey(IOHelper.newWriter(file), privateKey);
@@ -91,6 +92,7 @@ public X509CertificateHolder readCertificate(Reader reader) throws IOException {
     }
 
     public void readTrustStore(Path dir) throws IOException, CertificateException {
+        this.truststorePath = dir;
         if (!IOHelper.isDir(dir)) {
             Files.createDirectories(dir);
             try {
@@ -131,4 +133,8 @@ public LauncherTrustManager.CheckClassResult checkClass(Class<?> clazz) {
         X509Certificate[] certificates = JVMHelper.getCertificates(clazz);
         return trustManager.checkCertificates(certificates, trustManager::stdCertificateChecker);
     }
+
+    public Path getTruststorePath() {
+        return truststorePath;
+    }
 }