Merge 05530b6664 into 834fbab12b

Убрал исключения для совместимости

LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/DjangoPasswordVerifier.java

@@ -0,0 +1,42 @@
+package pro.gravit.launchserver.auth.password;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
+import org.bouncycastle.crypto.params.KeyParameter;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+public class DjangoPasswordVerifier extends PasswordVerifier {
+    public final Integer DEFAULT_ITERATIONS = 10000;
+    private static final Logger logger = LogManager.getLogger();
+    private static final String algorithm = "pbkdf2_sha256";
+
+    public String getEncodedHash(String password, String salt, int iterations) {
+        PKCS5S2ParametersGenerator generator = new PKCS5S2ParametersGenerator(new SHA256Digest());
+        generator.init(password.getBytes(StandardCharsets.UTF_8), salt.getBytes(), iterations);
+        byte[] dk = ((KeyParameter) generator.generateDerivedParameters(256)).getKey();
+        byte[] hashBase64 = Base64.getEncoder().encode(dk);
+        return new String(hashBase64);
+    }
+
+    public String encode(String password, String salt, int iterations) {
+        String hash = getEncodedHash(password, salt, iterations);
+        return String.format("%s$%d$%s$%s", algorithm, iterations, salt, hash);
+    }
+
+    @Override
+    public boolean check(String encryptedPassword, String password) {
+        String[] params = encryptedPassword.split("\\$");
+        if (params.length != 4) {
+            logger.warn(" end 1 " + params.length);
+            return false;
+        }
+        int iterations = Integer.parseInt(params[1]);
+        String salt = params[2];
+        String hash = encode(password, salt, iterations);
+        return hash.equals(encryptedPassword);
+    }
+}

LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/PasswordVerifier.java

@@ -15,6 +15,7 @@ public static void registerProviders() {
             providers.register("bcrypt", BCryptPasswordVerifier.class);
             providers.register("accept", AcceptPasswordVerifier.class);
             providers.register("reject", RejectPasswordVerifier.class);
+            providers.register("django", DjangoPasswordVerifier.class);
             registeredProviders = true;
         }
     }

LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java

@@ -117,7 +117,7 @@ public void invoke(String... args) throws Exception {
                 Files.deleteIfExists(proguardConf.mappings);
             }
         });
-        return null;
+        return commands;
     }
 
     public static class ProGuardMultiReleaseFixer implements LauncherBuildTask {

LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java

@@ -49,7 +49,6 @@ public static ClientProfile makeProfile(ClientProfile.Version version, String ti
         // Official Mojang launcher java arguments
         if (version.compareTo(ClientProfileVersions.MINECRAFT_1_12_2) <= 0) {
             // lwjgl3ify arguments https://github.com/GTNewHorizons/lwjgl3ify
-            jvmArgs.add("-Djava.security.manager=allow");
             jvmArgs.add("--add-opens");
             jvmArgs.add("java.base/jdk.internal.loader=ALL-UNNAMED");
             jvmArgs.add("--add-opens");

props.gradle

@@ -1,18 +1,18 @@
 project.ext {
     verAsm = '9.7.1'
-    verNetty = '4.2.0.RC3'
+    verNetty = '4.2.0.RC4'
-    verOshiCore = '6.6.6'
+    verOshiCore = '6.8.0'
     verJunit = '5.11.4'
     verJansi = '2.4.1'
     verJline = '3.29.0'
     verJwt = '0.12.6'
     verGson = '2.12.1'
     verBcpkix = '1.80'
-    verSlf4j = '2.0.16'
+    verSlf4j = '2.0.17'
     verLog4j = '2.24.3'
     verMySQLConn = '9.2.0'
     verMariaDBConn = '3.5.1'
     verPostgreSQLConn = '42.7.5'
     verH2Conn = '2.3.232'
-    verProguard = '7.6.1'
+    verProguard = '7.7.0'
 }