[FIX] Launcher update token

LaunchServer/src/main/java/pro/gravit/launchserver/auth/updates/LocalUpdatesProvider.java

@@ -13,6 +13,7 @@
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -130,24 +131,41 @@ public HashedDir getUpdatesDir(String updateName) {
         return updatesDirMap.get(updateName);
     }
 
+    private Path resolveUpdateName(String updateName) {
+        if(updateName == null) {
+            return Path.of(updatesDir);
+        }
+        return Path.of(updatesDir).resolve(updateName);
+    }
+
     @Override
     public void upload(String updateName, Map<String, Path> files, boolean deleteAfterUpload) throws IOException {
-        var path = Path.of(updatesDir).resolve(updateName);
+        var path = resolveUpdateName(updateName);
         for(var e : files.entrySet()) {
             var target = path.resolve(e.getKey());
-            var source = Path.of(e.getKey());
+            var source = e.getValue();
             IOHelper.createParentDirs(target);
             if(deleteAfterUpload) {
-                Files.move(source, target);
+                Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
             } else {
-                Files.copy(source, target);
+                Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
             }
         }
     }
 
+    @Override
+    public Map<String, Path> download(String updateName, List<String> files) {
+        var path = resolveUpdateName(updateName);
+        Map<String, Path> map = new HashMap<>();
+        for(var e : files) {
+            map.put(e, path.resolve(e));
+        }
+        return map;
+    }
+
     @Override
     public void delete(String updateName, List<String> files) throws IOException {
-        var path = Path.of(updatesDir).resolve(updateName);
+        var path = resolveUpdateName(updateName);
         for(var e : files) {
             var target = path.resolve(e);
             Files.delete(target);
@@ -156,13 +174,13 @@ public void delete(String updateName, List<String> files) throws IOException {
 
     @Override
     public void delete(String updateName) throws IOException {
-        var path = Path.of(updatesDir).resolve(updateName);
+        var path = resolveUpdateName(updateName);
         IOHelper.deleteDir(path, true);
     }
 
     @Override
     public void create(String updateName) throws IOException {
-        var path = Path.of(updatesDir).resolve(updateName);
+        var path = resolveUpdateName(updateName);
         Files.createDirectories(path);
     }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/updates/UpdatesProvider.java

@@ -37,9 +37,15 @@ public void sync() throws IOException {
 
     public abstract void upload(String updateName, Map<String, Path> files, boolean deleteAfterUpload) throws IOException;
 
+    public abstract Map<String, Path> download(String updateName, List<String> files);
+
     public abstract void delete(String updateName, List<String> files) throws IOException;
 
     public abstract void delete(String updateName) throws IOException;
 
     public abstract void create(String updateName) throws IOException;
+
+    public void close() {
+
+    }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/binary/LauncherBinary.java

@@ -7,6 +7,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Map;
 
 public abstract class LauncherBinary extends BinaryPipeline {
@@ -56,9 +57,13 @@ public void init() {
     }
 
     public final boolean sync() throws IOException {
-        boolean exists = exists();
+        try {
-        digest = exists ? SecurityHelper.digest(SecurityHelper.DigestAlgorithm.SHA512, IOHelper.read(syncBinaryFile)) : null;
+            var target = syncBinaryFile.toString();
-
+            var path = server.config.updatesProvider.download(null, List.of(target)).get(target);
-        return exists;
+            digest = SecurityHelper.digest(SecurityHelper.DigestAlgorithm.SHA512, IOHelper.read(path));
+            return true;
+        } catch (Throwable e) {
+            return false;
+        }
     }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java

@@ -176,6 +176,10 @@ public void init(LaunchServer.ReloadType type) {
             server.registerObject("profileProvider", profileProvider);
             profileProvider.init(server);
         }
+        if(updatesProvider != null) {
+            server.registerObject("updatesProvider", updatesProvider);
+            updatesProvider.init(server);
+        }
         if (components != null) {
             components.forEach((k, v) -> server.registerObject("component.".concat(k), v));
         }
@@ -220,6 +224,10 @@ public void close(LaunchServer.ReloadType type) {
             server.unregisterObject("profileProvider", profileProvider);
             profileProvider.close();
         }
+        if(updatesProvider != null) {
+            server.unregisterObject("updatesProvider", updatesProvider);
+            updatesProvider.close();
+        }
     }
 
     public static class JarSignerConf {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/LauncherResponse.java

@@ -52,7 +52,7 @@ public void execute(ChannelHandlerContext ctx, Client client) {
                 client.checkSign = true;
                 sendResult(new LauncherRequestEvent(false, server.config.netty.launcherURL, createLauncherExtendedToken(), server.config.netty.security.launcherTokenExpire*1000));
             } else {
-                sendResultAndClose(new LauncherRequestEvent(true, server.config.netty.launcherURL, createLauncherExtendedToken(), server.config.netty.security.launcherTokenExpire*1000));
+                sendResultAndClose(new LauncherRequestEvent(true, server.config.netty.launcherURL, null, 0));
             }
         } else if (launcher_type == 2) //EXE
         {
@@ -62,7 +62,7 @@ public void execute(ChannelHandlerContext ctx, Client client) {
                 client.checkSign = true;
                 sendResult(new LauncherRequestEvent(false, server.config.netty.launcherEXEURL, createLauncherExtendedToken(), server.config.netty.security.launcherTokenExpire*1000));
             } else {
-                sendResultAndClose(new LauncherRequestEvent(true, server.config.netty.launcherEXEURL, createLauncherExtendedToken(), server.config.netty.security.launcherTokenExpire*1000));
+                sendResultAndClose(new LauncherRequestEvent(true, server.config.netty.launcherEXEURL, null, 0));
             }
         } else sendError("Request launcher type error");
     }

modules

@@ -1 +1 @@
-Subproject commit 9127b086a22c01a174e74a5101329500b106de62
+Subproject commit f615855642ebcb69c5bc98c918782b65ca785a74