Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 03:31:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Фикс найденных багов

Browse source
This commit is contained in:
Gravit 2019-04-20 05:58:59 +07:00
parent c3fd501ef1
commit b0baf1e1f6
5 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java
View file

@ -11,18 +11,18 @@
import ru.gravit.launchserver.auth.texture.TextureProvider; import ru.gravit.launchserver.auth.texture.TextureProvider;
import ru.gravit.launchserver.components.Component; import ru.gravit.launchserver.components.Component;
import ru.gravit.utils.UniversalJsonAdapter; import ru.gravit.utils.UniversalJsonAdapter;
import ru.gravit.utils.helper.LogHelper;
public class LaunchServerGsonManager extends GsonManager { public class LaunchServerGsonManager extends GsonManager {
@Override @Override
public void registerAdapters(GsonBuilder builder) { public void registerAdapters(GsonBuilder builder) {
super.registerAdapters(builder); super.registerAdapters(builder);
Launcher.gsonManager.gsonBuilder = new GsonBuilder(); builder.registerTypeAdapter(AuthProvider.class, new UniversalJsonAdapter<>(AuthProvider.providers));
Launcher.gsonManager.gsonBuilder.registerTypeAdapter(AuthProvider.class, new UniversalJsonAdapter<>(AuthProvider.providers)); builder.registerTypeAdapter(TextureProvider.class, new UniversalJsonAdapter<>(TextureProvider.providers));
Launcher.gsonManager.gsonBuilder.registerTypeAdapter(TextureProvider.class, new UniversalJsonAdapter<>(TextureProvider.providers)); builder.registerTypeAdapter(AuthHandler.class, new UniversalJsonAdapter<>(AuthHandler.providers));
Launcher.gsonManager.gsonBuilder.registerTypeAdapter(AuthHandler.class, new UniversalJsonAdapter<>(AuthHandler.providers)); builder.registerTypeAdapter(PermissionsHandler.class, new UniversalJsonAdapter<>(PermissionsHandler.providers));
Launcher.gsonManager.gsonBuilder.registerTypeAdapter(PermissionsHandler.class, new UniversalJsonAdapter<>(PermissionsHandler.providers)); builder.registerTypeAdapter(HWIDHandler.class, new UniversalJsonAdapter<>(HWIDHandler.providers));
Launcher.gsonManager.gsonBuilder.registerTypeAdapter(HWIDHandler.class, new UniversalJsonAdapter<>(HWIDHandler.providers)); builder.registerTypeAdapter(Component.class, new UniversalJsonAdapter<>(Component.providers));
Launcher.gsonManager.gsonBuilder.registerTypeAdapter(Component.class, new UniversalJsonAdapter<>(Component.providers)); builder.registerTypeAdapter(ProtectHandler.class, new UniversalJsonAdapter<>(ProtectHandler.providers));
Launcher.gsonManager.gsonBuilder.registerTypeAdapter(ProtectHandler.class, new UniversalJsonAdapter<>(ProtectHandler.providers));
} }
} }

6
LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/LauncherResponse.java
View file

@ -37,14 +37,14 @@ public void execute(ChannelHandlerContext ctx, Client client) {
if (hash == null) service.sendObjectAndClose(ctx, new LauncherRequestEvent(true, JAR_URL)); if (hash == null) service.sendObjectAndClose(ctx, new LauncherRequestEvent(true, JAR_URL));
if (Arrays.equals(bytes, hash)) { if (Arrays.equals(bytes, hash)) {
client.checkSign = true; client.checkSign = true;
service.sendObject(ctx, new LauncherRequestEvent(false, JAR_URL)); sendResult(new LauncherRequestEvent(false, JAR_URL));
} else { } else {
service.sendObjectAndClose(ctx, new LauncherRequestEvent(true, JAR_URL)); sendResultAndClose(new LauncherRequestEvent(true, JAR_URL));
} }
} else if (launcher_type == 2) //EXE } else if (launcher_type == 2) //EXE
{ {
byte[] hash = LaunchServer.server.launcherEXEBinary.getBytes().getDigest(); byte[] hash = LaunchServer.server.launcherEXEBinary.getBytes().getDigest();
if (hash == null) service.sendObjectAndClose(ctx, new LauncherRequestEvent(true, EXE_URL)); if (hash == null) sendResultAndClose(new LauncherRequestEvent(true, EXE_URL));
if (Arrays.equals(bytes, hash)) { if (Arrays.equals(bytes, hash)) {
client.checkSign = true; client.checkSign = true;
sendResult(new LauncherRequestEvent(false, EXE_URL)); sendResult(new LauncherRequestEvent(false, EXE_URL));

7
LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java
View file

@ -18,11 +18,14 @@ public void process(ResultInterface result) {
{ {
RequestEvent event = (RequestEvent) result; RequestEvent event = (RequestEvent) result;
checkUUID = event.requestUUID; checkUUID = event.requestUUID;
if(checkUUID != null)
LogHelper.debug("Event UUID: %s found", checkUUID.toString());
} }
for (ResultEvent r : requests) { for (ResultEvent r : requests) {
if( (r.uuid != null && r.uuid.equals(checkUUID)) || ( r.uuid == null && (r.type.equals(result.getType()) || result.getType().equals("error") )) ) { if(r.uuid != null)
LogHelper.debug("Request UUID found: %s", r.uuid.toString());
if( (r.uuid != null && r.uuid.equals(checkUUID)) || ( checkUUID == null && (r.type.equals(result.getType()) || result.getType().equals("error") )) ) {
LogHelper.debug("Event %s type", r.type); LogHelper.debug("Event %s type", r.type);
LogHelper.debug("Event UUID contains: %s", (r.uuid != null && r.uuid.equals(checkUUID)) ? "true" : "false");
synchronized (r) { synchronized (r) {
r.result = result; r.result = result;
r.ready = true; r.ready = true;

1
libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java
View file

@ -1,5 +1,6 @@
package ru.gravit.utils; package ru.gravit.utils;
import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.VerifyHelper; import ru.gravit.utils.helper.VerifyHelper;
import java.util.Map; import java.util.Map;

7
libLauncher/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java
View file

@ -6,11 +6,12 @@
import java.lang.reflect.Type; import java.lang.reflect.Type;
public class UniversalJsonAdapter<R> implements JsonSerializer<R>, JsonDeserializer<R> { public class UniversalJsonAdapter<R> implements JsonSerializer<R>, JsonDeserializer<R> {
public ProviderMap<R> providerMap; public final ProviderMap<R> providerMap;
public String PROP_NAME = "type"; public final String PROP_NAME;
public UniversalJsonAdapter(ProviderMap<R> providerMap) { public UniversalJsonAdapter(ProviderMap<R> providerMap) {
this.providerMap = providerMap; this.providerMap = providerMap;
this.PROP_NAME = "type";
} }
public UniversalJsonAdapter(ProviderMap<R> providerMap, String PROP_NAME) { public UniversalJsonAdapter(ProviderMap<R> providerMap, String PROP_NAME) {
@ -22,7 +23,7 @@ public R deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext
String typename = json.getAsJsonObject().getAsJsonPrimitive(PROP_NAME).getAsString(); String typename = json.getAsJsonObject().getAsJsonPrimitive(PROP_NAME).getAsString();
Class<? extends R> cls = providerMap.getProviderClass(typename); Class<? extends R> cls = providerMap.getProviderClass(typename);
if (cls == null) { if (cls == null) {
LogHelper.error("AuthHandler %s not found", typename); LogHelper.error("Provider %s not found", typename);
return null; return null;
} }
return context.deserialize(json, cls); return context.deserialize(json, cls);