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

[FIX] Assess denied и witch

Browse source
This commit is contained in:
Gravit 2019-03-10 18:48:46 +07:00
parent 94d677fe1e
commit be4c2f4b07
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java
View file

@ -28,7 +28,7 @@ public void reply() throws IOException {
debug("Username: %s, Server ID: %s", username, serverID); debug("Username: %s, Server ID: %s", username, serverID);
Client clientData = server.sessionManager.getClient(session); Client clientData = server.sessionManager.getClient(session);
if (!clientData.isAuth || clientData.type != Client.Type.SERVER) { if (!clientData.isAuth || clientData.type != Client.Type.SERVER) {
requestError("Assess denied"); requestError("Access denied");
return; return;
} }
// Try check server with auth handler // Try check server with auth handler

2
LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java
View file

@ -26,7 +26,7 @@ public void reply() throws IOException {
String serverID = VerifyHelper.verifyServerID(input.readASCII(SerializeLimits.MAX_SERVERID)); // With minus sign String serverID = VerifyHelper.verifyServerID(input.readASCII(SerializeLimits.MAX_SERVERID)); // With minus sign
Client clientData = server.sessionManager.getClient(session); Client clientData = server.sessionManager.getClient(session);
if (!clientData.isAuth || clientData.type != Client.Type.USER) { if (!clientData.isAuth || clientData.type != Client.Type.USER) {
requestError("Assess denied"); requestError("Access denied");
return; return;
} }
// Try join server with auth handler // Try join server with auth handler

2
LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java
View file

@ -25,7 +25,7 @@ public void reply() throws IOException {
input.readBoolean(); input.readBoolean();
if (client.type == Client.Type.USER && !client.checkSign) { if (client.type == Client.Type.USER && !client.checkSign) {
LogHelper.warning("User session: %d ip %s try get profiles", session, ip); LogHelper.warning("User session: %d ip %s try get profiles", session, ip);
requestError("Assess denied"); requestError("Access denied");
return; return;
} }
writeNoError(output); writeNoError(output);

2
LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java
View file

@ -39,7 +39,7 @@ public void reply() throws IOException {
} }
Client clientData = server.sessionManager.getClient(session); Client clientData = server.sessionManager.getClient(session);
if (!clientData.isAuth || clientData.type != Client.Type.USER || clientData.profile == null) { if (!clientData.isAuth || clientData.type != Client.Type.USER || clientData.profile == null) {
requestError("Assess denied"); requestError("Access denied");
return; return;
} }
if (!clientData.permissions.canAdmin) { if (!clientData.permissions.canAdmin) {

2
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java
View file

@ -19,7 +19,7 @@ public String getType() {
@Override @Override
public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception { public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception {
if (!client.isAuth || client.type != Client.Type.USER || client.profile == null) { 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; return;
} }
if (!client.permissions.canAdmin) { if (!client.permissions.canAdmin) {

4
Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java
View file

@ -44,9 +44,9 @@ public static void main(String[] arguments) throws IOException, InterruptedExcep
if (!process.isAlive()) { if (!process.isAlive()) {
int errorcode = process.exitValue(); int errorcode = process.exitValue();
if (errorcode != 0) if (errorcode != 0)
LogHelper.error("Process exit witch error code: %d", errorcode); LogHelper.error("Process exitwith error code: %d", errorcode);
else else
LogHelper.info("Process exit witch code 0"); LogHelper.info("Process exitwith code 0");
} else { } else {
LogHelper.debug("Process started success"); LogHelper.debug("Process started success");
} }