Фикс бага с FileNameMatcher из основной ветки лаунчера

gravit0 · Aug 10, 2018 · a215c5e · a215c5e
1 parent a3fabb9
commit a215c5e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 65 deletions.
diff --git a/LaunchServer/source/LaunchServer.java b/LaunchServer/source/LaunchServer.java
@@ -5,7 +5,6 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.net.URL;
 import java.nio.file.DirectoryStream;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -337,7 +336,6 @@ private void generateConfigIfNotExists() throws IOException {
     }
 
     public static void main(String... args) throws Throwable {
-        SecurityHelper.verifyCertificates(LaunchServer.class);
         JVMHelper.verifySystemProperties(LaunchServer.class, true);
         LogHelper.addOutput(IOHelper.WORKING_DIR.resolve("LaunchServer.log"));
         LogHelper.printVersion("LaunchServer");

diff --git a/LaunchServer/source/auth/handler/JsonAuthHandler.java b/LaunchServer/source/auth/handler/JsonAuthHandler.java
@@ -4,11 +4,9 @@
 import com.eclipsesource.json.JsonObject;
 import com.eclipsesource.json.JsonValue;
 import launcher.helper.IOHelper;
-import launcher.helper.SecurityHelper;
 import launcher.helper.VerifyHelper;
 import launcher.serialize.config.entry.BlockConfigEntry;
 import launcher.serialize.config.entry.StringConfigEntry;
-import launchserver.auth.provider.AuthProviderResult;
 
 import java.io.IOException;
 import java.io.InputStreamReader;

diff --git a/Launcher/source/LauncherEngine.java b/Launcher/source/LauncherEngine.java
@@ -69,7 +69,6 @@ public Object loadScript(URL url) throws IOException, ScriptException {
     }
 
     public static void main(String... args) throws Throwable {
-        SecurityHelper.verifyCertificates(Launcher.class);
         JVMHelper.verifySystemProperties(Launcher.class, true);
         LogHelper.printVersion("Launcher");
 

diff --git a/Launcher/source/client/ClientLauncher.java b/Launcher/source/client/ClientLauncher.java
@@ -7,7 +7,6 @@
 import java.lang.invoke.MethodType;
 import java.net.URL;
 import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
@@ -39,7 +38,6 @@
 import launcher.helper.JVMHelper.OS;
 import launcher.helper.LogHelper;
 import launcher.helper.SecurityHelper;
-import launcher.helper.VerifyHelper;
 import launcher.request.update.LauncherRequest;
 import launcher.serialize.HInput;
 import launcher.serialize.HOutput;
@@ -170,7 +168,6 @@ public static void main(String... args) throws Throwable {
             // Read hdirs
             assetHDir = new SignedObjectHolder<>(input, publicKey, HashedDir::new);
             clientHDir = new SignedObjectHolder<>(input, publicKey, HashedDir::new);
-        } finally {
         }
 
         // Verify ClientLauncher sign and classpath

diff --git a/libLauncher/src/launcher/LauncherClassLoader.java b/libLauncher/src/launcher/LauncherClassLoader.java
@@ -2,7 +2,6 @@
 
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.net.URLStreamHandlerFactory;
 
 public class LauncherClassLoader extends URLClassLoader {
     /**

diff --git a/libLauncher/src/launcher/hasher/FileNameMatcher.java b/libLauncher/src/launcher/hasher/FileNameMatcher.java
@@ -2,28 +2,19 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
-import java.util.regex.Pattern;
 
 import launcher.LauncherAPI;
-import launcher.helper.IOHelper;
 
 public final class FileNameMatcher {
-    private static final Entry[] NO_ENTRIES = new Entry[0];
+    private static final String[] NO_ENTRIES = new String[0];
 
     // Instance
-    private final Entry[] update;
-    private final Entry[] verify;
-    private final Entry[] exclusions;
+    private final String[] update;
+    private final String[] verify;
+    private final String[] exclusions;
 
     @LauncherAPI
     public FileNameMatcher(String[] update, String[] verify, String[] exclusions) {
-        this.update = toEntries(update);
-        this.verify = toEntries(verify);
-        this.exclusions = toEntries(exclusions);
-    }
-
-    private FileNameMatcher(Entry[] update, Entry[] verify, Entry[] exclusions) {
         this.update = update;
         this.verify = verify;
         this.exclusions = exclusions;
@@ -44,38 +35,14 @@ public FileNameMatcher verifyOnly() {
         return new FileNameMatcher(NO_ENTRIES, verify, exclusions);
     }
 
-    private static boolean anyMatch(Entry[] entries, Collection<String> path) {
-        return Arrays.stream(entries).anyMatch(e -> e.matches(path));
-    }
-
-    private static Entry[] toEntries(String... entries) {
-        return Arrays.stream(entries).map(Entry::new).toArray(Entry[]::new);
-    }
-
-    private static final class Entry {
-        private static final Pattern SPLITTER = Pattern.compile(Pattern.quote(IOHelper.CROSS_SEPARATOR) + '+');
-        private final Pattern[] parts;
-
-        private Entry(CharSequence exclusion) {
-            parts = SPLITTER.splitAsStream(exclusion).map(Pattern::compile).toArray(Pattern[]::new);
-        }
-
-        private boolean matches(Collection<String> path) {
-            if (parts.length > path.size()) {
-                return false;
-            }
-
-            // Verify path parts
-            Iterator<String> iterator = path.iterator();
-            for (Pattern patternPart : parts) {
-                String pathPart = iterator.next();
-                if (!patternPart.matcher(pathPart).matches()) {
-                    return false;
-                }
-            }
-
-            // All matches
-            return true;
-        }
+    private static boolean anyMatch(String[] entries, Collection<String> path) {
+        return path.stream().anyMatch(e -> Arrays.stream(entries).anyMatch(p -> p.endsWith(e)));
+        //for(String p : path)
+        //{
+        //    for(String e : entries)
+        //    {
+        //        if(p.endsWith(e)) return true;
+        //    }
+        //}
     }
 }
diff --git a/libLauncher/src/launcher/helper/JVMHelper.java b/libLauncher/src/launcher/helper/JVMHelper.java
@@ -1,22 +1,14 @@
 package launcher.helper;
 
 import java.io.File;
-import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodHandles.Lookup;
-import java.lang.invoke.MethodType;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
-import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.cert.CertSelector;
 import java.security.cert.Certificate;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Locale;
 
 import com.sun.management.OperatingSystemMXBean;
@@ -97,7 +89,6 @@ public static boolean isJVMMatchesSystemArch() {
     @LauncherAPI
     public static void verifySystemProperties(Class<?> mainClass, boolean requireSystem) {
         Locale.setDefault(Locale.US);
-
         // Verify class loader
         LogHelper.debug("Verifying class loader");
         if (requireSystem && !mainClass.getClassLoader().equals(LOADER)) {

diff --git a/libLauncher/src/launcher/helper/SecurityHelper.java b/libLauncher/src/launcher/helper/SecurityHelper.java
@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Path;
-import java.security.CodeSource;
 import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.KeyFactory;