Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-03 23:11:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 'asmFix'

Browse source
This commit is contained in:
zaxar163 2019-01-06 20:19:39 +04:00
commit 8735a74fed
No known key found for this signature in database
GPG key ID: CEE900027AE098E0
8 changed files with 83 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -282,7 +282,7 @@ public static void main(String... args) throws Throwable {
public final RSAPrivateKey privateKey;
// Launcher binary
public final LauncherBinary launcherBinary;
public final JARLauncherBinary launcherBinary;
public final LauncherBinary launcherEXEBinary;
// HWID ban + anti-brutforce

6
LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java
View file

@ -5,6 +5,7 @@
import java.nio.file.Path;
import java.util.ArrayList;
import ru.gravit.launcher.Launcher;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.binary.tasks.LauncherBuildTask;
import ru.gravit.launchserver.binary.tasks.MainBuildTask;
@ -16,6 +17,9 @@
public final class JARLauncherBinary extends LauncherBinary {
public ArrayList<LauncherBuildTask> tasks;
public final Path runtimeDir;
public final Path guardDir;
public JARLauncherBinary(LaunchServer server) throws IOException {
super(server);
tasks = new ArrayList<>();
@ -24,6 +28,8 @@ public JARLauncherBinary(LaunchServer server) throws IOException {
if(server.config.enabledProGuard) tasks.add(new ProGuardBuildTask(server));
if(server.config.stripLineNumbers) tasks.add(new StripLineNumbersTask(server));
syncBinaryFile = server.dir.resolve(server.config.binaryName + ".jar");
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
guardDir = server.dir.resolve(Launcher.GUARD_DIR);
}
@Override

25
LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java
View file

@ -29,11 +29,8 @@
import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.SecurityHelper;
import ru.gravit.utils.helper.UnpackHelper;
public class MainBuildTask implements LauncherBuildTask {
public final Path runtimeDir;
public final Path guardDir;
public final Path binaryFile;
public Path cleanJar;
private final LaunchServer server;
@ -49,14 +46,14 @@ private RuntimeDirVisitor(ZipOutputStream output, Map<String, byte[]> runtime) {
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
String dirName = IOHelper.toString(runtimeDir.relativize(dir));
String dirName = IOHelper.toString(server.launcherBinary.runtimeDir.relativize(dir));
output.putNextEntry(newEntry(dirName + '/'));
return super.preVisitDirectory(dir, attrs);
}
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
String fileName = IOHelper.toString(runtimeDir.relativize(file));
String fileName = IOHelper.toString(server.launcherBinary.runtimeDir.relativize(file));
runtime.put(fileName, SecurityHelper.digest(SecurityHelper.DigestAlgorithm.MD5, file));
// Create zip entry and transfer contents
@ -68,7 +65,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
}
}
// TODO: new native security wrapper and library...
private final class GuardDirVisitor extends SimpleFileVisitor<Path> {
private final ZipOutputStream output;
private final Map<String, byte[]> guard;
@ -80,14 +76,14 @@ private GuardDirVisitor(ZipOutputStream output, Map<String, byte[]> guard) {
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
String dirName = IOHelper.toString(guardDir.relativize(dir));
String dirName = IOHelper.toString(server.launcherBinary.guardDir.relativize(dir));
output.putNextEntry(newGuardEntry(dirName + '/'));
return super.preVisitDirectory(dir, attrs);
}
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
String fileName = IOHelper.toString(guardDir.relativize(file));
String fileName = IOHelper.toString(server.launcherBinary.guardDir.relativize(file));
guard.put(fileName, SecurityHelper.digest(SecurityHelper.DigestAlgorithm.MD5, file));
// Create zip entry and transfer contents
@ -106,10 +102,9 @@ private static ZipEntry newEntry(String fileName) {
private static ZipEntry newGuardEntry(String fileName) {
return newZipEntry(Launcher.GUARD_DIR + IOHelper.CROSS_SEPARATOR + fileName);
}
public MainBuildTask(LaunchServer srv) {
server = srv;
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
guardDir = server.dir.resolve(Launcher.GUARD_DIR);
binaryFile = server.dir.resolve(server.config.binaryName + "-main.jar");
reader = new ClassMetadataReader();
}
@ -177,8 +172,8 @@ public Path process(Path cleanJar) throws IOException {
Map<String, byte[]> runtime = new HashMap<>(256);
if (server.buildHookManager.buildRuntime()) {
// Write launcher guard dir
IOHelper.walk(runtimeDir, new RuntimeDirVisitor(output, runtime), false);
IOHelper.walk(guardDir, new GuardDirVisitor(output, runtime), false);
IOHelper.walk(server.launcherBinary.runtimeDir, new RuntimeDirVisitor(output, runtime), false);
IOHelper.walk(server.launcherBinary.guardDir, new GuardDirVisitor(output, runtime), false);
}
// Create launcher config file
byte[] launcherConfigBytes;
@ -207,10 +202,4 @@ public Path process(Path cleanJar) throws IOException {
public boolean allowDelete() {
return true;
}
public void tryUnpack() throws IOException {
LogHelper.info("Unpacking launcher native guard files and runtime");
UnpackHelper.unpackZipNoCheck("guard.zip", guardDir);
UnpackHelper.unpackZipNoCheck("runtime.zip", runtimeDir);
}
}

17
LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/UnpackBuildTask.java
View file

@ -1,13 +1,14 @@
package ru.gravit.launchserver.binary.tasks;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.UnpackHelper;
import java.io.IOException;
import java.net.URL;
import java.nio.file.Path;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.UnpackHelper;
public class UnpackBuildTask implements LauncherBuildTask {
private final LaunchServer server;
@ -15,7 +16,7 @@ public UnpackBuildTask(LaunchServer server) {
this.server = server;
}
@Override
@Override
public String getName() {
return "UnpackFromResources";
}
@ -32,4 +33,10 @@ public Path process(Path inputFile) throws IOException {
public boolean allowDelete() {
return false;
}
public void tryUnpack() throws IOException {
LogHelper.info("Unpacking launcher native guard files and runtime");
UnpackHelper.unpackZipNoCheck("guard.zip", server.launcherBinary.guardDir);
UnpackHelper.unpackZipNoCheck("runtime.zip", server.launcherBinary.runtimeDir);
}
}

13
Launcher/runtime/config.js
View file

@ -42,16 +42,3 @@ var serversConfig = {
return serversConfig[profile][property];
}
};
var optModNames = {
optAutoModName: true,//Попытатся автоматически создать представляемое имя модификации
modInfo: {//"Путь до опц. модификации" : "Отображаемый клиенту контент"
/*"mods/ModName-1.1.jar": {
name: "ModName", //Наименование модификации (Отображаемое в лаунчере) [Можно не указывать]
description:"Лучший в своём роде ModName.", //Описание модификации [Можно не указывать]
subTreeLevel: 1, //Уровень вложенности модификации (Ядро - 1, Мод - 2, Аддон - 3 и т.д...) (будет произведён отступ от левого края для выделения) [Можно не указывать, по умолчанию: 1]
onlyOne: true, //Для выбора только одной из группы модификаций [Можно не указывать]
onlyOneGroup: 1 //Используется в совокупности с onlyOne. Определяет ту самую группу, из которой производится выбор.
},*/
}
}

3
Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
View file

@ -279,9 +279,6 @@ public static boolean isUsingWrapper() {
}
private static void launch(ClientProfile profile, Params params) throws Throwable {
// Add natives path
//JVMHelper.addNativePath(params.clientDir.resolve(NATIVES_DIR));
// Add client args
Collection<String> args = new LinkedList<>();
if (profile.getVersion().compareTo(ClientProfile.Version.MC164) >= 0)

56
compat/auth/asframework.php Normal file
View file

@ -0,0 +1,56 @@
<?php
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
namespace controllers;
use \Account;
use \app;
use \AccountException;
/**
* Description of minecraftController
*
* @author gravit
*/
const SECRET_AUTH_KEY = "8k37Jm4l33jQw88eRo9LV";
class minecraftController extends \Controller {
//put your code here
public function request($args) {
\helpers\ajaxHelper::returnStatus(400);
}
public function getAction($args) {
api\userAction::getuserAction($args);
}
public function checkAuthAction($args)
{
if($args['access_key'] !== SECRET_AUTH_KEY)
{
echo 'server access key incorrect';
app::stop();
}
try {
$acc = new Account();
$acc->auth($args['login'],$args['pass']);
echo 'OK:'.$acc->login.'';
app::stop();
} catch (AccountException $e) {
$msg = $e->getMessage();
if ($msg == AccountException::AuthError) {
echo 'Login or password is incorrect';
app::stop();
}
if ($msg == AccountException::NoLoginError) {
echo 'This account is not allowed to sign in';
app::stop();
}
if ($msg == AccountException::FatalBanError) {
echo 'You are permanently banned';
app::stop();
}
}
}
}

2
libLauncher/src/main/java/ru/gravit/launcher/LauncherAgent.java
View file

@ -7,7 +7,7 @@
import java.util.jar.JarFile;
@LauncherAPI
public class LauncherAgent {
public final class LauncherAgent {
private static boolean isAgentStarted = false;
public static Instrumentation inst;