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

[FIX] Дополнительные проверки в Auth для защиты от дурака

Browse source
This commit is contained in:
Gravit 2019-11-24 19:55:33 +07:00
parent 17106886bb
commit 5c39b1d4d2
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AuthProvider.java
View file

@ -43,7 +43,7 @@ public static void registerProviders() {
*/ */
public abstract AuthProviderResult auth(String login, AuthRequest.AuthPasswordInterface password, String ip) throws Exception; public abstract AuthProviderResult auth(String login, AuthRequest.AuthPasswordInterface password, String ip) throws Exception;
public void preAuth(String login, AuthRequest.AuthPasswordInterface password, String customText, String ip) { public void preAuth(String login, AuthRequest.AuthPasswordInterface password, String ip) {
} }
@Override @Override

16
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java
View file

@ -3,6 +3,7 @@
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import pro.gravit.launcher.events.request.AuthRequestEvent; import pro.gravit.launcher.events.request.AuthRequestEvent;
import pro.gravit.launcher.hwid.HWID; import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.hwid.NoHWID;
import pro.gravit.launcher.profiles.ClientProfile; import pro.gravit.launcher.profiles.ClientProfile;
import pro.gravit.launcher.request.auth.AuthRequest; import pro.gravit.launcher.request.auth.AuthRequest;
import pro.gravit.launcher.request.auth.password.AuthECPassword; import pro.gravit.launcher.request.auth.password.AuthECPassword;
@ -32,7 +33,6 @@ public class AuthResponse extends SimpleResponse {
public final transient static Random random = new SecureRandom(); public final transient static Random random = new SecureRandom();
public String login; public String login;
public String client; public String client;
public String customText;
public boolean getSession; public boolean getSession;
public AuthRequest.AuthPasswordInterface password; public AuthRequest.AuthPasswordInterface password;
@ -66,13 +66,19 @@ public void execute(ChannelHandlerContext ctx, Client clientData) throws Excepti
throw new AuthException("Password decryption error"); throw new AuthException("Password decryption error");
} }
} }
if(hwid == null) hwid = new NoHWID();
AuthProviderPair pair; AuthProviderPair pair;
if (auth_id.isEmpty()) pair = server.config.getAuthProviderPair(); if (auth_id.isEmpty()) pair = server.config.getAuthProviderPair();
else pair = server.config.getAuthProviderPair(auth_id); else pair = server.config.getAuthProviderPair(auth_id);
AuthContext context = new AuthContext(clientData, login, customText, client, hwid, ip, authType); if(pair == null)
{
sendError("auth_id incorrect");
return;
}
AuthContext context = new AuthContext(clientData, login, client, hwid, ip, authType);
AuthProvider provider = pair.provider; AuthProvider provider = pair.provider;
server.authHookManager.preHook.hook(context, clientData); server.authHookManager.preHook.hook(context, clientData);
provider.preAuth(login, password, customText, ip); provider.preAuth(login, password, ip);
AuthProviderResult aresult = provider.auth(login, password, ip); AuthProviderResult aresult = provider.auth(login, password, ip);
if (!VerifyHelper.isValidUsername(aresult.username)) { if (!VerifyHelper.isValidUsername(aresult.username)) {
AuthProvider.authError(String.format("Illegal result: '%s'", aresult.username)); AuthProvider.authError(String.format("Illegal result: '%s'", aresult.username));
@ -128,10 +134,9 @@ public void execute(ChannelHandlerContext ctx, Client clientData) throws Excepti
} }
public static class AuthContext { public static class AuthContext {
public AuthContext(Client client, String login, String customText, String profileName, HWID hwid, String ip, ConnectTypes authType) { public AuthContext(Client client, String login, String profileName, HWID hwid, String ip, ConnectTypes authType) {
this.client = client; this.client = client;
this.login = login; this.login = login;
this.customText = customText;
this.profileName = profileName; this.profileName = profileName;
this.hwid = hwid; this.hwid = hwid;
this.ip = ip; this.ip = ip;
@ -143,7 +148,6 @@ public AuthContext(Client client, String login, String customText, String profil
public int password_length; //Use AuthProvider for get password public int password_length; //Use AuthProvider for get password
public final String profileName; public final String profileName;
public final HWID hwid; public final HWID hwid;
public final String customText;
public final String ip; public final String ip;
public final ConnectTypes authType; public final ConnectTypes authType;
public final Client client; public final Client client;