Redo ip bans - reduce amount of db queries on login

Works by loading all ip bans on startup and querying the collection in memory
rather than making calls on every login.
This commit is contained in:
P0nk
2024-09-30 07:18:01 +02:00
parent 167937bb88
commit 7661cd0f75
15 changed files with 228 additions and 36 deletions

View File

@@ -36,6 +36,7 @@ import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import service.AccountService;
import service.BanService;
import service.TransitionService;
import tools.BCrypt;
import tools.HexTool;
@@ -49,10 +50,13 @@ public final class LoginPasswordHandler implements PacketHandler {
private final AccountService accountService;
private final TransitionService transitionService;
private final BanService banService;
public LoginPasswordHandler(AccountService accountService, TransitionService transitionService) {
public LoginPasswordHandler(AccountService accountService, TransitionService transitionService,
BanService banService) {
this.accountService = accountService;
this.transitionService = transitionService;
this.banService = banService;
}
@Override
@@ -110,7 +114,7 @@ public final class LoginPasswordHandler implements PacketHandler {
}
boolean banCheckDisabled = false;
if (!banCheckDisabled && (c.hasBannedIP() || c.hasBannedMac() || c.hasBannedHWID())) {
if (!banCheckDisabled && (banService.isBanned(c) || c.hasBannedMac() || c.hasBannedHWID())) {
c.sendPacket(PacketCreator.getLoginFailed(3));
return;
}