From be4c2f4b07f4e902e272a1afe124c30e82b3140a Mon Sep 17 00:00:00 2001 From: Gravit Date: Sun, 10 Mar 2019 18:48:46 +0700 Subject: [PATCH] =?UTF-8?q?[FIX]=20Assess=20denied=20=D0=B8=20witch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launchserver/response/auth/CheckServerResponse.java | 2 +- .../gravit/launchserver/response/auth/JoinServerResponse.java | 2 +- .../gravit/launchserver/response/update/ProfilesResponse.java | 2 +- .../gravit/launchserver/response/update/UpdateResponse.java | 2 +- .../socket/websocket/json/update/UpdateResponse.java | 2 +- .../main/java/ru/gravit/launcher/ClientLauncherWrapper.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java index dbdd2b44..b2974674 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java @@ -28,7 +28,7 @@ public void reply() throws IOException { debug("Username: %s, Server ID: %s", username, serverID); Client clientData = server.sessionManager.getClient(session); if (!clientData.isAuth || clientData.type != Client.Type.SERVER) { - requestError("Assess denied"); + requestError("Access denied"); return; } // Try check server with auth handler diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java index dd5d9463..821848a6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java @@ -26,7 +26,7 @@ public void reply() throws IOException { String serverID = VerifyHelper.verifyServerID(input.readASCII(SerializeLimits.MAX_SERVERID)); // With minus sign Client clientData = server.sessionManager.getClient(session); if (!clientData.isAuth || clientData.type != Client.Type.USER) { - requestError("Assess denied"); + requestError("Access denied"); return; } // Try join server with auth handler diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java index 039e018b..47dd872e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java @@ -25,7 +25,7 @@ public void reply() throws IOException { input.readBoolean(); if (client.type == Client.Type.USER && !client.checkSign) { LogHelper.warning("User session: %d ip %s try get profiles", session, ip); - requestError("Assess denied"); + requestError("Access denied"); return; } writeNoError(output); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java index 530b489d..8e4c547b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java @@ -39,7 +39,7 @@ public void reply() throws IOException { } Client clientData = server.sessionManager.getClient(session); if (!clientData.isAuth || clientData.type != Client.Type.USER || clientData.profile == null) { - requestError("Assess denied"); + requestError("Access denied"); return; } if (!clientData.permissions.canAdmin) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java index 6c0502c6..26965f25 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java @@ -19,7 +19,7 @@ public String getType() { @Override public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception { if (!client.isAuth || client.type != Client.Type.USER || client.profile == null) { - service.sendObject(ctx,new ErrorRequestEvent("Assess denied")); + service.sendObject(ctx,new ErrorRequestEvent("Access denied")); return; } if (!client.permissions.canAdmin) { diff --git a/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java b/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java index 39a9633c..3f86f331 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java +++ b/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java @@ -44,9 +44,9 @@ public static void main(String[] arguments) throws IOException, InterruptedExcep if (!process.isAlive()) { int errorcode = process.exitValue(); if (errorcode != 0) - LogHelper.error("Process exit witch error code: %d", errorcode); + LogHelper.error("Process exitwith error code: %d", errorcode); else - LogHelper.info("Process exit witch code 0"); + LogHelper.info("Process exitwith code 0"); } else { LogHelper.debug("Process started success"); }