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

AuthResponse fix

Browse source
This commit is contained in:
Gravit 2018-10-01 16:07:11 +07:00
parent a32402f1a6
commit 6f16819cad
1 changed files with 6 additions and 7 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/json/auth/AuthResponse.java
View file

@ -19,7 +19,6 @@
public class AuthResponse implements JsonResponseInterface { public class AuthResponse implements JsonResponseInterface {
public String login; public String login;
public String client; public String client;
private LaunchServer server = LaunchServer.server;
public String password; public String password;
@ -41,21 +40,21 @@ public String getType() {
public void execute(WebSocketService service, ChannelHandlerContext ctx) throws Exception { public void execute(WebSocketService service, ChannelHandlerContext ctx) throws Exception {
try { try {
String ip = IOHelper.getIP(ctx.channel().remoteAddress()); String ip = IOHelper.getIP(ctx.channel().remoteAddress());
if (server.limiter.isLimit(ip)) { if (LaunchServer.server.limiter.isLimit(ip)) {
AuthProvider.authError(server.config.authRejectString); AuthProvider.authError(LaunchServer.server.config.authRejectString);
return; return;
} }
AuthProvider provider = server.config.authProvider[authid]; AuthProvider provider = LaunchServer.server.config.authProvider[authid];
AuthProviderResult result = provider.auth(login, password, ip); AuthProviderResult result = provider.auth(login, password, ip);
if (!VerifyHelper.isValidUsername(result.username)) { if (!VerifyHelper.isValidUsername(result.username)) {
AuthProvider.authError(String.format("Illegal result: '%s'", result.username)); AuthProvider.authError(String.format("Illegal result: '%s'", result.username));
return; return;
} }
Collection<SignedObjectHolder<ClientProfile>> profiles = server.getProfiles(); Collection<SignedObjectHolder<ClientProfile>> profiles = LaunchServer.server.getProfiles();
for (SignedObjectHolder<ClientProfile> p : profiles) { for (SignedObjectHolder<ClientProfile> p : profiles) {
if (p.object.getTitle().equals(client)) { if (p.object.getTitle().equals(client)) {
if (!p.object.isWhitelistContains(login)) { if (!p.object.isWhitelistContains(login)) {
throw new AuthException(server.config.whitelistRejectString); throw new AuthException(LaunchServer.server.config.whitelistRejectString);
} }
//clientData.profile = p.object; //clientData.profile = p.object;
} }
@ -63,7 +62,7 @@ public void execute(WebSocketService service, ChannelHandlerContext ctx) throws
//if(clientData.profile == null) { //if(clientData.profile == null) {
// throw new AuthException("You profile not found"); // throw new AuthException("You profile not found");
//} //}
server.config.hwidHandler.check(hwid, result.username); LaunchServer.server.config.hwidHandler.check(hwid, result.username);
service.sendObject(ctx,new WebSocketService.SuccessResult("auth")); service.sendObject(ctx,new WebSocketService.SuccessResult("auth"));
} catch (AuthException | HWIDException e) } catch (AuthException | HWIDException e)
{ {