Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE] Реализована обработка ошибок в WebSockets

Browse source
This commit is contained in:
Gravit 2019-02-10 17:54:19 +07:00
parent 982a6f0342
commit 956cef2cd6
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
13 changed files with 59 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java
View file

@ -99,19 +99,6 @@ public void sendEvent(EventResult obj) {
channels.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj)));
}
public static class ErrorResult implements ResultInterface {
public ErrorResult(String error) {
this.error = error;
}
public final String error;
@Override
public String getType() {
return "error";
}
}
public static class SuccessResult {
public SuccessResult(String requesttype) {
this.requesttype = requesttype;

5
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/ExecCommandResponse.java
View file

@ -1,6 +1,7 @@
package ru.gravit.launchserver.socket.websocket.json.admin;
import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService;
@ -17,11 +18,11 @@ public String getType() {
@Override
public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) {
if (!client.isAuth) {
service.sendObject(ctx, new WebSocketService.ErrorResult("Access denied"));
service.sendObject(ctx, new ErrorRequestEvent("Access denied"));
return;
}
if (!client.permissions.canAdmin) {
service.sendObject(ctx, new WebSocketService.ErrorResult("Access denied"));
service.sendObject(ctx, new ErrorRequestEvent("Access denied"));
return;
}
LaunchServer.server.commandHandler.eval(cmd, false);

3
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/AuthResponse.java
View file

@ -3,6 +3,7 @@
import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.OshiHWID;
import ru.gravit.launcher.events.request.AuthRequestEvent;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.auth.AuthException;
@ -113,7 +114,7 @@ public void execute(WebSocketService service, ChannelHandlerContext ctx, Client
result.playerProfile = ProfileByUUIDResponse.getProfile(LaunchServer.server,uuid,aresult.username,client);
service.sendObject(ctx, result);
} catch (AuthException | HWIDException e) {
service.sendObject(ctx, new WebSocketService.ErrorResult(e.getMessage()));
service.sendObject(ctx, new ErrorRequestEvent(e.getMessage()));
}
}

5
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java
View file

@ -2,6 +2,7 @@
import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.CheckServerRequestEvent;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.launchserver.response.profile.ProfileByUUIDResponse;
@ -28,11 +29,11 @@ public void execute(WebSocketService service, ChannelHandlerContext ctx, Client
if(result.uuid != null)
result.playerProfile = ProfileByUUIDResponse.getProfile(LaunchServer.server,result.uuid,username,client);
} catch (AuthException e) {
service.sendObject(ctx, new WebSocketService.ErrorResult(e.getMessage()));
service.sendObject(ctx, new ErrorRequestEvent(e.getMessage()));
return;
} catch (Exception e) {
LogHelper.error(e);
service.sendObject(ctx, new WebSocketService.ErrorResult("Internal authHandler error"));
service.sendObject(ctx, new ErrorRequestEvent("Internal authHandler error"));
return;
}
service.sendObject(ctx, new CheckServerRequestEvent());

5
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java
View file

@ -1,6 +1,7 @@
package ru.gravit.launchserver.socket.websocket.json.auth;
import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.events.request.JoinServerRequestEvent;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.auth.AuthException;
@ -25,11 +26,11 @@ public void execute(WebSocketService service, ChannelHandlerContext ctx, Client
try {
success = LaunchServer.server.config.authHandler.joinServer(username, accessToken, serverID);
} catch (AuthException e) {
service.sendObject(ctx, new WebSocketService.ErrorResult(e.getMessage()));
service.sendObject(ctx, new ErrorRequestEvent(e.getMessage()));
return;
} catch (Exception e) {
LogHelper.error(e);
service.sendObject(ctx, new WebSocketService.ErrorResult("Internal authHandler error"));
service.sendObject(ctx, new ErrorRequestEvent("Internal authHandler error"));
return;
}
service.sendObject(ctx, new JoinServerRequestEvent(success));

3
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java
View file

@ -1,6 +1,7 @@
package ru.gravit.launchserver.socket.websocket.json.auth;
import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.events.request.ProfilesRequestEvent;
import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launchserver.LaunchServer;
@ -20,7 +21,7 @@ public String getType() {
public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception {
if(!client.checkSign)
{
service.sendObject(ctx, new WebSocketService.ErrorResult("Access denied"));
service.sendObject(ctx, new ErrorRequestEvent("Access denied"));
return;
}
service.sendObject(ctx, new ProfilesRequestEvent((List<ClientProfile>) LaunchServer.server.getProfiles()));

7
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/SetProfileResponse.java
View file

@ -1,6 +1,7 @@
package ru.gravit.launchserver.socket.websocket.json.auth;
import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client;
@ -20,14 +21,14 @@ public String getType() {
public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception {
if(!client.isAuth)
{
service.sendObject(ctx, new WebSocketService.ErrorResult("Access denied"));
service.sendObject(ctx, new ErrorRequestEvent("Access denied"));
return;
}
Collection<ClientProfile> profiles = LaunchServer.server.getProfiles();
for (ClientProfile p : profiles) {
if (p.getTitle().equals(this.client)) {
if (!p.isWhitelistContains(client.username)) {
service.sendObject(ctx, new WebSocketService.ErrorResult(LaunchServer.server.config.whitelistRejectString));
service.sendObject(ctx, new ErrorRequestEvent(LaunchServer.server.config.whitelistRejectString));
return;
}
client.profile = p;
@ -35,6 +36,6 @@ public void execute(WebSocketService service, ChannelHandlerContext ctx, Client
break;
}
}
service.sendObject(ctx, new WebSocketService.ErrorResult("Profile not found"));
service.sendObject(ctx, new ErrorRequestEvent("Profile not found"));
}
}

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

@ -1,6 +1,7 @@
package ru.gravit.launchserver.socket.websocket.json.update;
import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.events.request.LauncherRequestEvent;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client;
@ -52,7 +53,7 @@ public void execute(WebSocketService service, ChannelHandlerContext ctx, Client
} else {
service.sendObjectAndClose(ctx, new LauncherRequestEvent(true, EXE_URL));
}
} else service.sendObject(ctx, new WebSocketService.ErrorResult("Request launcher type error"));
} else service.sendObject(ctx, new ErrorRequestEvent("Request launcher type error"));
}

3
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateListResponse.java
View file

@ -1,6 +1,7 @@
package ru.gravit.launchserver.socket.websocket.json.update;
import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.events.request.UpdateListRequestEvent;
import ru.gravit.launcher.hasher.HashedDir;
import ru.gravit.launchserver.LaunchServer;
@ -19,7 +20,7 @@ public String getType() {
@Override
public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) {
if (!client.isAuth) {
service.sendObject(ctx, new WebSocketService.ErrorResult("Access denied"));
service.sendObject(ctx, new ErrorRequestEvent("Access denied"));
return;
}
HashedDir hdir = LaunchServer.server.updatesDirMap.get(dir).object;

1
LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientWebSocketService.java
View file

@ -86,6 +86,7 @@ public void registerResults() {
registerResult("batchProfileByUsername", BatchProfileByUsernameRequestEvent.class);
registerResult("profiles", ProfilesRequestEvent.class);
registerResult("updateList", UpdateListRequestEvent.class);
registerResult("error", ErrorRequestEvent.class);
}
public void registerHandler(EventHandler eventHandler)

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

@ -2,6 +2,8 @@
import com.google.gson.GsonBuilder;
import ru.gravit.launcher.Launcher;
import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.request.RequestException;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.helper.LogHelper;
@ -24,6 +26,11 @@ public static ResultInterface sendRequest(RequestInterface request) throws IOExc
}
ResultInterface result = e.result;
waitEventHandler.requests.remove(e);
if(e.result.getType().equals("error"))
{
ErrorRequestEvent errorRequestEvent = (ErrorRequestEvent) e.result;
throw new RequestException(errorRequestEvent.error);
}
return result;
}
public static void initWebSockets(String address, int port)

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

@ -1,6 +1,7 @@
package ru.gravit.launcher.request.websockets;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.helper.LogHelper;
import java.util.HashSet;
@ -8,10 +9,13 @@ public class WaitEventHandler implements ClientWebSocketService.EventHandler {
public HashSet<ResultEvent> requests = new HashSet<>();
@Override
public void process(ResultInterface result) {
LogHelper.debug("Processing event %s type", result.getType());
for(ResultEvent r : requests)
{
if(r.type.equals(result.getType()))
LogHelper.subDebug("Processing %s", r.type);
if(r.type.equals(result.getType()) || result.getType().equals("error"))
{
LogHelper.debug("Event %s type", r.type);
synchronized (r)
{
r.result = result;

25
libLauncher/src/main/java/ru/gravit/launcher/events/request/ErrorRequestEvent.java Normal file
View file

@ -0,0 +1,25 @@
package ru.gravit.launcher.events.request;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface;
import java.util.UUID;
public class ErrorRequestEvent implements ResultInterface, EventInterface {
public static UUID uuid = UUID.fromString("0af22bc7-aa01-4881-bdbb-dc62b3cdac96");
public ErrorRequestEvent(String error) {
this.error = error;
}
public final String error;
@Override
public String getType() {
return "error";
}
@Override
public UUID getUUID() {
return null;
}
}