client: load jagex config and client over https

This has only recently started working, but I am not sure when.
This commit is contained in:
Adam
2019-03-17 13:53:21 -04:00
parent c8eeeaf9b2
commit b288a4899d
2 changed files with 6 additions and 3 deletions

View File

@@ -38,7 +38,7 @@ import okhttp3.Response;
@Singleton @Singleton
class ClientConfigLoader class ClientConfigLoader
{ {
private static final String CONFIG_URL = "http://oldschool.runescape.com/jav_config.ws"; private static final String CONFIG_URL = "https://oldschool.runescape.com/jav_config.ws";
private final OkHttpClient httpClient; private final OkHttpClient httpClient;
@Inject @Inject

View File

@@ -37,7 +37,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
@@ -48,6 +47,7 @@ import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import static net.runelite.client.rs.ClientUpdateCheckMode.*; import static net.runelite.client.rs.ClientUpdateCheckMode.*;
import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.RuneLiteAPI;
import okhttp3.HttpUrl;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.apache.commons.compress.compressors.CompressorException; import org.apache.commons.compress.compressors.CompressorException;
@@ -83,7 +83,10 @@ public class ClientLoader
{ {
String codebase = config.getCodeBase(); String codebase = config.getCodeBase();
String initialJar = config.getInitialJar(); String initialJar = config.getInitialJar();
URL url = new URL(codebase + initialJar); HttpUrl url = HttpUrl.parse(codebase).newBuilder()
.scheme("https")
.addPathSegment(initialJar)
.build();
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.build(); .build();