Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-06-28 20:18:10 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE][REFACTOR] New launcher build pipeline

Browse source
This commit is contained in:
Gravita 2025-06-28 23:02:47 +07:00
parent 101d8c7275
commit bda6a35945
28 changed files with 223 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java
View file

@ -2,17 +2,16 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import pro.gravit.launcher.base.events.RequestEvent;
import pro.gravit.launcher.base.events.request.ProfilesRequestEvent;
import pro.gravit.launcher.base.modules.events.ClosePhase;
import pro.gravit.launcher.base.profiles.ClientProfile;
import pro.gravit.launchserver.auth.AuthProviderPair;
import pro.gravit.launchserver.auth.core.RejectAuthCoreProvider;
import pro.gravit.launchserver.auth.updates.UpdatesProvider;
import pro.gravit.launchserver.binary.EXELauncherBinary;
import pro.gravit.launchserver.binary.JARLauncherBinary;
import pro.gravit.launchserver.binary.LauncherBinary;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.launchserver.config.LaunchServerConfig;
import pro.gravit.launchserver.config.LaunchServerRuntimeConfig;
import pro.gravit.launchserver.helper.SignHelper;
import pro.gravit.launchserver.launchermodules.LauncherModuleLoader;
import pro.gravit.launchserver.manangers.*;
@ -84,10 +83,6 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
public final Path librariesDir;
public final Path controlFile;
public final Path proguardDir;
/**
* This object contains runtime configuration
*/
public final LaunchServerRuntimeConfig runtime;
/**
* Pipeline for building JAR
*/
@ -119,7 +114,7 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
public final int shardId;
public LaunchServerConfig config;
public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, LaunchServerConfig config, LaunchServerRuntimeConfig runtimeConfig, LaunchServerConfigManager launchServerConfigManager, LaunchServerModulesManager modulesManager, KeyAgreementManager keyAgreementManager, CommandHandler commandHandler, CertificateManager certificateManager, int shardId) throws IOException {
public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, LaunchServerConfig config, LaunchServerConfigManager launchServerConfigManager, LaunchServerModulesManager modulesManager, KeyAgreementManager keyAgreementManager, CommandHandler commandHandler, CertificateManager certificateManager, int shardId) throws IOException {
this.dir = directories.dir;
this.tmpDir = directories.tmpDir;
this.env = env;
@ -129,7 +124,6 @@ public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, La
this.updatesDir = directories.updatesDir;
this.keyAgreementManager = keyAgreementManager;
this.commandHandler = commandHandler;
this.runtime = runtimeConfig;
this.certificateManager = certificateManager;
this.service = Executors.newScheduledThreadPool(config.netty.performance.schedulerThread);
launcherLibraries = directories.launcherLibrariesDir;
@ -151,7 +145,6 @@ public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, La
// Print keypair fingerprints
runtime.verify();
config.verify();
// build hooks, anti-brutforce and other
@ -260,7 +253,6 @@ public void invoke(String... args) throws Exception {
@Override
public void invoke(String... args) throws Exception {
launchServerConfigManager.writeConfig(config);
launchServerConfigManager.writeRuntimeConfig(runtime);
logger.info("LaunchServerConfig saved");
}
};
@ -309,6 +301,12 @@ public Path createTempDirectory(String name) throws IOException {
return path;
}
public Path createTempFilePath(String name, String ext) throws IOException {
var path = tmpDir.resolve(String.format("launchserver-%s-%s.%s", name, SecurityHelper.randomStringToken(), ext));
IOHelper.createParentDirs(path);
return path;
}
private LauncherBinary binary() {
LaunchServerLauncherExeInit event = new LaunchServerLauncherExeInit(this, null);
modulesManager.invokeEvent(event);
@ -319,8 +317,20 @@ private LauncherBinary binary() {
}
public void buildLauncherBinaries() throws IOException {
launcherBinary.build();
launcherEXEBinary.build();
PipelineContext launcherContext = launcherBinary.build();
PipelineContext exeContext = launcherEXEBinary.build();
UpdatesProvider.UpdateUploadInfo jarInfo = launcherContext.makeUploadInfo(UpdatesProvider.UpdateVariant.JAR);
UpdatesProvider.UpdateUploadInfo exeInfo = exeContext.makeUploadInfo(UpdatesProvider.UpdateVariant.EXE);
List<UpdatesProvider.UpdateUploadInfo> list = new ArrayList<>(2);
if(jarInfo != null) {
list.add(jarInfo);
}
if(exeInfo != null) {
list.add(exeInfo);
}
config.updatesProvider.pushUpdate(list);
launcherContext.clear();
exeContext.clear();
}
public void close() throws Exception {
@ -330,8 +340,6 @@ public void close() throws Exception {
// Close handlers & providers
config.close(ReloadType.FULL);
modulesManager.invokeEvent(new ClosePhase());
logger.info("Save LaunchServer runtime config");
launchServerConfigManager.writeRuntimeConfig(runtime);
// Print last message before death :(
logger.info("LaunchServer stopped");
}
@ -404,11 +412,7 @@ public enum LaunchServerEnv {
public interface LaunchServerConfigManager {
LaunchServerConfig readConfig() throws IOException;
LaunchServerRuntimeConfig readRuntimeConfig() throws IOException;
void writeConfig(LaunchServerConfig config) throws IOException;
void writeRuntimeConfig(LaunchServerRuntimeConfig config) throws IOException;
}
public static class LaunchServerDirectories {

19
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerBuilder.java
View file

@ -1,7 +1,6 @@
package pro.gravit.launchserver;
import pro.gravit.launchserver.config.LaunchServerConfig;
import pro.gravit.launchserver.config.LaunchServerRuntimeConfig;
import pro.gravit.launchserver.manangers.CertificateManager;
import pro.gravit.launchserver.manangers.KeyAgreementManager;
import pro.gravit.launchserver.modules.impl.LaunchServerModulesManager;
@ -11,7 +10,6 @@
public class LaunchServerBuilder {
private LaunchServerConfig config;
private LaunchServerRuntimeConfig runtimeConfig;
private CommandHandler commandHandler;
private LaunchServer.LaunchServerEnv env;
private LaunchServerModulesManager modulesManager;
@ -36,11 +34,6 @@ public LaunchServerBuilder setModulesManager(LaunchServerModulesManager modulesM
return this;
}
public LaunchServerBuilder setRuntimeConfig(LaunchServerRuntimeConfig runtimeConfig) {
this.runtimeConfig = runtimeConfig;
return this;
}
public LaunchServerBuilder setCommandHandler(CommandHandler commandHandler) {
this.commandHandler = commandHandler;
return this;
@ -77,7 +70,7 @@ public LaunchServer build() throws Exception {
if(shardId == null) {
shardId = Integer.parseInt(System.getProperty("launchserver.shardId", "0"));
}
return new LaunchServer(directories, env, config, runtimeConfig, launchServerConfigManager, modulesManager, keyAgreementManager, commandHandler, certificateManager, shardId);
return new LaunchServer(directories, env, config, launchServerConfigManager, modulesManager, keyAgreementManager, commandHandler, certificateManager, shardId);
}
public LaunchServerBuilder setCertificateManager(CertificateManager certificateManager) {
@ -95,19 +88,9 @@ public LaunchServerConfig readConfig() {
throw new UnsupportedOperationException();
}
@Override
public LaunchServerRuntimeConfig readRuntimeConfig() {
throw new UnsupportedOperationException();
}
@Override
public void writeConfig(LaunchServerConfig config) {
throw new UnsupportedOperationException();
}
@Override
public void writeRuntimeConfig(LaunchServerRuntimeConfig config) {
throw new UnsupportedOperationException();
}
}
}

52
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java
View file

@ -19,7 +19,6 @@
import pro.gravit.launchserver.auth.updates.UpdatesProvider;
import pro.gravit.launchserver.components.Component;
import pro.gravit.launchserver.config.LaunchServerConfig;
import pro.gravit.launchserver.config.LaunchServerRuntimeConfig;
import pro.gravit.launchserver.manangers.CertificateManager;
import pro.gravit.launchserver.manangers.LaunchServerGsonManager;
import pro.gravit.launchserver.modules.impl.LaunchServerModulesManager;
@ -32,7 +31,6 @@
import pro.gravit.utils.helper.LogHelper;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.Security;
import java.security.cert.CertificateException;
@ -49,7 +47,7 @@ public static void main(String[] args) throws Exception {
LogHelper.printVersion("LaunchServer");
LogHelper.printLicense("LaunchServer");
Path dir = IOHelper.WORKING_DIR;
Path configFile, runtimeConfigFile;
Path configFile;
try {
Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
Security.addProvider(new BouncyCastleProvider());
@ -80,7 +78,6 @@ public static void main(String[] args) throws Exception {
}
}
LaunchServerRuntimeConfig runtimeConfig;
LaunchServerConfig config;
LaunchServer.LaunchServerEnv env = LaunchServer.LaunchServerEnv.PRODUCTION;
LaunchServerModulesManager modulesManager = new LaunchServerModulesManager(directories.modules, dir.resolve("config"), certificateManager.trustManager);
@ -94,11 +91,6 @@ public static void main(String[] args) throws Exception {
} else {
configFile = dir.resolve("LaunchServer.json");
}
if (IOHelper.exists(dir.resolve("RuntimeLaunchServer.conf"))) {
runtimeConfigFile = dir.resolve("RuntimeLaunchServer.conf");
} else {
runtimeConfigFile = dir.resolve("RuntimeLaunchServer.json");
}
CommandHandler localCommandHandler;
try {
Class.forName("org.jline.terminal.Terminal");
@ -116,23 +108,12 @@ public static void main(String[] args) throws Exception {
try (BufferedReader reader = IOHelper.newReader(configFile)) {
config = Launcher.gsonManager.gson.fromJson(reader, LaunchServerConfig.class);
}
if (!Files.exists(runtimeConfigFile)) {
logger.info("Reset LaunchServer runtime config file");
runtimeConfig = new LaunchServerRuntimeConfig();
runtimeConfig.reset();
} else {
logger.info("Reading LaunchServer runtime config file");
try (BufferedReader reader = IOHelper.newReader(runtimeConfigFile)) {
runtimeConfig = Launcher.gsonManager.gson.fromJson(reader, LaunchServerRuntimeConfig.class);
}
}
LaunchServer.LaunchServerConfigManager launchServerConfigManager = new BasicLaunchServerConfigManager(configFile, runtimeConfigFile);
LaunchServer.LaunchServerConfigManager launchServerConfigManager = new BasicLaunchServerConfigManager(configFile);
LaunchServer server = new LaunchServerBuilder()
.setDirectories(directories)
.setEnv(env)
.setCommandHandler(localCommandHandler)
.setRuntimeConfig(runtimeConfig)
.setConfig(config)
.setModulesManager(modulesManager)
.setLaunchServerConfigManager(launchServerConfigManager)
@ -270,11 +251,9 @@ public static void generateConfigIfNotExists(Path configFile, CommandHandler com
private static class BasicLaunchServerConfigManager implements LaunchServer.LaunchServerConfigManager {
private final Path configFile;
private final Path runtimeConfigFile;
public BasicLaunchServerConfigManager(Path configFile, Path runtimeConfigFile) {
public BasicLaunchServerConfigManager(Path configFile) {
this.configFile = configFile;
this.runtimeConfigFile = runtimeConfigFile;
}
@Override
@ -286,15 +265,6 @@ public LaunchServerConfig readConfig() throws IOException {
return config1;
}
@Override
public LaunchServerRuntimeConfig readRuntimeConfig() throws IOException {
LaunchServerRuntimeConfig config1;
try (BufferedReader reader = IOHelper.newReader(runtimeConfigFile)) {
config1 = Launcher.gsonManager.gson.fromJson(reader, LaunchServerRuntimeConfig.class);
}
return config1;
}
@Override
public void writeConfig(LaunchServerConfig config) throws IOException {
ByteArrayOutputStream output = new ByteArrayOutputStream();
@ -310,21 +280,5 @@ public void writeConfig(LaunchServerConfig config) throws IOException {
IOHelper.write(configFile, bytes);
}
}
@Override
public void writeRuntimeConfig(LaunchServerRuntimeConfig config) throws IOException {
ByteArrayOutputStream output = new ByteArrayOutputStream();
try (Writer writer = IOHelper.newWriter(output)) {
if (Launcher.gsonManager.configGson != null) {
Launcher.gsonManager.configGson.toJson(config, writer);
} else {
logger.error("Error writing LaunchServer runtime config file. Gson is null");
}
}
byte[] bytes = output.toByteArray();
if(bytes.length > 0) {
IOHelper.write(runtimeConfigFile, bytes);
}
}
}
}

23
LaunchServer/src/main/java/pro/gravit/launchserver/binary/BinaryPipeline.java
View file

@ -14,15 +14,8 @@
public abstract class BinaryPipeline {
public final List<LauncherBuildTask> tasks = new ArrayList<>();
public final Path buildDir;
public final String nameFormat;
protected transient final Logger logger = LogManager.getLogger();
public BinaryPipeline(Path buildDir, String nameFormat) {
this.buildDir = buildDir;
this.nameFormat = nameFormat;
}
public void addCounted(int count, Predicate<LauncherBuildTask> pred, LauncherBuildTask taskAdd) {
List<LauncherBuildTask> indexes = new ArrayList<>();
tasks.stream().filter(pred).forEach(indexes::add);
@ -77,20 +70,4 @@ public Optional<LauncherBuildTask> getTaskBefore(Predicate<LauncherBuildTask> pr
}
return Optional.empty();
}
public String nextName(String taskName) {
return nameFormat.formatted(taskName);
}
public Path nextPath(String taskName) {
return buildDir.resolve(nextName(taskName));
}
public Path nextPath(LauncherBuildTask task) {
return nextPath(task.getName());
}
public Path nextLowerPath(LauncherBuildTask task) {
return nextPath(CommonHelper.low(task.getName()));
}
}

14
LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java
View file

@ -5,6 +5,7 @@
import pro.gravit.launcher.base.Launcher;
import pro.gravit.launcher.core.serialize.HOutput;
import pro.gravit.launcher.core.serialize.stream.StreamObject;
import pro.gravit.launchserver.asm.InjectClassAcceptor;
import pro.gravit.launchserver.binary.tasks.MainBuildTask;
import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.SecurityHelper;
@ -27,9 +28,7 @@
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.function.Predicate;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
@ -40,16 +39,20 @@
import static pro.gravit.utils.helper.IOHelper.newZipEntry;
public class BuildContext {
public final PipelineContext pipelineContext;
public final ZipOutputStream output;
public final List<JarFile> readerClassPath;
public final MainBuildTask task;
public final HashSet<String> fileList;
public final HashSet<String> clientModules;
public final HashSet<String> legacyClientModules;
public final Map<String, Object> properties;
public final List<MainBuildTask.Transformer> transformers = new ArrayList<>();
private Path runtimeDir;
private boolean deleteRuntimeDir;
public BuildContext(ZipOutputStream output, List<JarFile> readerClassPath, MainBuildTask task, Path runtimeDir) {
public BuildContext(PipelineContext pipelineContext, ZipOutputStream output, List<JarFile> readerClassPath, MainBuildTask task, Path runtimeDir) {
this.pipelineContext = pipelineContext;
this.output = output;
this.readerClassPath = readerClassPath;
this.task = task;
@ -57,6 +60,9 @@ public BuildContext(ZipOutputStream output, List<JarFile> readerClassPath, MainB
fileList = new HashSet<>(1024);
clientModules = new HashSet<>();
legacyClientModules = new HashSet<>();
properties = new HashMap<>();
InjectClassAcceptor injectClassAcceptor = new InjectClassAcceptor(properties);
transformers.add(injectClassAcceptor);
}
public void pushFile(String filename, InputStream inputStream) throws IOException {

5
LaunchServer/src/main/java/pro/gravit/launchserver/binary/EXELauncherBinary.java
View file

@ -10,7 +10,7 @@
public class EXELauncherBinary extends LauncherBinary {
public EXELauncherBinary(LaunchServer server) {
super(server, "Launcher-%s.exe");
super(server);
}
@Override
@ -19,7 +19,8 @@ public UpdatesProvider.UpdateVariant getVariant() {
}
@Override
public void build() throws IOException {
public PipelineContext build() throws IOException {
return new PipelineContext(server);
}
}

2
LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java
View file

@ -24,7 +24,7 @@ public final class JARLauncherBinary extends LauncherBinary {
public final Map<String, Path> files;
public JARLauncherBinary(LaunchServer server) throws IOException {
super(server, "Launcher-%s.jar");
super(server);
count = new AtomicLong(0);
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
buildDir = server.dir.resolve("build");

23
LaunchServer/src/main/java/pro/gravit/launchserver/binary/LauncherBinary.java
View file

@ -13,39 +13,36 @@
public abstract class LauncherBinary extends BinaryPipeline {
public final LaunchServer server;
public final PipelineContext context;
protected LauncherBinary(LaunchServer server, String nameFormat) {
super(server.tmpDir.resolve("build"), nameFormat);
protected LauncherBinary(LaunchServer server) {
this.server = server;
this.context = new PipelineContext(server);
}
public static Path resolve(LaunchServer server, String ext) {
return Path.of(server.config.binaryName + ext);
}
public void build() throws IOException {
public PipelineContext build() throws IOException {
logger.info("Building launcher binary file");
Path thisPath = null;
long time_start = System.currentTimeMillis();
long time_this = time_start;
for (LauncherBuildTask task : tasks) {
logger.info("Task {}", task.getName());
Path oldPath = thisPath;
thisPath = task.process(oldPath);
Path newPath = task.process(context);
if(newPath != null) {
context.setLastest(newPath);
context.putArtifact(task.getName(), newPath);
}
long time_task_end = System.currentTimeMillis();
long time_task = time_task_end - time_this;
time_this = time_task_end;
logger.info("Task {} processed from {} millis", task.getName(), time_task);
}
long time_end = System.currentTimeMillis();
if(thisPath != null) {
// TODO fix me
server.config.updatesProvider.pushUpdate(List.of(new UpdatesProvider.UpdateUploadInfo(thisPath, getVariant(), new UpdatesProvider.BuildSecrets(server.runtime.clientCheckSecret, null))));
} else {
logger.warn("Missing {} binary file", getVariant());
}
IOHelper.deleteDir(buildDir, false);
logger.info("Build successful from {} millis", time_end - time_start);
return this.context;
}
public abstract UpdatesProvider.UpdateVariant getVariant();

94
LaunchServer/src/main/java/pro/gravit/launchserver/binary/PipelineContext.java Normal file
View file

@ -0,0 +1,94 @@
package pro.gravit.launchserver.binary;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.auth.updates.UpdatesProvider;
import pro.gravit.utils.helper.SecurityHelper;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
public class PipelineContext {
private final Logger logger = LogManager.getLogger();
private final LaunchServer launchServer;
private final Map<String, Path> artifacts = new HashMap<>();
private final Map<String, Object> properties = new HashMap<>();
private Set<Path> tempFiles = new HashSet<>();
private Path lastest;
public PipelineContext(LaunchServer launchServer) {
this.launchServer = launchServer;
}
public Path makeTempPath(String name, String ext) throws IOException {
return this.launchServer.createTempFilePath(name, ext);
}
public Map<String, Path> getArtifacts() {
return artifacts;
}
public Path getLastest() {
return lastest;
}
public void setLastest(Path lastest) {
this.lastest = lastest;
}
public void putArtifact(String name, Path path) {
artifacts.put(name, path);
}
public void putProperty(String name, Object prop) {
properties.put(name, prop);
}
public void putProperties(Map<String, Object> properties) {
this.properties.putAll(properties);
}
public LaunchServer getLaunchServer() {
return launchServer;
}
@SuppressWarnings("unchecked")
public<T> T getProperty(String name) {
return (T) properties.get(name);
}
public UpdatesProvider.UpdateUploadInfo makeUploadInfo(UpdatesProvider.UpdateVariant variant) {
if(getLastest() == null) {
return null;
}
try {
byte[] hash = SecurityHelper.digest(SecurityHelper.DigestAlgorithm.SHA512, getLastest());
return new UpdatesProvider.UpdateUploadInfo(getLastest(), variant, new UpdatesProvider.BuildSecrets(
getProperty("checkClientSecret"), hash
));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
public void clear() {
for(var p : tempFiles) {
if(Files.exists(p)) {
try {
Files.delete(p);
} catch (IOException e) {
logger.error("Couldn't delete file {}", p, e);
}
}
}
tempFiles.clear();
properties.clear();
artifacts.clear();
}
}

6
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java
View file

@ -6,6 +6,7 @@
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.asm.ClassMetadataReader;
import pro.gravit.launchserver.asm.SafeClassWriter;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.utils.helper.IOHelper;
import java.io.IOException;
@ -66,8 +67,9 @@ public String getName() {
}
@Override
public Path process(Path inputFile) throws IOException {
Path out = server.launcherBinary.nextPath("post-fixed");
public Path process(PipelineContext context) throws IOException {
Path inputFile = context.getLastest();
Path out = context.makeTempPath("post-fixed", ".jar");
try (ZipOutputStream output = new ZipOutputStream(IOHelper.newOutput(out))) {
apply(inputFile, inputFile, output, server, (e) -> false, true);
}

6
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AttachJarsTask.java
View file

@ -1,6 +1,7 @@
package pro.gravit.launchserver.binary.tasks;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.utils.helper.IOHelper;
import java.io.IOException;
@ -32,8 +33,9 @@ public String getName() {
}
@Override
public Path process(Path inputFile) throws IOException {
Path outputFile = srv.launcherBinary.nextPath("attached");
public Path process(PipelineContext context) throws IOException {
Path inputFile = context.getLastest();
Path outputFile = context.makeTempPath("attached", ".jar");
try (ZipInputStream input = IOHelper.newZipInput(inputFile);
ZipOutputStream output = new ZipOutputStream(IOHelper.newOutput(outputFile))) {
ZipEntry e = input.getNextEntry();

7
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/CertificateAutogenTask.java
View file

@ -18,6 +18,7 @@
import org.bouncycastle.operator.OperatorCreationException;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.launchserver.helper.SignHelper;
import java.io.IOException;
@ -49,8 +50,8 @@ public String getName() {
}
@Override
public Path process(Path inputFile) throws IOException {
if (signedDataGenerator != null) return inputFile;
public Path process(PipelineContext context) throws IOException {
if (signedDataGenerator != null) return null;
try {
logger.warn("You are using an auto-generated certificate (sign.enabled false). It is not good");
logger.warn("It is highly recommended that you use the correct certificate (sign.enabled true)");
@ -79,6 +80,6 @@ public Path process(Path inputFile) throws IOException {
} catch (OperatorCreationException | CMSException | CertificateException e) {
logger.error("Certificate generate failed", e);
}
return inputFile;
return null;
}
}

6
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/CompressBuildTask.java
View file

@ -1,6 +1,7 @@
package pro.gravit.launchserver.binary.tasks;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.utils.helper.IOHelper;
import java.io.IOException;
@ -23,8 +24,9 @@ public String getName() {
}
@Override
public Path process(Path inputFile) throws IOException {
Path output = server.launcherBinary.nextPath(this);
public Path process(PipelineContext context) throws IOException {
Path inputFile = context.getLastest();
Path output = context.makeTempPath("compress", ".jar");
try (ZipOutputStream outputStream = new ZipOutputStream(IOHelper.newOutput(output))) {
outputStream.setMethod(ZipOutputStream.DEFLATED);
outputStream.setLevel(Deflater.BEST_COMPRESSION);

4
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/LauncherBuildTask.java
View file

@ -1,10 +1,12 @@
package pro.gravit.launchserver.binary.tasks;
import pro.gravit.launchserver.binary.PipelineContext;
import java.io.IOException;
import java.nio.file.Path;
public interface LauncherBuildTask {
String getName();
Path process(Path inputFile) throws IOException;
Path process(PipelineContext context) throws IOException;
}

72
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java
View file

@ -15,6 +15,7 @@
import pro.gravit.launchserver.asm.InjectClassAcceptor;
import pro.gravit.launchserver.asm.SafeClassWriter;
import pro.gravit.launchserver.binary.BuildContext;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.utils.HookException;
import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.SecurityHelper;
@ -30,18 +31,14 @@
public class MainBuildTask implements LauncherBuildTask {
public final ClassMetadataReader reader;
public final Set<String> blacklist = new HashSet<>();
public final List<Transformer> transformers = new ArrayList<>();
public final IOHookSet<BuildContext> preBuildHook = new IOHookSet<>();
public final IOHookSet<BuildContext> postBuildHook = new IOHookSet<>();
public final Map<String, Object> properties = new HashMap<>();
private final LaunchServer server;
private transient final Logger logger = LogManager.getLogger();
public MainBuildTask(LaunchServer srv) {
server = srv;
reader = new ClassMetadataReader();
InjectClassAcceptor injectClassAcceptor = new InjectClassAcceptor(properties);
transformers.add(injectClassAcceptor);
}
@Override
@ -50,15 +47,16 @@ public String getName() {
}
@Override
public Path process(Path inputJar) throws IOException {
Path outputJar = server.launcherBinary.nextPath(this);
public Path process(PipelineContext pipelineContext) throws IOException {
Path inputJar = pipelineContext.getLastest();
Path outputJar = pipelineContext.makeTempPath("main", ".jar");
try (ZipOutputStream output = new ZipOutputStream(IOHelper.newOutput(outputJar))) {
BuildContext context = new BuildContext(output, reader.getCp(), this, server.launcherBinary.runtimeDir);
initProps();
BuildContext context = new BuildContext(pipelineContext, output, reader.getCp(), this, server.launcherBinary.runtimeDir);
initProps(context);
preBuildHook.hook(context);
properties.put("launcher.legacymodules", context.legacyClientModules.stream().map(e -> Type.getObjectType(e.replace('.', '/'))).collect(Collectors.toList()));
properties.put("launcher.modules", context.clientModules.stream().map(e -> Type.getObjectType(e.replace('.', '/'))).collect(Collectors.toList()));
postInitProps();
context.properties.put("launcher.legacymodules", context.legacyClientModules.stream().map(e -> Type.getObjectType(e.replace('.', '/'))).collect(Collectors.toList()));
context.properties.put("launcher.modules", context.clientModules.stream().map(e -> Type.getObjectType(e.replace('.', '/'))).collect(Collectors.toList()));
postInitProps(context);
reader.getCp().add(new JarFile(inputJar.toFile()));
for (Path e : server.launcherBinary.coreLibs) {
reader.getCp().add(new JarFile(e.toFile()));
@ -69,7 +67,8 @@ public Path process(Path inputJar) throws IOException {
Map<String, byte[]> runtime = new HashMap<>(256);
// Write launcher guard dir
if (server.config.launcher.encryptRuntime) {
context.pushEncryptedDir(context.getRuntimeDir(), Launcher.RUNTIME_DIR, server.runtime.runtimeEncryptKey, runtime, false);
String runtimeEncryptKey = context.pipelineContext.getProperty("runtimeEncryptKey");
context.pushEncryptedDir(context.getRuntimeDir(), Launcher.RUNTIME_DIR, runtimeEncryptKey, runtime, false);
} else {
context.pushDir(context.getRuntimeDir(), Launcher.RUNTIME_DIR, runtime, false);
}
@ -85,7 +84,7 @@ public Path process(Path inputJar) throws IOException {
return outputJar;
}
protected void postInitProps() {
protected void postInitProps(BuildContext context) {
List<byte[]> certificates = Arrays.stream(server.certificateManager.trustManager.getTrusted()).map(e -> {
try {
return e.getEncoded();
@ -102,41 +101,42 @@ protected void postInitProps() {
throw new InternalError(e);
}
}
properties.put("launchercore.certificates", certificates);
context.properties.put("launchercore.certificates", certificates);
}
protected void initProps() {
properties.clear();
properties.put("launcher.address", server.config.netty.address);
properties.put("launcher.projectName", server.config.projectName);
properties.put("runtimeconfig.secretKeyClient", SecurityHelper.randomStringAESKey());
properties.put("launcher.port", 32148 + SecurityHelper.newRandom().nextInt(512));
properties.put("launchercore.env", server.config.env);
properties.put("launcher.memory", server.config.launcher.memoryLimit);
properties.put("launcher.customJvmOptions", server.config.launcher.customJvmOptions);
protected void initProps(BuildContext context) {
context.properties.clear();
context.properties.put("launcher.address", server.config.netty.address);
context.properties.put("launcher.projectName", server.config.projectName);
context.properties.put("runtimeconfig.secretKeyClient", SecurityHelper.randomStringAESKey());
context.properties.put("launcher.port", 32148 + SecurityHelper.newRandom().nextInt(512));
context.properties.put("launchercore.env", server.config.env);
context.properties.put("launcher.memory", server.config.launcher.memoryLimit);
context.properties.put("launcher.customJvmOptions", server.config.launcher.customJvmOptions);
if (server.config.launcher.encryptRuntime) {
if (server.runtime.runtimeEncryptKey == null)
server.runtime.runtimeEncryptKey = SecurityHelper.randomStringToken();
properties.put("runtimeconfig.runtimeEncryptKey", server.runtime.runtimeEncryptKey);
String runtimeEncryptKey = SecurityHelper.randomStringToken();
context.pipelineContext.putProperty("runtimeEncryptKey", runtimeEncryptKey);
context.properties.put("runtimeconfig.runtimeEncryptKey", runtimeEncryptKey);
}
properties.put("launcher.certificatePinning", server.config.launcher.certificatePinning);
properties.put("runtimeconfig.passwordEncryptKey", server.runtime.passwordEncryptKey);
context.properties.put("launcher.certificatePinning", server.config.launcher.certificatePinning);
String checkClientSecret = SecurityHelper.randomStringToken();
context.pipelineContext.putProperty("checkClientSecret", checkClientSecret);
String launcherSalt = SecurityHelper.randomStringToken();
byte[] launcherSecureHash = SecurityHelper.digest(SecurityHelper.DigestAlgorithm.SHA256,
server.runtime.clientCheckSecret.concat(".").concat(launcherSalt));
properties.put("runtimeconfig.secureCheckHash", Base64.getEncoder().encodeToString(launcherSecureHash));
properties.put("runtimeconfig.secureCheckSalt", launcherSalt);
if (server.runtime.unlockSecret == null) server.runtime.unlockSecret = SecurityHelper.randomStringToken();
properties.put("runtimeconfig.unlockSecret", server.runtime.unlockSecret);
server.runtime.buildNumber++;
properties.put("runtimeconfig.buildNumber", server.runtime.buildNumber);
checkClientSecret.concat(".").concat(launcherSalt));
context.properties.put("runtimeconfig.secureCheckHash", Base64.getEncoder().encodeToString(launcherSecureHash));
context.properties.put("runtimeconfig.secureCheckSalt", launcherSalt);
String unlockSecret = SecurityHelper.randomStringToken();
context.pipelineContext.putProperty("unlockSecret", unlockSecret);
context.properties.put("runtimeconfig.unlockSecret", unlockSecret);
context.properties.put("runtimeconfig.buildNumber", 1);
}
public byte[] transformClass(byte[] bytes, String classname, BuildContext context) {
byte[] result = bytes;
ClassWriter writer;
ClassNode cn = null;
for (Transformer t : transformers) {
for (Transformer t : context.transformers) {
if (t instanceof ASMTransformer asmTransformer) {
if (cn == null) {
ClassReader cr = new ClassReader(result);

3
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/PrepareBuildTask.java
View file

@ -3,6 +3,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.UnpackHelper;
@ -29,7 +30,7 @@ public String getName() {
}
@Override
public Path process(Path inputFile) throws IOException {
public Path process(PipelineContext context) throws IOException {
server.launcherBinary.coreLibs.clear();
server.launcherBinary.addonLibs.clear();
server.launcherBinary.files.clear();

6
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/SignJarTask.java
View file

@ -6,6 +6,7 @@
import org.bouncycastle.cms.CMSSignedDataGenerator;
import org.bouncycastle.operator.OperatorCreationException;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.launchserver.binary.SignerJar;
import pro.gravit.launchserver.config.LaunchServerConfig;
import pro.gravit.launchserver.helper.SignHelper;
@ -52,8 +53,9 @@ public String getName() {
}
@Override
public Path process(Path inputFile) throws IOException {
Path toRet = srv.launcherBinary.nextPath("signed");
public Path process(PipelineContext context) throws IOException {
Path inputFile = context.getLastest();
Path toRet = context.makeTempPath("signed", ".jar");
sign(config, inputFile, toRet);
return toRet;
}

2
LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java
View file

@ -206,7 +206,7 @@ public void invoke(String... args) {
logger.warn("Write access to LaunchServer.jar. Please use 'chmod 755 LaunchServer.jar'");
}
if (Files.exists(server.dir.resolve(".keys")) && checkOtherReadOrWriteAccess(server.dir.resolve(".keys"))) {
logger.warn("Write or read access to .keys directory. Please use 'find .keys -type d -exec chmod 700 {} \; && find .keys -type f -exec chmod 600 {} \;'");
logger.warn("Write or read access to .keys directory. Please use 'chmod -r 700.keys");
}
if (Files.exists(server.dir.resolve("LaunchServerConfig.json")) && checkOtherReadOrWriteAccess(server.dir.resolve("LaunchServerConfig.json"))) {
logger.warn("Write or read access to LaunchServerConfig.json. Please use 'chmod 600 LaunchServerConfig.json'");

25
LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java
View file

@ -4,6 +4,7 @@
import org.apache.logging.log4j.Logger;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.Reconfigurable;
import pro.gravit.launchserver.binary.PipelineContext;
import pro.gravit.launchserver.binary.tasks.LauncherBuildTask;
import pro.gravit.utils.command.Command;
import pro.gravit.utils.command.SubCommand;
@ -137,19 +138,18 @@ public String getName() {
}
@Override
public Path process(Path inputFile) throws IOException {
public Path process(PipelineContext context) throws IOException {
if (!component.enabled) {
return inputFile;
return null;
}
LauncherBuildTask task = server.launcherBinary.getTaskBefore((x) -> proguardTaskName.equals(x.getName())).get();
Path lastPath = server.launcherBinary.nextPath(task);
Path lastPath = context.getLastest();
if(Files.notExists(lastPath)) {
logger.error("{} not exist. Multi-Release JAR fix not applied!", lastPath);
return inputFile;
return null;
}
Path outputPath = server.launcherBinary.nextPath(this);
Path outputPath = context.makeTempPath("multirelease-fix", "jar");
try(ZipOutputStream output = new ZipOutputStream(new FileOutputStream(outputPath.toFile()))) {
try(ZipInputStream input = new ZipInputStream(new FileInputStream(inputFile.toFile()))) {
try(ZipInputStream input = new ZipInputStream(new FileInputStream(lastPath.toFile()))) {
ZipEntry entry = input.getNextEntry();
while(entry != null) {
ZipEntry newEntry = new ZipEntry(entry.getName());
@ -193,8 +193,8 @@ public String getName() {
}
@Override
public Path process(Path inputFile) throws IOException {
Path outputJar = server.launcherBinary.nextLowerPath(this);
public Path process(PipelineContext context) throws IOException {
Path outputJar = context.makeTempPath("proguard", "jar");
if (component.enabled) {
if (!checkJMods(IOHelper.JVM_DIR.resolve("jmods"))) {
throw new RuntimeException("Java path: %s is not JDK! Please install JDK".formatted(IOHelper.JVM_DIR));
@ -221,7 +221,7 @@ public Path process(Path inputFile) throws IOException {
);
}
args.add("proguard.ProGuard");
proguardConf.buildConfig(args, inputFile, outputJar, jfxPath == null ? new Path[0] : new Path[]{jfxPath});
proguardConf.buildConfig(args, context.getLastest(), outputJar, jfxPath == null ? new Path[0] : new Path[]{jfxPath});
Process process = new ProcessBuilder()
.command(args)
@ -240,8 +240,9 @@ public Path process(Path inputFile) throws IOException {
} catch (Exception e) {
logger.error(e);
}
} else
IOHelper.copy(inputFile, outputJar);
} else {
return null;
}
return outputJar;
}
}

31
LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerRuntimeConfig.java
View file

@ -1,31 +0,0 @@
package pro.gravit.launchserver.config;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import pro.gravit.utils.helper.SecurityHelper;
public class LaunchServerRuntimeConfig {
private transient final Logger logger = LogManager.getLogger();
public String passwordEncryptKey;
public String runtimeEncryptKey;
public String unlockSecret;
public String registerApiKey;
public String clientCheckSecret;
public long buildNumber;
public void verify() {
if (passwordEncryptKey == null) logger.error("[RuntimeConfig] passwordEncryptKey must not be null");
if (clientCheckSecret == null) {
logger.warn("[RuntimeConfig] clientCheckSecret must not be null");
clientCheckSecret = SecurityHelper.randomStringToken();
}
}
public void reset() {
passwordEncryptKey = SecurityHelper.randomStringToken();
runtimeEncryptKey = SecurityHelper.randomStringAESKey();
registerApiKey = SecurityHelper.randomStringToken();
clientCheckSecret = SecurityHelper.randomStringToken();
buildNumber = 0;
}
}

2
LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java
View file

@ -47,7 +47,7 @@ public void init() {
MainBuildTask mainTask = server.launcherBinary.getTaskByClass(MainBuildTask.class).get();
mainTask.preBuildHook.registerHook((buildContext) -> {
for (ModuleEntity e : launcherModules) {
if (e.propertyMap != null) buildContext.task.properties.putAll(e.propertyMap);
if (e.propertyMap != null) buildContext.properties.putAll(e.propertyMap);
if(e.modernModule) {
buildContext.clientModules.add(e.moduleMainClass);
} else {

8
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java
View file

@ -282,14 +282,6 @@ public AuthRequest.AuthPasswordInterface decryptPassword(AuthRequest.AuthPasswor
}
private AuthRequest.AuthPasswordInterface tryDecryptPasswordPlain(AuthRequest.AuthPasswordInterface password) throws AuthException {
if (password instanceof AuthAESPassword authAESPassword) {
try {
return new AuthPlainPassword(IOHelper.decode(SecurityHelper.decrypt(server.runtime.passwordEncryptKey
, authAESPassword.password)));
} catch (Exception ignored) {
throw new AuthException("Password decryption error");
}
}
if (password instanceof AuthRSAPassword authRSAPassword) {
try {
Cipher cipher = SecurityHelper.newRSADecryptCipher(server.keyAgreementManager.rsaPrivateKey);

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

@ -67,14 +67,6 @@ public String createLauncherExtendedToken() {
.compact();
}
private boolean checkSecure(String hash, String salt) {
if (hash == null || salt == null) return false;
byte[] normal_hash = SecurityHelper.digest(SecurityHelper.DigestAlgorithm.SHA256,
server.runtime.clientCheckSecret.concat(".").concat(salt));
byte[] launcher_hash = Base64.getDecoder().decode(hash);
return Arrays.equals(normal_hash, launcher_hash);
}
public static class LauncherTokenVerifier implements RestoreResponse.ExtendedTokenProvider {
private final JwtParser parser;
private final Logger logger = LogManager.getLogger();

3
LaunchServer/src/test/java/pro/gravit/launchserver/ConfigurationTest.java
View file

@ -6,7 +6,6 @@
import org.junit.jupiter.api.io.TempDir;
import pro.gravit.launcher.base.Launcher;
import pro.gravit.launchserver.config.LaunchServerConfig;
import pro.gravit.launchserver.config.LaunchServerRuntimeConfig;
import pro.gravit.launchserver.impl.TestLaunchServerConfigManager;
import pro.gravit.launchserver.manangers.CertificateManager;
import pro.gravit.launchserver.manangers.LaunchServerGsonManager;
@ -33,13 +32,11 @@ public static void prepare() throws Throwable {
LaunchServerConfig config = LaunchServerConfig.getDefault(LaunchServer.LaunchServerEnv.TEST);
Launcher.gsonManager = new LaunchServerGsonManager(modulesManager);
Launcher.gsonManager.initGson();
LaunchServerRuntimeConfig runtimeConfig = new LaunchServerRuntimeConfig();
LaunchServerBuilder builder = new LaunchServerBuilder();
launchServerConfigManager = new TestLaunchServerConfigManager();
builder.setDir(dir)
.setEnv(LaunchServer.LaunchServerEnv.TEST)
.setConfig(config)
.setRuntimeConfig(runtimeConfig)
.setCertificateManager(new CertificateManager())
.setLaunchServerConfigManager(launchServerConfigManager)
.setModulesManager(modulesManager)

3
LaunchServer/src/test/java/pro/gravit/launchserver/StartLaunchServerTest.java
View file

@ -7,7 +7,6 @@
import org.junit.jupiter.api.io.TempDir;
import pro.gravit.launcher.base.Launcher;
import pro.gravit.launchserver.config.LaunchServerConfig;
import pro.gravit.launchserver.config.LaunchServerRuntimeConfig;
import pro.gravit.launchserver.impl.TestLaunchServerConfigManager;
import pro.gravit.launchserver.manangers.CertificateManager;
import pro.gravit.launchserver.manangers.LaunchServerGsonManager;
@ -33,12 +32,10 @@ public static void prepare() throws Throwable {
LaunchServerConfig config = LaunchServerConfig.getDefault(LaunchServer.LaunchServerEnv.TEST);
Launcher.gsonManager = new LaunchServerGsonManager(modulesManager);
Launcher.gsonManager.initGson();
LaunchServerRuntimeConfig runtimeConfig = new LaunchServerRuntimeConfig();
LaunchServerBuilder builder = new LaunchServerBuilder();
builder.setDir(dir)
.setEnv(LaunchServer.LaunchServerEnv.TEST)
.setConfig(config)
.setRuntimeConfig(runtimeConfig)
.setCertificateManager(new CertificateManager())
.setLaunchServerConfigManager(new TestLaunchServerConfigManager())
.setModulesManager(modulesManager)

14
LaunchServer/src/test/java/pro/gravit/launchserver/impl/TestLaunchServerConfigManager.java
View file

@ -2,16 +2,12 @@
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.config.LaunchServerConfig;
import pro.gravit.launchserver.config.LaunchServerRuntimeConfig;
public class TestLaunchServerConfigManager implements LaunchServer.LaunchServerConfigManager {
public LaunchServerConfig config;
public LaunchServerRuntimeConfig runtimeConfig;
public TestLaunchServerConfigManager() {
config = LaunchServerConfig.getDefault(LaunchServer.LaunchServerEnv.TEST);
runtimeConfig = new LaunchServerRuntimeConfig();
runtimeConfig.reset();
}
@Override
@ -19,18 +15,8 @@ public LaunchServerConfig readConfig() {
return config;
}
@Override
public LaunchServerRuntimeConfig readRuntimeConfig() {
return runtimeConfig;
}
@Override
public void writeConfig(LaunchServerConfig config) {
}
@Override
public void writeRuntimeConfig(LaunchServerRuntimeConfig config) {
}
}

1
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthAESPassword.java
View file

@ -3,6 +3,7 @@
import pro.gravit.launcher.core.LauncherNetworkAPI;
import pro.gravit.launcher.base.request.auth.AuthRequest;
@Deprecated
public class AuthAESPassword implements AuthRequest.AuthPasswordInterface {
@LauncherNetworkAPI
public final byte[] password;

2
modules

@ -1 +1 @@
Subproject commit 53103486065ff7dde30e480d2b24f6afb2decddb
Subproject commit 3ce7d4feb1b95152917c9ed85a5186c145a9376c