Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add configurable antibot interval (#826) lost while merging master

Browse Source 
- Add interval configuration
- Small refactoring: make OnJoinVerifier not call antibot if a PlayerAuth is available
This commit is contained in:
ljacqu
2016-10-30 09:24:31 +01:00
parent 7a43703d52
commit 195e409efd
4 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java
+2 -2
View File
@@ -68,10 +68,10 @@ class OnJoinVerifier implements Reloadable {
* @param isAuthAvailable whether or not the player is registered
*/
public void checkAntibot(Player player, boolean isAuthAvailable) throws FailedVerificationException {
if (permissionsManager.hasPermission(player, PlayerStatePermission.BYPASS_ANTIBOT)) {
if (isAuthAvailable || permissionsManager.hasPermission(player, PlayerStatePermission.BYPASS_ANTIBOT)) {
return;
}
if (antiBotService.shouldKick(isAuthAvailable)) {
if (antiBotService.shouldKick()) {
antiBotService.addPlayerKick(player.getName());
throw new FailedVerificationException(MessageKey.KICK_ANTIBOT);
}
src/main/java/fr/xephi/authme/service/AntiBotService.java
+6 -8
View File
@@ -31,6 +31,7 @@ public class AntiBotService implements SettingsDependent {
private int duration;
private int sensibility;
private int delay;
private int interval;
// Service status
private AntiBotStatus antiBotStatus;
private boolean startup;
@@ -60,6 +61,7 @@ public class AntiBotService implements SettingsDependent {
duration = settings.getProperty(ProtectionSettings.ANTIBOT_DURATION);
sensibility = settings.getProperty(ProtectionSettings.ANTIBOT_SENSIBILITY);
delay = settings.getProperty(ProtectionSettings.ANTIBOT_DELAY);
interval = settings.getProperty(ProtectionSettings.ANTIBOT_INTERVAL);
// Stop existing protection
stopProtection();
@@ -145,23 +147,19 @@ public class AntiBotService implements SettingsDependent {
/**
* Returns if a player should be kicked due to antibot service.
*
* @param isAuthAvailable if the player is registered
*
* @return if the player should be kicked
*/
public boolean shouldKick(boolean isAuthAvailable) {
if (antiBotStatus == AntiBotStatus.DISABLED || isAuthAvailable) {
public boolean shouldKick() {
if (antiBotStatus == AntiBotStatus.DISABLED) {
return false;
}
if (antiBotStatus == AntiBotStatus.ACTIVE) {
} else if (antiBotStatus == AntiBotStatus.ACTIVE) {
return true;
}
if (lastFlaggedJoin == null) {
lastFlaggedJoin = Instant.now();
}
if (ChronoUnit.SECONDS.between(lastFlaggedJoin, Instant.now()) <= 5) {
if (ChronoUnit.SECONDS.between(lastFlaggedJoin, Instant.now()) <= interval) {
flagged++;
} else {
// reset to 1 because this player is also count as not registered