runelite-client: Use archive-patcher for the client-patch
archive-patcher is faster and produces a smaller patch than the previous bsdiff solution. this also introduces vanilla and patched client caching, which significantly boosts startup time.
This commit is contained in:
@@ -158,15 +158,9 @@
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.sigpipe</groupId>
|
||||
<artifactId>jbsdiff</artifactId>
|
||||
<groupId>net.runelite</groupId>
|
||||
<artifactId>archive-patcher</artifactId>
|
||||
<version>1.0</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.tukaani</groupId>
|
||||
<artifactId>xz</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- net.runelite:discord also has this -->
|
||||
<dependency>
|
||||
|
||||
@@ -79,6 +79,7 @@ import org.slf4j.LoggerFactory;
|
||||
public class RuneLite
|
||||
{
|
||||
public static final File RUNELITE_DIR = new File(System.getProperty("user.home"), ".runelite");
|
||||
public static final File CACHE_DIR = new File(RUNELITE_DIR, "cache");
|
||||
public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles");
|
||||
public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots");
|
||||
public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs");
|
||||
|
||||
@@ -74,7 +74,7 @@ public class RuneLiteModule extends AbstractModule
|
||||
bindConstant().annotatedWith(Names.named("developerMode")).to(developerMode);
|
||||
bind(ScheduledExecutorService.class).toInstance(new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor()));
|
||||
bind(OkHttpClient.class).toInstance(RuneLiteAPI.CLIENT.newBuilder()
|
||||
.cache(new Cache(new File(RuneLite.RUNELITE_DIR, "cache" + File.separator + "okhttp"), MAX_OKHTTP_CACHE_SIZE))
|
||||
.cache(new Cache(new File(RuneLite.CACHE_DIR, "okhttp"), MAX_OKHTTP_CACHE_SIZE))
|
||||
.build());
|
||||
bind(MenuManager.class);
|
||||
bind(ChatMessageManager.class);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
|
||||
* Copyright (c) 2018, Tomas Slusny <slusnucky@gmail.com>
|
||||
* Copyright (c) 2018 Abex
|
||||
* Copyright (c) 2019 Abex
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -26,32 +26,37 @@
|
||||
*/
|
||||
package net.runelite.client.rs;
|
||||
|
||||
import com.google.archivepatcher.applier.FileByFileV1DeltaApplier;
|
||||
import com.google.common.base.Strings;
|
||||
import com.google.common.hash.Hashing;
|
||||
import com.google.common.io.ByteStreams;
|
||||
import com.google.common.reflect.TypeToken;
|
||||
import com.google.gson.Gson;
|
||||
import io.sigpipe.jbsdiff.InvalidHeaderException;
|
||||
import io.sigpipe.jbsdiff.Patch;
|
||||
import com.google.common.hash.HashingOutputStream;
|
||||
import com.google.common.io.Files;
|
||||
import java.applet.Applet;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.FilterInputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.net.URL;
|
||||
import java.net.URLClassLoader;
|
||||
import java.nio.channels.Channels;
|
||||
import java.nio.channels.FileChannel;
|
||||
import java.nio.channels.FileLock;
|
||||
import java.nio.file.StandardOpenOption;
|
||||
import java.security.cert.Certificate;
|
||||
import java.security.cert.CertificateException;
|
||||
import java.security.cert.CertificateFactory;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.jar.JarEntry;
|
||||
import java.util.jar.JarInputStream;
|
||||
import javax.swing.SwingUtilities;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.runelite.api.Client;
|
||||
import net.runelite.client.RuneLite;
|
||||
import static net.runelite.client.rs.ClientUpdateCheckMode.AUTO;
|
||||
import static net.runelite.client.rs.ClientUpdateCheckMode.NONE;
|
||||
import static net.runelite.client.rs.ClientUpdateCheckMode.VANILLA;
|
||||
@@ -61,16 +66,22 @@ import net.runelite.http.api.RuneLiteAPI;
|
||||
import okhttp3.HttpUrl;
|
||||
import okhttp3.Request;
|
||||
import okhttp3.Response;
|
||||
import org.apache.commons.compress.compressors.CompressorException;
|
||||
|
||||
@Slf4j
|
||||
@SuppressWarnings("deprecation")
|
||||
public class ClientLoader implements Supplier<Applet>
|
||||
{
|
||||
private static final int NUM_ATTEMPTS = 6;
|
||||
private static File LOCK_FILE = new File(RuneLite.CACHE_DIR, "cache.lock");
|
||||
private static File VANILLA_CACHE = new File(RuneLite.CACHE_DIR, "vanilla.cache");
|
||||
private static File PATCHED_CACHE = new File(RuneLite.CACHE_DIR, "patched.cache");
|
||||
|
||||
private ClientUpdateCheckMode updateCheckMode;
|
||||
private Object client = null;
|
||||
|
||||
private HostSupplier hostSupplier = new HostSupplier();
|
||||
private RSConfig config;
|
||||
|
||||
public ClientLoader(ClientUpdateCheckMode updateCheckMode)
|
||||
{
|
||||
this.updateCheckMode = updateCheckMode;
|
||||
@@ -101,234 +112,38 @@ public class ClientLoader implements Supplier<Applet>
|
||||
try
|
||||
{
|
||||
SplashScreen.stage(0, null, "Fetching applet viewer config");
|
||||
downloadConfig();
|
||||
|
||||
HostSupplier hostSupplier = new HostSupplier();
|
||||
SplashScreen.stage(.05, null, "Waiting for other clients to start");
|
||||
|
||||
String host = null;
|
||||
RSConfig config;
|
||||
for (int attempt = 0; ; attempt++)
|
||||
LOCK_FILE.getParentFile().mkdirs();
|
||||
try (FileChannel lockfile = FileChannel.open(LOCK_FILE.toPath(),
|
||||
StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE);
|
||||
FileLock flock = lockfile.lock())
|
||||
{
|
||||
try
|
||||
SplashScreen.stage(.05, null, "Downloading Old School RuneScape");
|
||||
updateVanilla();
|
||||
|
||||
if (updateCheckMode == AUTO)
|
||||
{
|
||||
config = ClientConfigLoader.fetch(host);
|
||||
|
||||
if (Strings.isNullOrEmpty(config.getCodeBase()) || Strings.isNullOrEmpty(config.getInitialJar()) || Strings.isNullOrEmpty(config.getInitialClass()))
|
||||
{
|
||||
throw new IOException("Invalid or missing jav_config");
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
log.info("Failed to get jav_config from host \"{}\" ({})", host, e.getMessage());
|
||||
|
||||
if (attempt >= NUM_ATTEMPTS)
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
|
||||
host = hostSupplier.get();
|
||||
SplashScreen.stage(.35, null, "Patching");
|
||||
applyPatch();
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, byte[]> zipFile = new HashMap<>();
|
||||
{
|
||||
Certificate[] jagexCertificateChain = getJagexCertificateChain();
|
||||
String codebase = config.getCodeBase();
|
||||
String initialJar = config.getInitialJar();
|
||||
HttpUrl url = HttpUrl.parse(codebase + initialJar);
|
||||
|
||||
for (int attempt = 0; ; attempt++)
|
||||
{
|
||||
zipFile.clear();
|
||||
|
||||
Request request = new Request.Builder()
|
||||
.url(url)
|
||||
.build();
|
||||
|
||||
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
|
||||
{
|
||||
int length = (int) response.body().contentLength();
|
||||
if (length < 0)
|
||||
{
|
||||
length = 3 * 1024 * 1024;
|
||||
}
|
||||
final int flength = length;
|
||||
InputStream istream = new FilterInputStream(response.body().byteStream())
|
||||
{
|
||||
private int read = 0;
|
||||
|
||||
@Override
|
||||
public int read(byte[] b, int off, int len) throws IOException
|
||||
{
|
||||
int thisRead = super.read(b, off, len);
|
||||
this.read += thisRead;
|
||||
SplashScreen.stage(.05, .35, null, "Downloading Old School RuneScape", this.read, flength, true);
|
||||
return thisRead;
|
||||
}
|
||||
};
|
||||
JarInputStream jis = new JarInputStream(istream);
|
||||
|
||||
byte[] tmp = new byte[4096];
|
||||
ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024);
|
||||
for (; ; )
|
||||
{
|
||||
JarEntry metadata = jis.getNextJarEntry();
|
||||
if (metadata == null)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
buffer.reset();
|
||||
for (; ; )
|
||||
{
|
||||
int n = jis.read(tmp);
|
||||
if (n <= -1)
|
||||
{
|
||||
break;
|
||||
}
|
||||
buffer.write(tmp, 0, n);
|
||||
}
|
||||
|
||||
if (!Arrays.equals(metadata.getCertificates(), jagexCertificateChain))
|
||||
{
|
||||
if (metadata.getName().startsWith("META-INF/"))
|
||||
{
|
||||
// META-INF/JAGEXLTD.SF and META-INF/JAGEXLTD.RSA are not signed, but we don't need
|
||||
// anything in META-INF anyway.
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new VerificationException("Unable to verify jar entry: " + metadata.getName());
|
||||
}
|
||||
}
|
||||
|
||||
zipFile.put(metadata.getName(), buffer.toByteArray());
|
||||
}
|
||||
break;
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
log.info("Failed to download gamepack from \"{}\" ({})", url, e.getMessage());
|
||||
|
||||
if (attempt >= NUM_ATTEMPTS)
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
|
||||
url = url.newBuilder().host(hostSupplier.get()).build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (updateCheckMode == AUTO)
|
||||
{
|
||||
SplashScreen.stage(.35, null, "Patching");
|
||||
Map<String, String> hashes;
|
||||
try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/hashes.json"))
|
||||
{
|
||||
if (is == null)
|
||||
{
|
||||
SwingUtilities.invokeLater(() ->
|
||||
new FatalErrorDialog("The client-patch is missing from the classpath. If you are building " +
|
||||
"the client you need to re-run maven")
|
||||
.addBuildingGuide()
|
||||
.open());
|
||||
throw new NullPointerException();
|
||||
}
|
||||
hashes = new Gson().fromJson(new InputStreamReader(is), new TypeToken<HashMap<String, String>>()
|
||||
{
|
||||
}.getType());
|
||||
}
|
||||
|
||||
for (Map.Entry<String, String> file : hashes.entrySet())
|
||||
{
|
||||
byte[] bytes = zipFile.get(file.getKey());
|
||||
|
||||
String ourHash = null;
|
||||
if (bytes != null)
|
||||
{
|
||||
ourHash = Hashing.sha512().hashBytes(bytes).toString();
|
||||
}
|
||||
|
||||
if (!file.getValue().equals(ourHash))
|
||||
{
|
||||
log.debug("{} had a hash mismatch; falling back to vanilla. {} != {}", file.getKey(), file.getValue(), ourHash);
|
||||
log.info("Client is outdated!");
|
||||
updateCheckMode = VANILLA;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (updateCheckMode == AUTO)
|
||||
{
|
||||
ByteArrayOutputStream patchOs = new ByteArrayOutputStream(756 * 1024);
|
||||
int patchCount = 0;
|
||||
|
||||
for (Map.Entry<String, byte[]> file : zipFile.entrySet())
|
||||
{
|
||||
byte[] bytes;
|
||||
try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/" + file.getKey() + ".bs"))
|
||||
{
|
||||
if (is == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
bytes = ByteStreams.toByteArray(is);
|
||||
}
|
||||
|
||||
patchOs.reset();
|
||||
Patch.patch(file.getValue(), bytes, patchOs);
|
||||
file.setValue(patchOs.toByteArray());
|
||||
|
||||
++patchCount;
|
||||
SplashScreen.stage(.38, .45, null, "Patching", patchCount, zipFile.size(), false);
|
||||
}
|
||||
|
||||
log.debug("Patched {} classes", patchCount);
|
||||
}
|
||||
File jarFile = updateCheckMode == AUTO ? PATCHED_CACHE : VANILLA_CACHE;
|
||||
URL jar = jarFile.toURI().toURL();
|
||||
|
||||
SplashScreen.stage(.465, "Starting", "Starting Old School RuneScape");
|
||||
|
||||
String initialClass = config.getInitialClass();
|
||||
|
||||
ClassLoader rsClassLoader = new ClassLoader(ClientLoader.class.getClassLoader())
|
||||
{
|
||||
@Override
|
||||
protected Class<?> findClass(String name) throws ClassNotFoundException
|
||||
{
|
||||
String path = name.replace('.', '/').concat(".class");
|
||||
byte[] data = zipFile.get(path);
|
||||
if (data == null)
|
||||
{
|
||||
throw new ClassNotFoundException(name);
|
||||
}
|
||||
|
||||
return defineClass(name, data, 0, data.length);
|
||||
}
|
||||
};
|
||||
|
||||
Class<?> clientClass = rsClassLoader.loadClass(initialClass);
|
||||
|
||||
Applet rs = (Applet) clientClass.newInstance();
|
||||
rs.setStub(new RSAppletStub(config));
|
||||
|
||||
if (rs instanceof Client)
|
||||
{
|
||||
log.info("client-patch {}", ((Client) rs).getBuildID());
|
||||
}
|
||||
Applet rs = loadClient(jar);
|
||||
|
||||
SplashScreen.stage(.5, null, "Starting core classes");
|
||||
|
||||
return rs;
|
||||
}
|
||||
catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException
|
||||
| CompressorException | InvalidHeaderException | CertificateException | VerificationException
|
||||
| SecurityException e)
|
||||
| VerificationException | SecurityException e)
|
||||
{
|
||||
log.error("Error loading RS!", e);
|
||||
|
||||
@@ -337,10 +152,293 @@ public class ClientLoader implements Supplier<Applet>
|
||||
}
|
||||
}
|
||||
|
||||
private static Certificate[] getJagexCertificateChain() throws CertificateException
|
||||
private void downloadConfig() throws IOException
|
||||
{
|
||||
CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
|
||||
Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(ClientLoader.class.getResourceAsStream("jagex.crt"));
|
||||
return certificates.toArray(new Certificate[certificates.size()]);
|
||||
String host = null;
|
||||
for (int attempt = 0; ; attempt++)
|
||||
{
|
||||
try
|
||||
{
|
||||
config = ClientConfigLoader.fetch(host);
|
||||
|
||||
if (Strings.isNullOrEmpty(config.getCodeBase()) || Strings.isNullOrEmpty(config.getInitialJar()) || Strings.isNullOrEmpty(config.getInitialClass()))
|
||||
{
|
||||
throw new IOException("Invalid or missing jav_config");
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
log.info("Failed to get jav_config from host \"{}\" ({})", host, e.getMessage());
|
||||
|
||||
if (attempt >= NUM_ATTEMPTS)
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
|
||||
host = hostSupplier.get();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateVanilla() throws IOException, VerificationException
|
||||
{
|
||||
Certificate[] jagexCertificateChain = getJagexCertificateChain();
|
||||
|
||||
// Get the mtime of the first thing in the vanilla cache
|
||||
// we check this against what the server gives us to let us skip downloading and patching the whole thing
|
||||
|
||||
try (FileChannel vanilla = FileChannel.open(VANILLA_CACHE.toPath(),
|
||||
StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE))
|
||||
{
|
||||
long vanillaCacheMTime = -1;
|
||||
boolean vanillaCacheIsInvalid = false;
|
||||
try
|
||||
{
|
||||
JarInputStream vanillaCacheTest = new JarInputStream(Channels.newInputStream(vanilla));
|
||||
vanillaCacheTest.skip(Long.MAX_VALUE);
|
||||
JarEntry je = vanillaCacheTest.getNextJarEntry();
|
||||
if (je != null)
|
||||
{
|
||||
verifyJarEntry(je, jagexCertificateChain);
|
||||
vanillaCacheMTime = je.getLastModifiedTime().toMillis();
|
||||
}
|
||||
else
|
||||
{
|
||||
vanillaCacheIsInvalid = true;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
log.info("Failed to read the vanilla cache: {}", e.toString());
|
||||
vanillaCacheIsInvalid = true;
|
||||
}
|
||||
vanilla.position(0);
|
||||
|
||||
// Start downloading the vanilla client
|
||||
|
||||
String codebase = config.getCodeBase();
|
||||
String initialJar = config.getInitialJar();
|
||||
HttpUrl url = HttpUrl.parse(codebase + initialJar);
|
||||
|
||||
for (int attempt = 0; ; attempt++)
|
||||
{
|
||||
Request request = new Request.Builder()
|
||||
.url(url)
|
||||
.build();
|
||||
|
||||
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
|
||||
{
|
||||
// Its important to not close the response manually - this should be the only close or
|
||||
// try-with-resources on this stream or it's children
|
||||
|
||||
int length = (int) response.body().contentLength();
|
||||
if (length < 0)
|
||||
{
|
||||
length = 3 * 1024 * 1024;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!vanillaCacheIsInvalid && vanilla.size() != length)
|
||||
{
|
||||
// The zip trailer filetab can be missing and the ZipInputStream will not notice
|
||||
log.info("Vanilla cache is the wrong size");
|
||||
vanillaCacheIsInvalid = true;
|
||||
}
|
||||
}
|
||||
final int flength = length;
|
||||
TeeInputStream copyStream = new TeeInputStream(new CountingInputStream(response.body().byteStream(),
|
||||
read -> SplashScreen.stage(.05, .35, null, "Downloading Old School RuneScape", read, flength, true)));
|
||||
|
||||
// Save the bytes from the mtime test so we can write it to disk
|
||||
// if the test fails, or the cache doesn't verify
|
||||
ByteArrayOutputStream preRead = new ByteArrayOutputStream();
|
||||
copyStream.setOut(preRead);
|
||||
|
||||
JarInputStream networkJIS = new JarInputStream(copyStream);
|
||||
|
||||
// Get the mtime from the first entry so check it against the cache
|
||||
{
|
||||
JarEntry je = networkJIS.getNextJarEntry();
|
||||
networkJIS.skip(Long.MAX_VALUE);
|
||||
verifyJarEntry(je, jagexCertificateChain);
|
||||
long vanillaClientMTime = je.getLastModifiedTime().toMillis();
|
||||
if (!vanillaCacheIsInvalid && vanillaClientMTime != vanillaCacheMTime)
|
||||
{
|
||||
log.info("Vanilla cache is out of date: {} != {}", vanillaClientMTime, vanillaCacheMTime);
|
||||
vanillaCacheIsInvalid = true;
|
||||
}
|
||||
}
|
||||
|
||||
// the mtime matches so the cache is probably up to date, but just make sure its fully
|
||||
// intact before closing the server connection
|
||||
if (!vanillaCacheIsInvalid)
|
||||
{
|
||||
try
|
||||
{
|
||||
// as with the request stream, its important to not early close vanilla too
|
||||
JarInputStream vanillaCacheTest = new JarInputStream(Channels.newInputStream(vanilla));
|
||||
verifyWholeJar(vanillaCacheTest, jagexCertificateChain);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
log.warn("Failed to verify the vanilla cache", e);
|
||||
vanillaCacheIsInvalid = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (vanillaCacheIsInvalid)
|
||||
{
|
||||
// the cache is not up to date, commit our peek to the file and write the rest of it, while verifying
|
||||
vanilla.position(0);
|
||||
OutputStream out = Channels.newOutputStream(vanilla);
|
||||
out.write(preRead.toByteArray());
|
||||
copyStream.setOut(out);
|
||||
verifyWholeJar(networkJIS, jagexCertificateChain);
|
||||
copyStream.skip(Long.MAX_VALUE); // write the trailer to the file too
|
||||
out.flush();
|
||||
vanilla.truncate(vanilla.position());
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Using cached vanilla client");
|
||||
}
|
||||
return;
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
log.warn("Failed to download gamepack from \"{}\"", url, e);
|
||||
|
||||
if (attempt >= NUM_ATTEMPTS)
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
|
||||
url = url.newBuilder().host(hostSupplier.get()).build();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void applyPatch() throws IOException
|
||||
{
|
||||
byte[] vanillaHash = new byte[64];
|
||||
byte[] appliedPatchHash = new byte[64];
|
||||
|
||||
try (InputStream is = ClientLoader.class.getResourceAsStream("/client.serial"))
|
||||
{
|
||||
if (is == null)
|
||||
{
|
||||
SwingUtilities.invokeLater(() ->
|
||||
new FatalErrorDialog("The client-patch is missing from the classpath. If you are building " +
|
||||
"the client you need to re-run maven")
|
||||
.addBuildingGuide()
|
||||
.open());
|
||||
throw new NullPointerException();
|
||||
}
|
||||
|
||||
DataInputStream dis = new DataInputStream(is);
|
||||
dis.readFully(vanillaHash);
|
||||
dis.readFully(appliedPatchHash);
|
||||
}
|
||||
|
||||
byte[] vanillaCacheHash = Files.asByteSource(VANILLA_CACHE).hash(Hashing.sha512()).asBytes();
|
||||
if (!Arrays.equals(vanillaHash, vanillaCacheHash))
|
||||
{
|
||||
log.info("Client is outdated!");
|
||||
updateCheckMode = VANILLA;
|
||||
return;
|
||||
}
|
||||
|
||||
if (PATCHED_CACHE.exists())
|
||||
{
|
||||
byte[] diskBytes = Files.asByteSource(PATCHED_CACHE).hash(Hashing.sha512()).asBytes();
|
||||
if (!Arrays.equals(diskBytes, appliedPatchHash))
|
||||
{
|
||||
log.warn("Cached patch hash mismatches, regenerating patch");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Using cached patched client");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
try (HashingOutputStream hos = new HashingOutputStream(Hashing.sha512(), new FileOutputStream(PATCHED_CACHE));
|
||||
InputStream patch = ClientLoader.class.getResourceAsStream("/client.patch"))
|
||||
{
|
||||
new FileByFileV1DeltaApplier().applyDelta(VANILLA_CACHE, patch, hos);
|
||||
|
||||
if (!Arrays.equals(hos.hash().asBytes(), appliedPatchHash))
|
||||
{
|
||||
log.error("Patched client hash mismatch");
|
||||
updateCheckMode = VANILLA;
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
log.error("Unable to apply patch despite hash matching", e);
|
||||
updateCheckMode = VANILLA;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private Applet loadClient(URL url) throws ClassNotFoundException, IllegalAccessException, InstantiationException
|
||||
{
|
||||
URLClassLoader rsClassLoader = new URLClassLoader(new URL[]{url});
|
||||
|
||||
String initialClass = config.getInitialClass();
|
||||
Class<?> clientClass = rsClassLoader.loadClass(initialClass);
|
||||
|
||||
Applet rs = (Applet) clientClass.newInstance();
|
||||
rs.setStub(new RSAppletStub(config));
|
||||
|
||||
if (rs instanceof Client)
|
||||
{
|
||||
log.info("client-patch {}", ((Client) rs).getBuildID());
|
||||
}
|
||||
|
||||
return rs;
|
||||
}
|
||||
|
||||
private static Certificate[] getJagexCertificateChain()
|
||||
{
|
||||
try
|
||||
{
|
||||
CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
|
||||
Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(ClientLoader.class.getResourceAsStream("jagex.crt"));
|
||||
return certificates.toArray(new Certificate[0]);
|
||||
}
|
||||
catch (CertificateException e)
|
||||
{
|
||||
throw new RuntimeException("Unable to parse pinned certificates", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void verifyJarEntry(JarEntry je, Certificate[] certs) throws VerificationException
|
||||
{
|
||||
switch (je.getName())
|
||||
{
|
||||
case "META-INF/JAGEXLTD.SF":
|
||||
case "META-INF/JAGEXLTD.RSA":
|
||||
// You can't sign the signing files
|
||||
return;
|
||||
default:
|
||||
if (!Arrays.equals(je.getCertificates(), certs))
|
||||
{
|
||||
throw new VerificationException("Unable to verify jar entry: " + je.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void verifyWholeJar(JarInputStream jis, Certificate[] certs) throws IOException, VerificationException
|
||||
{
|
||||
for (JarEntry je; (je = jis.getNextJarEntry()) != null; )
|
||||
{
|
||||
jis.skip(Long.MAX_VALUE);
|
||||
verifyJarEntry(je, certs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Copyright (c) 2019 Abex
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.client.rs;
|
||||
|
||||
import java.io.FilterInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.function.IntConsumer;
|
||||
|
||||
class CountingInputStream extends FilterInputStream
|
||||
{
|
||||
private final IntConsumer changed;
|
||||
|
||||
CountingInputStream(InputStream in, IntConsumer changed)
|
||||
{
|
||||
super(in);
|
||||
this.changed = changed;
|
||||
}
|
||||
|
||||
private int read = 0;
|
||||
|
||||
@Override
|
||||
public int read(byte[] b, int off, int len) throws IOException
|
||||
{
|
||||
int thisRead = super.read(b, off, len);
|
||||
if (thisRead > 0)
|
||||
{
|
||||
this.read += thisRead;
|
||||
}
|
||||
changed.accept(this.read);
|
||||
return thisRead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int read() throws IOException
|
||||
{
|
||||
int val = super.read();
|
||||
if (val != -1)
|
||||
{
|
||||
this.read++;
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long skip(long n) throws IOException
|
||||
{
|
||||
long thisRead = in.skip(n);
|
||||
this.read += thisRead;
|
||||
changed.accept(this.read);
|
||||
return thisRead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean markSupported()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
/*
|
||||
* Copyright (c) 2019 Abex
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.client.rs;
|
||||
|
||||
import java.io.FilterInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
class TeeInputStream extends FilterInputStream
|
||||
{
|
||||
@Getter
|
||||
@Setter
|
||||
private OutputStream out;
|
||||
|
||||
TeeInputStream(InputStream in)
|
||||
{
|
||||
super(in);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int read(byte[] b, int off, int len) throws IOException
|
||||
{
|
||||
int thisRead = super.read(b, off, len);
|
||||
|
||||
if (thisRead > 0)
|
||||
{
|
||||
out.write(b, off, thisRead);
|
||||
}
|
||||
|
||||
return thisRead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int read() throws IOException
|
||||
{
|
||||
int val = super.read();
|
||||
if (val != -1)
|
||||
{
|
||||
out.write(val);
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long skip(long n) throws IOException
|
||||
{
|
||||
byte[] buf = new byte[(int) Math.min(n, 0x4000)];
|
||||
long total = 0;
|
||||
for (; n > 0; )
|
||||
{
|
||||
int read = (int) Math.min(n, buf.length);
|
||||
|
||||
read = read(buf, 0, read);
|
||||
if (read == -1)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
total += read;
|
||||
n -= read;
|
||||
}
|
||||
return total;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean markSupported()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user