Merge branch 'master' into ip-check

src/main/java/fr/xephi/authme/process/register/AsyncRegister.java

@@ -4,16 +4,19 @@ import ch.jalu.injector.factory.SingletonStore;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.events.AuthMeAsyncPreRegisterEvent;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.process.register.executors.RegistrationExecutor;
 import fr.xephi.authme.process.register.executors.RegistrationMethod;
 import fr.xephi.authme.process.register.executors.RegistrationParameters;
+import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
 import fr.xephi.authme.service.bungeecord.MessageType;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
+import fr.xephi.authme.util.InternetProtocolUtils;
 import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.entity.Player;
 
@@ -32,6 +35,8 @@ public class AsyncRegister implements AsynchronousProcess {
     @Inject
     private PlayerCache playerCache;
     @Inject
+    private BukkitService bukkitService;
+    @Inject
     private CommonService service;
     @Inject
     private SingletonStore<RegistrationExecutor> registrationExecutorFactory;
@@ -44,9 +49,9 @@ public class AsyncRegister implements AsynchronousProcess {
     /**
      * Performs the registration process for the given player.
      *
-     * @param variant the registration method
+     * @param variant    the registration method
      * @param parameters the parameters
-     * @param <P> parameters type
+     * @param <P>        parameters type
      */
     public <P extends RegistrationParameters> void register(RegistrationMethod<P> variant, P parameters) {
         if (preRegisterCheck(variant, parameters.getPlayer())) {
@@ -57,6 +62,14 @@ public class AsyncRegister implements AsynchronousProcess {
         }
     }
 
+    /**
+     * Checks if the player is able to register, in that case the {@link AuthMeAsyncPreRegisterEvent} is invoked.
+     *
+     * @param variant the registration type variant.
+     * @param player the player which is trying to register.
+     *
+     * @return true if the checks are successful and the event hasn't marked the action as denied, false otherwise.
+     */
     private boolean preRegisterCheck(RegistrationMethod<?> variant, Player player) {
         final String name = player.getName().toLowerCase();
         if (playerCache.isAuthenticated(name)) {
@@ -70,6 +83,12 @@ public class AsyncRegister implements AsynchronousProcess {
             return false;
         }
 
+        AuthMeAsyncPreRegisterEvent event = bukkitService.createAndCallEvent(
+            isAsync -> new AuthMeAsyncPreRegisterEvent(player, isAsync));
+        if (!event.canRegister()) {
+            return false;
+        }
+
         return variant == RegistrationMethod.API_REGISTRATION || isPlayerIpAllowedToRegister(player);
     }
 
@@ -77,11 +96,11 @@ public class AsyncRegister implements AsynchronousProcess {
      * Executes the registration.
      *
      * @param parameters the registration parameters
-     * @param executor the executor to perform the registration process with
-     * @param <P> registration params type
+     * @param executor   the executor to perform the registration process with
+     * @param <P>        registration params type
      */
     private <P extends RegistrationParameters>
-            void executeRegistration(P parameters, RegistrationExecutor<P> executor) {
+    void executeRegistration(P parameters, RegistrationExecutor<P> executor) {
         PlayerAuth auth = executor.buildPlayerAuth(parameters);
         if (database.saveAuth(auth)) {
             executor.executePostPersistAction(parameters);
@@ -95,14 +114,14 @@ public class AsyncRegister implements AsynchronousProcess {
      * Checks whether the registration threshold has been exceeded for the given player's IP address.
      *
      * @param player the player to check
+     *
      * @return true if registration may take place, false otherwise (IP check failed)
      */
     private boolean isPlayerIpAllowedToRegister(Player player) {
         final int maxRegPerIp = service.getProperty(RestrictionSettings.MAX_REGISTRATION_PER_IP);
         final String ip = PlayerUtils.getPlayerIp(player);
         if (maxRegPerIp > 0
-            && !"127.0.0.1".equalsIgnoreCase(ip)
-            && !"localhost".equalsIgnoreCase(ip)
+            && !InternetProtocolUtils.isLoopbackAddress(ip)
             && !service.hasPermission(player, ALLOW_MULTIPLE_ACCOUNTS)) {
             List<String> otherAccounts = database.getAllAuthsByIp(ip);
             if (otherAccounts.size() >= maxRegPerIp) {