Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into limbo

# Conflicts:
#	src/main/java/fr/xephi/authme/command/executable/authme/debug/DebugCommand.java

src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java

@@ -11,10 +11,10 @@ import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
+import fr.xephi.authme.util.Utils;
 import org.bukkit.command.CommandSender;
 
 import javax.inject.Inject;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -44,8 +44,7 @@ public class ReloadCommand implements ExecutableCommand {
             ConsoleLogger.setLoggingOptions(settings);
             // We do not change database type for consistency issues, but we'll output a note in the logs
             if (!settings.getProperty(DatabaseSettings.BACKEND).equals(dataSource.getType())) {
-                ConsoleLogger.info("Note: cannot change database type during /authme reload");
-                sender.sendMessage("Note: cannot change database type during /authme reload");
+                Utils.logAndSendMessage(sender, "Note: cannot change database type during /authme reload");
             }
             performReloadOnServices();
             commonService.send(sender, MessageKey.CONFIG_RELOAD_SUCCESS);
@@ -57,14 +56,10 @@ public class ReloadCommand implements ExecutableCommand {
     }
 
     private void performReloadOnServices() {
-        Collection<Reloadable> reloadables = injector.retrieveAllOfType(Reloadable.class);
-        for (Reloadable reloadable : reloadables) {
-            reloadable.reload();
-        }
+        injector.retrieveAllOfType(Reloadable.class)
+            .forEach(r -> r.reload());
 
-        Collection<SettingsDependent> settingsDependents = injector.retrieveAllOfType(SettingsDependent.class);
-        for (SettingsDependent dependent : settingsDependents) {
-            dependent.reload(settings);
-        }
+        injector.retrieveAllOfType(SettingsDependent.class)
+            .forEach(s -> s.reload(settings));
     }
 }

src/main/java/fr/xephi/authme/command/executable/authme/debug/CountryLookup.java

@@ -0,0 +1,77 @@
+package fr.xephi.authme.command.executable.authme.debug;
+
+import fr.xephi.authme.data.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.service.GeoIpService;
+import fr.xephi.authme.service.ValidationService;
+import fr.xephi.authme.settings.properties.ProtectionSettings;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * Shows the GeoIP information as returned by the geoIpService.
+ */
+class CountryLookup implements DebugSection {
+
+    private static final Pattern IS_IP_ADDR = Pattern.compile("(\\d{1,3}\\.){3}\\d{1,3}");
+
+    @Inject
+    private GeoIpService geoIpService;
+
+    @Inject
+    private DataSource dataSource;
+
+    @Inject
+    private ValidationService validationService;
+
+    @Override
+    public String getName() {
+        return "cty";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Check country protection / country data";
+    }
+
+    @Override
+    public void execute(CommandSender sender, List<String> arguments) {
+        if (arguments.isEmpty()) {
+            sender.sendMessage("Check player: /authme debug cty Bobby");
+            sender.sendMessage("Check IP address: /authme debug cty 127.123.45.67");
+            return;
+        }
+
+        String argument = arguments.get(0);
+        if (IS_IP_ADDR.matcher(argument).matches()) {
+            outputInfoForIpAddr(sender, argument);
+        } else {
+            outputInfoForPlayer(sender, argument);
+        }
+    }
+
+    private void outputInfoForIpAddr(CommandSender sender, String ipAddr) {
+        sender.sendMessage("IP '" + ipAddr + "' maps to country '" + geoIpService.getCountryCode(ipAddr)
+            + "' (" + geoIpService.getCountryName(ipAddr) + ")");
+        if (validationService.isCountryAdmitted(ipAddr)) {
+            sender.sendMessage(ChatColor.DARK_GREEN + "This IP address' country is not blocked");
+        } else {
+            sender.sendMessage(ChatColor.DARK_RED + "This IP address' country is blocked from the server");
+        }
+        sender.sendMessage("Note: if " + ProtectionSettings.ENABLE_PROTECTION + " is false no country is blocked");
+    }
+
+    private void outputInfoForPlayer(CommandSender sender, String name) {
+        PlayerAuth auth = dataSource.getAuth(name);
+        if (auth == null) {
+            sender.sendMessage("No player with name '" + name + "'");
+        } else {
+            sender.sendMessage("Player '" + name + "' has IP address " + auth.getIp());
+            outputInfoForIpAddr(sender, auth.getIp());
+        }
+    }
+}

src/main/java/fr/xephi/authme/command/executable/authme/debug/DebugCommand.java

@@ -19,8 +19,9 @@ public class DebugCommand implements ExecutableCommand {
     @Inject
     private Factory<DebugSection> debugSectionFactory;
 
-    private Set<Class<? extends DebugSection>> sectionClasses =
-        ImmutableSet.of(PermissionGroups.class, TestEmailSender.class, PlayerAuthViewer.class, LimboPlayerViewer.class);
+    private Set<Class<? extends DebugSection>> sectionClasses = ImmutableSet.of(
+        PermissionGroups.class, TestEmailSender.class, PlayerAuthViewer.class, LimboPlayerViewer.class,
+        CountryLookup.class);
 
     private Map<String, DebugSection> sections;
 

src/main/java/fr/xephi/authme/datasource/MySQL.java

@@ -45,7 +45,10 @@ public class MySQL implements DataSource {
     private HikariDataSource ds;
 
     private String phpBbPrefix;
+    private String IPBPrefix;
     private int phpBbGroup;
+    private int IPBGroup;
+    private int XFGroup;
     private String wordpressPrefix;
 
     public MySQL(Settings settings) throws ClassNotFoundException, SQLException {
@@ -96,6 +99,9 @@ public class MySQL implements DataSource {
         this.hashAlgorithm = settings.getProperty(SecuritySettings.PASSWORD_HASH);
         this.phpBbPrefix = settings.getProperty(HooksSettings.PHPBB_TABLE_PREFIX);
         this.phpBbGroup = settings.getProperty(HooksSettings.PHPBB_ACTIVATED_GROUP_ID);
+        this.IPBPrefix = settings.getProperty(HooksSettings.IPB_TABLE_PREFIX);
+        this.IPBGroup = settings.getProperty(HooksSettings.IPB_ACTIVATED_GROUP_ID);
+        this.XFGroup = settings.getProperty(HooksSettings.XF_ACTIVATED_GROUP_ID);
         this.wordpressPrefix = settings.getProperty(HooksSettings.WORDPRESS_TABLE_PREFIX);
         this.poolSize = settings.getProperty(DatabaseSettings.MYSQL_POOL_SIZE);
         if (poolSize == -1) {
@@ -334,8 +340,39 @@ public class MySQL implements DataSource {
                     pst.close();
                 }
             }
-
-            if (hashAlgorithm == HashAlgorithm.PHPBB) {
+            if (hashAlgorithm == HashAlgorithm.IPB4){
+                sql = "SELECT " + col.ID + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
+                pst = con.prepareStatement(sql);
+                pst.setString(1, auth.getNickname());
+                rs = pst.executeQuery();
+                if (rs.next()){
+                    // Update player group in core_members
+                    sql = "UPDATE " + IPBPrefix + tableName + " SET "+ tableName + ".member_group_id=? WHERE " + col.NAME + "=?;";
+                    pst2 = con.prepareStatement(sql);
+                    pst2.setInt(1, IPBGroup);
+                    pst2.setString(2, auth.getNickname());
+                    pst2.executeUpdate();
+                    pst2.close();
+                    // Get current time without ms
+                    long time = System.currentTimeMillis() / 1000;
+                    // update joined date
+                    sql = "UPDATE " + IPBPrefix + tableName + " SET "+ tableName + ".joined=? WHERE " + col.NAME + "=?;";
+                    pst2 = con.prepareStatement(sql);
+                    pst2.setLong(1, time);
+                    pst2.setString(2, auth.getNickname());
+                    pst2.executeUpdate();
+                    pst2.close();
+                    // Update last_visit
+                    sql = "UPDATE " + IPBPrefix + tableName + " SET " + tableName + ".last_visit=? WHERE " + col.NAME + "=?;";
+                    pst2 = con.prepareStatement(sql);
+                    pst2.setLong(1, time);
+                    pst2.setString(2, auth.getNickname());
+                    pst2.executeUpdate();
+                    pst2.close();
+                }
+                rs.close();
+                pst.close();
+            } else if  (hashAlgorithm == HashAlgorithm.PHPBB) {
                 sql = "SELECT " + col.ID + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
                 pst = con.prepareStatement(sql);
                 pst.setString(1, auth.getNickname());
@@ -477,8 +514,9 @@ public class MySQL implements DataSource {
                 pst = con.prepareStatement("SELECT " + col.ID + " FROM " + tableName + " WHERE " + col.NAME + "=?;");
                 pst.setString(1, auth.getNickname());
                 rs = pst.executeQuery();
-                if (rs.next()) {
+                if (rs.next()) {                    
                     int id = rs.getInt(col.ID);
+                    // Insert player password, salt in xf_user_authenticate
                     sql = "INSERT INTO xf_user_authenticate (user_id, scheme_class, data) VALUES (?,?,?)";
                     pst2 = con.prepareStatement(sql);
                     pst2.setInt(1, id);
@@ -490,6 +528,39 @@ public class MySQL implements DataSource {
                     pst2.setBlob(3, blob);
                     pst2.executeUpdate();
                     pst2.close();
+                    // Update player group in xf_users
+                    sql = "UPDATE " + tableName + " SET "+ tableName + ".user_group_id=? WHERE " + col.NAME + "=?;";
+                    pst2 = con.prepareStatement(sql);
+                    pst2.setInt(1, XFGroup);
+                    pst2.setString(2, auth.getNickname());
+                    pst2.executeUpdate();
+                    pst2.close();
+                    // Update player permission combination in xf_users
+                    sql = "UPDATE " + tableName + " SET "+ tableName + ".permission_combination_id=? WHERE " + col.NAME + "=?;";
+                    pst2 = con.prepareStatement(sql);
+                    pst2.setInt(1, XFGroup);
+                    pst2.setString(2, auth.getNickname());
+                    pst2.executeUpdate();
+                    pst2.close();
+                    // Insert player privacy combination in xf_user_privacy
+                    sql = "INSERT INTO xf_user_privacy (user_id, allow_view_profile, allow_post_profile, allow_send_personal_conversation, allow_view_identities, allow_receive_news_feed) VALUES (?,?,?,?,?,?)";
+                    pst2 = con.prepareStatement(sql);
+                    pst2.setInt(1, id);
+                    pst2.setString(2, "everyone");
+                    pst2.setString(3, "members");
+                    pst2.setString(4, "members");
+                    pst2.setString(5, "everyone");
+                    pst2.setString(6, "everyone");
+                    pst2.executeUpdate();
+                    pst2.close();
+                    // Insert player group relation in xf_user_group_relation
+                    sql = "INSERT INTO xf_user_group_relation (user_id, user_group_id, is_primary) VALUES (?,?,?)";
+                    pst2 = con.prepareStatement(sql);
+                    pst2.setInt(1, id);
+                    pst2.setInt(2, XFGroup);
+                    pst2.setString(3, "1");
+                    pst2.executeUpdate();
+                    pst2.close();
                 }
                 rs.close();
                 pst.close();

src/main/java/fr/xephi/authme/mail/SendMailSSL.java

@@ -1,8 +1,10 @@
 package fr.xephi.authme.mail;
 
 import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.output.LogLevel;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.EmailSettings;
+import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.util.StringUtils;
 import org.apache.commons.mail.EmailConstants;
 import org.apache.commons.mail.EmailException;
@@ -56,6 +58,9 @@ public class SendMailSSL {
         email.setFrom(senderMail, senderName);
         email.setSubject(settings.getProperty(EmailSettings.RECOVERY_MAIL_SUBJECT));
         email.setAuthentication(settings.getProperty(EmailSettings.MAIL_ACCOUNT), mailPassword);
+        if (settings.getProperty(PluginSettings.LOG_LEVEL).includes(LogLevel.DEBUG)) {
+            email.setDebug(true);
+        }
 
         setPropertiesForPort(email, port);
         return email;

src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java

@@ -11,7 +11,6 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.AuthMeAsyncPreLoginEvent;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.permission.AdminPermission;
-import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerPermission;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.process.AsynchronousProcess;
@@ -44,9 +43,6 @@ public class AsynchronousLogin implements AsynchronousProcess {
     @Inject
     private CommonService service;
 
-    @Inject
-    private PermissionsManager permissionsManager;
-
     @Inject
     private PlayerCache playerCache;
 
@@ -290,10 +286,10 @@ public class AsynchronousLogin implements AsynchronousProcess {
 
         for (Player onlinePlayer : bukkitService.getOnlinePlayers()) {
             if (onlinePlayer.getName().equalsIgnoreCase(player.getName())
-                && permissionsManager.hasPermission(onlinePlayer, PlayerPermission.SEE_OWN_ACCOUNTS)) {
+                && service.hasPermission(onlinePlayer, PlayerPermission.SEE_OWN_ACCOUNTS)) {
                 service.send(onlinePlayer, MessageKey.ACCOUNTS_OWNED_SELF, Integer.toString(auths.size()));
                 onlinePlayer.sendMessage(message);
-            } else if (permissionsManager.hasPermission(onlinePlayer, AdminPermission.SEE_OTHER_ACCOUNTS)) {
+            } else if (service.hasPermission(onlinePlayer, AdminPermission.SEE_OTHER_ACCOUNTS)) {
                 service.send(onlinePlayer, MessageKey.ACCOUNTS_OWNED_OTHER,
                     player.getName(), Integer.toString(auths.size()));
                 onlinePlayer.sendMessage(message);
@@ -313,7 +309,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
     boolean hasReachedMaxLoggedInPlayersForIp(Player player, String ip) {
         // Do not perform the check if player has multiple accounts permission or if IP is localhost
         if (service.getProperty(RestrictionSettings.MAX_LOGIN_PER_IP) <= 0
-            || permissionsManager.hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)
+            || service.hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)
             || "127.0.0.1".equalsIgnoreCase(ip)
             || "localhost".equalsIgnoreCase(ip)) {
             return false;

src/main/java/fr/xephi/authme/service/CommonService.java

@@ -65,16 +65,6 @@ public class CommonService {
         messages.send(sender, key, replacements);
     }
 
-    /**
-     * Retrieves a message.
-     *
-     * @param key the key of the message
-     * @return the message, split by line
-     */
-    public String[] retrieveMessage(MessageKey key) {
-        return messages.retrieve(key);
-    }
-
     /**
      * Retrieves a message in one piece.
      *
@@ -102,6 +92,7 @@ public class CommonService {
      * @param player the player to process
      * @param group the group to add the player to
      */
+    // TODO ljacqu 20170304: Move this out of CommonService
     public void setGroup(Player player, AuthGroupType group) {
         authGroupHandler.setGroup(player, group);
     }

src/main/java/fr/xephi/authme/service/ValidationService.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.service;
 
 import ch.jalu.configme.properties.Property;
+import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.message.MessageKey;
@@ -115,9 +116,10 @@ public class ValidationService implements Reloadable {
         }
 
         String countryCode = geoIpService.getCountryCode(hostAddress);
-        return validateWhitelistAndBlacklist(countryCode,
-            ProtectionSettings.COUNTRIES_WHITELIST,
-            ProtectionSettings.COUNTRIES_BLACKLIST);
+        boolean isCountryAllowed = validateWhitelistAndBlacklist(countryCode,
+            ProtectionSettings.COUNTRIES_WHITELIST, ProtectionSettings.COUNTRIES_BLACKLIST);
+        ConsoleLogger.debug("Country code `{0}` for `{1}` is allowed: {2}", countryCode, hostAddress, isCountryAllowed);
+        return isCountryAllowed;
     }
 
     /**
@@ -194,6 +196,7 @@ public class ValidationService implements Reloadable {
         public MessageKey getMessageKey() {
             return messageKey;
         }
+
         public String[] getArgs() {
             return args;
         }

src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java

@@ -74,7 +74,7 @@ public class CommandManager implements Reloadable {
 
     private void executeCommands(Player player, List<Command> commands) {
         for (Command command : commands) {
-            final String execution = command.getCommand().replace("%p", player.getName());
+            final String execution = command.getCommand();
             if (Executor.CONSOLE.equals(command.getExecutor())) {
                 bukkitService.dispatchConsoleCommand(execution);
             } else {

src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java

@@ -54,6 +54,18 @@ public final class HooksSettings implements SettingsHolder {
     public static final Property<Integer> PHPBB_ACTIVATED_GROUP_ID =
         newProperty("ExternalBoardOptions.phpbbActivatedGroupId", 2);
 
+    @Comment("IP Board table prefix defined during the IP Board installation process")
+    public static final Property<String> IPB_TABLE_PREFIX =
+        newProperty("ExternalBoardOptions.IPBTablePrefix", "ipb_");
+    
+    @Comment("IP Board default group ID; 3 is the default registered group defined by IP Board")
+    public static final Property<Integer> IPB_ACTIVATED_GROUP_ID =
+        newProperty("ExternalBoardOptions.IPBActivatedGroupId", 3);
+    
+    @Comment("XenForo default group ID; 2 is the default registered group defined by Xenforo")
+    public static final Property<Integer> XF_ACTIVATED_GROUP_ID =
+        newProperty("ExternalBoardOptions.XFActivatedGroupId", 2);
+
     @Comment("Wordpress prefix defined during WordPress installation")
     public static final Property<String> WORDPRESS_TABLE_PREFIX =
         newProperty("ExternalBoardOptions.wordpressTablePrefix", "wp_");

src/main/java/fr/xephi/authme/task/purge/PurgeService.java

@@ -9,14 +9,13 @@ import fr.xephi.authme.settings.properties.PurgeSettings;
 import fr.xephi.authme.util.Utils;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
 
 import javax.inject.Inject;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Set;
 
-// TODO: move into services. -sgdc3
+import static fr.xephi.authme.util.Utils.logAndSendMessage;
 
 /**
  * Initiates purge tasks.
@@ -119,12 +118,4 @@ public class PurgeService {
     void executePurge(Collection<OfflinePlayer> players, Collection<String> names) {
         purgeExecutor.executePurge(players, names);
     }
-
-    private static void logAndSendMessage(CommandSender sender, String message) {
-        ConsoleLogger.info(message);
-        // Make sure sender is not console user, which will see the message from ConsoleLogger already
-        if (sender != null && !(sender instanceof ConsoleCommandSender)) {
-            sender.sendMessage(message);
-        }
-    }
 }

src/main/java/fr/xephi/authme/util/Utils.java

@@ -1,6 +1,8 @@
 package fr.xephi.authme.util;
 
 import fr.xephi.authme.ConsoleLogger;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 
 import java.util.Collection;
 import java.util.regex.Pattern;
@@ -51,6 +53,22 @@ public final class Utils {
         }
     }
 
+    /**
+     * Sends a message to the given sender (null safe), and logs the message to the console.
+     * This method is aware that the command sender might be the console sender and avoids
+     * displaying the message twice in this case.
+     *
+     * @param sender the sender to inform
+     * @param message the message to log and send
+     */
+    public static void logAndSendMessage(CommandSender sender, String message) {
+        ConsoleLogger.info(message);
+        // Make sure sender is not console user, which will see the message from ConsoleLogger already
+        if (sender != null && !(sender instanceof ConsoleCommandSender)) {
+            sender.sendMessage(message);
+        }
+    }
+
     /**
      * Null-safe way to check whether a collection is empty or not.
      *