Share the same force login mangement for less duplicate code

2016-09-22 10:56:31 +02:00
parent 91f41c55de
commit bebb04bdea
23 changed files with 475 additions and 444 deletions
@@ -1,87 +0,0 @@
-package com.github.games647.fastlogin.bungee;
-
-import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.github.games647.fastlogin.core.shared.MojangApiConnector;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ThreadFactory;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
-import net.md_5.bungee.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.YamlConfiguration;
-
-public class BungeeCore extends FastLoginCore<ProxiedPlayer> {
-
-    private static Map<String, Object> generateConfigMap(Configuration config) {
-        return config.getKeys().stream()
-                .filter(key -> config.get(key) != null)
-                .collect(Collectors.toMap(key -> key, config::get));
-    }
-
-    private final FastLoginBungee plugin;
-
-    public BungeeCore(FastLoginBungee plugin, Configuration config) {
-        super(generateConfigMap(config));
-
-        this.plugin = plugin;
-    }
-
-    @Override
-    public File getDataFolder() {
-        return plugin.getDataFolder();
-    }
-
-    @Override
-    public Logger getLogger() {
-        return plugin.getLogger();
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public ThreadFactory getThreadFactory() {
-        String pluginName = plugin.getDescription().getName();
-        return new ThreadFactoryBuilder()
-                .setNameFormat(pluginName + " Database Pool Thread #%1$d")
-                //Hikari create daemons by default
-                .setDaemon(true)
-                .setThreadFactory(new GroupedThreadFactory(plugin, pluginName))
-                .build();
-    }
-
-    @Override
-    public void loadMessages() {
-        try {
-            plugin.saveDefaultFile("messages.yml");
-            ConfigurationProvider configProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
-
-            Configuration defaults = configProvider.load(getClass().getResourceAsStream("/messages.yml"));
-
-            File messageFile = new File(getDataFolder(), "messages.yml");
-            Configuration messageConfig = configProvider.load(messageFile, defaults);
-
-            messageConfig.getKeys().forEach(key -> {
-                String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
-                if (!message.isEmpty()) {
-                    localeMessages.put(key, message);
-                }
-            });
-        } catch (IOException ex) {
-            getLogger().log(Level.SEVERE, "Failed to load messages", ex);
-        }
-    }
-
-    @Override
-    public MojangApiConnector makeApiConnector(Logger logger, List<String> addresses, int requests) {
-        return new MojangApiBungee(logger, addresses, requests);
-    }
-}
@@ -3,17 +3,31 @@ package com.github.games647.fastlogin.bungee;
 import com.github.games647.fastlogin.bungee.hooks.BungeeAuthHook;
 import com.github.games647.fastlogin.bungee.listener.PlayerConnectionListener;
 import com.github.games647.fastlogin.bungee.listener.PluginMessageListener;
+import com.github.games647.fastlogin.core.shared.FastLoginCore;
+import com.github.games647.fastlogin.core.shared.MojangApiConnector;
+import com.github.games647.fastlogin.core.shared.PlatformPlugin;
 import com.google.common.collect.Maps;

 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Reader;
 import java.nio.file.Files;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ThreadFactory;
 import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;

+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.PendingConnection;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
@@ -21,24 +35,23 @@ import net.md_5.bungee.config.YamlConfiguration;
 /**
 * BungeeCord version of FastLogin. This plugin keeps track on online mode connections.
 */
-public class FastLoginBungee extends Plugin {
+public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSender> {

    private final ConcurrentMap<PendingConnection, BungeeLoginSession> session = Maps.newConcurrentMap();

-    private BungeeCore core;
+    private FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core;
    private Configuration config;

    @Override
    public void onEnable() {
-        saveDefaultFile("config.yml");
-
        try {
            File configFile = new File(getDataFolder(), "config.yml");
            ConfigurationProvider provider = ConfigurationProvider.getProvider(YamlConfiguration.class);
            Configuration defaults = provider.load(getResourceAsStream("config.yml"));
            config = provider.load(configFile, defaults);

-            core = new BungeeCore(this, config);
+            core = new FastLoginCore<>(this);
+            core.load();
            if (!core.setupDatabase()) {
                return;
            }
@@ -47,9 +60,6 @@ public class FastLoginBungee extends Plugin {
            return;
        }

-        core.setApiConnector();
-        core.loadMessages();
-
        //events
        getProxy().getPluginManager().registerListener(this, new PlayerConnectionListener(this));
        getProxy().getPluginManager().registerListener(this, new PluginMessageListener(this));
@@ -92,7 +102,7 @@ public class FastLoginBungee extends Plugin {
        }
    }

-    public BungeeCore getCore() {
+    public FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> getCore() {
        return core;
    }

@@ -111,4 +121,39 @@ public class FastLoginBungee extends Plugin {
            getLogger().info("Hooked into BungeeAuth");
        }
    }
+
+    @Override
+    public String getName() {
+        return getDescription().getName();
+    }
+
+    @Override
+    public Map<String, Object> loadYamlFile(Reader reader) {
+        ConfigurationProvider configProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
+        Configuration config = configProvider.load(reader);
+        return config.getKeys().stream()
+                .filter(key -> config.get(key) != null)
+                .collect(Collectors.toMap(key -> key, config::get));
+    }
+
+    @Override
+    public void sendMessage(CommandSender receiver, String message) {
+        receiver.sendMessage(TextComponent.fromLegacyText(message));
+    }
+
+    @Override
+    public String translateColorCodes(char colorChar, String rawMessage) {
+        return ChatColor.translateAlternateColorCodes(colorChar, rawMessage);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public ThreadFactory getThreadFactory() {
+        return new GroupedThreadFactory(this, getName());
+    }
+
+    @Override
+    public MojangApiConnector makeApiConnector(Logger logger, List<String> addresses, int requests) {
+        return new MojangApiBungee(logger, addresses, requests);
+    }
 }
@@ -2,16 +2,18 @@ package com.github.games647.fastlogin.bungee;

 import com.github.games647.fastlogin.core.AuthStorage;
 import com.github.games647.fastlogin.core.importer.ImportPlugin;
+import com.github.games647.fastlogin.core.shared.FastLoginCore;

 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;

 public class ImportCommand extends Command {

-    private final BungeeCore core;
+    private final FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core;

    public ImportCommand(FastLoginBungee plugin) {
        super("import-db", plugin.getDescription().getName().toLowerCase() + ".import");
@@ -14,6 +14,7 @@ import java.util.logging.Level;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.connection.Server;
 import net.md_5.bungee.api.event.LoginEvent;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.event.PreLoginEvent;
@@ -62,9 +63,6 @@ public class PlayerConnectionListener implements Listener {
        PendingConnection connection = loginEvent.getConnection();
        String username = connection.getName();
        if (connection.isOnlineMode()) {
-            String ip = connection.getAddress().getAddress().getHostAddress();
-            plugin.getCore().getPendingLogins().remove(ip + username);
-
            LoginSession session = plugin.getSession().get(connection);
            session.setUuid(connection.getUniqueId());

@@ -100,7 +98,9 @@ public class PlayerConnectionListener implements Listener {
    @EventHandler
    public void onServerConnected(ServerConnectedEvent serverConnectedEvent) {
        ProxiedPlayer player = serverConnectedEvent.getPlayer();
-        ForceLoginTask loginTask = new ForceLoginTask(plugin, player, serverConnectedEvent.getServer());
+        Server server = serverConnectedEvent.getServer();
+
+        ForceLoginTask loginTask = new ForceLoginTask(plugin.getCore(), player, server);
        ProxyServer.getInstance().getScheduler().runAsync(plugin, loginTask);
    }

@@ -6,11 +6,13 @@ import com.github.games647.fastlogin.bungee.FastLoginBungee;
 import com.github.games647.fastlogin.core.PlayerProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;

+import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.AsyncEvent;

-public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, BungeeLoginSource> implements Runnable {
+public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, CommandSender, BungeeLoginSource>
+        implements Runnable {

    private final FastLoginBungee plugin;
    private final AsyncEvent<?> preLoginEvent;
@@ -1,19 +1,22 @@
 package com.github.games647.fastlogin.bungee.tasks;

-import com.github.games647.fastlogin.bungee.BungeeCore;
+import com.github.games647.fastlogin.bungee.FastLoginBungee;
 import com.github.games647.fastlogin.core.PlayerProfile;
+import com.github.games647.fastlogin.core.shared.FastLoginCore;
+import net.md_5.bungee.api.CommandSender;

 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;

 public class AsyncToggleMessage implements Runnable {

-    private final BungeeCore core;
+    private final FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core;
    private final ProxiedPlayer fromPlayer;
    private final String targetPlayer;
    private final boolean toPremium;

-    public AsyncToggleMessage(BungeeCore core, ProxiedPlayer fromPlayer, String targetPlayer, boolean toPremium) {
+    public AsyncToggleMessage(FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core
+            , ProxiedPlayer fromPlayer, String targetPlayer, boolean toPremium) {
        this.core = core;
        this.fromPlayer = fromPlayer;
        this.targetPlayer = targetPlayer;
@@ -2,119 +2,66 @@ package com.github.games647.fastlogin.bungee.tasks;

 import com.github.games647.fastlogin.bungee.BungeeLoginSession;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.core.PlayerProfile;
-import com.github.games647.fastlogin.core.hooks.AuthPlugin;
+import com.github.games647.fastlogin.core.shared.FastLoginCore;
+import com.github.games647.fastlogin.core.shared.ForceLoginMangement;
+import com.github.games647.fastlogin.core.shared.LoginSession;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;

 import java.util.UUID;
-import java.util.logging.Level;
+import net.md_5.bungee.api.CommandSender;

-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.connection.Server;

-public class ForceLoginTask implements Runnable {
+public class ForceLoginTask extends ForceLoginMangement<ProxiedPlayer, CommandSender, BungeeLoginSession, FastLoginBungee> {

-    private final FastLoginBungee plugin;
-    private final ProxiedPlayer player;
    private final Server server;

-    public ForceLoginTask(FastLoginBungee plugin, ProxiedPlayer player, Server server) {
-        this.plugin = plugin;
-        this.player = player;
+    public ForceLoginTask(FastLoginCore<ProxiedPlayer, CommandSender, FastLoginBungee> core
+            , ProxiedPlayer player, Server server) {
+        super(core, player);
+
        this.server = server;
    }

    @Override
    public void run() {
-        try {
-            PendingConnection pendingConnection = player.getPendingConnection();
-            BungeeLoginSession session = plugin.getSession().get(pendingConnection);
+        PendingConnection pendingConnection = player.getPendingConnection();
+        session = core.getPlugin().getSession().get(pendingConnection);

-            if (session == null || !player.isConnected()) {
-                plugin.getLogger().log(Level.FINE, "Invalid session player {0} propaly left the server", player);
-                return;
-            }
+        super.run();

-            PlayerProfile playerProfile = session.getProfile();
-
-            //force login only on success
-            if (pendingConnection.isOnlineMode()) {
-                boolean autoRegister = session.needsRegistration();
-
-                //2fa authentication - no need to send bukkit force login notification and so we also don't need
-                // to wait for a response -> save immediatly
-                if (!plugin.getConfig().getBoolean("autoLogin")) {
-                    playerProfile.setPremium(true);
-                    plugin.getCore().getStorage().save(playerProfile);
-                    session.setAlreadySaved(true);
-                }
-
-                AuthPlugin<ProxiedPlayer> authPlugin = plugin.getCore().getAuthPluginHook();
-                if (authPlugin == null) {
-                    //save will happen on success message from bukkit
-                    sendBukkitLoginNotification(autoRegister);
-                } else if (session.needsRegistration()) {
-                    forceRegister(session, authPlugin);
-                } else if (authPlugin.forceLogin(player)) {
-                    forceLogin(session, authPlugin);
-                }
-            } else {
-                //cracked player
-                if (!session.isAlreadySaved()) {
-                    playerProfile.setPremium(false);
-                    plugin.getCore().getStorage().save(playerProfile);
-                    session.setAlreadySaved(true);
-                }
-            }
-        } catch (Exception ex) {
-            plugin.getLogger().log(Level.INFO, "ERROR ON FORCE LOGIN", ex);
+        if (!isOnlineMode()) {
+            session.setAlreadySaved(true);
        }
    }

-    private void forceRegister(BungeeLoginSession session, AuthPlugin<ProxiedPlayer> authPlugin) {
+    @Override
+    public boolean forceLogin(ProxiedPlayer player) {
        if (session.isAlreadyLogged()) {
-            sendBukkitLoginNotification(true);
-            return;
+            return true;
        }

        session.setAlreadyLogged(true);
-
-        String password = plugin.getCore().getPasswordGenerator().getRandomPassword(player);
-        if (authPlugin.forceRegister(player, password)) {
-            //save will happen on success message from bukkit
-            sendBukkitLoginNotification(true);
-            String message = plugin.getCore().getMessage("auto-register");
-            if (message != null) {
-                message = message.replace("%password", password);
-                player.sendMessage(TextComponent.fromLegacyText(message));
-            }
-        }
+        return super.forceLogin(player);
    }

-    private void forceLogin(BungeeLoginSession session, AuthPlugin<ProxiedPlayer> authPlugin) {
+    @Override
+    public boolean forceRegister(ProxiedPlayer player) {
        if (session.isAlreadyLogged()) {
-            sendBukkitLoginNotification(false);
-            return;
+            return true;
        }

-        session.setAlreadyLogged(true);
-        if (authPlugin.forceLogin(player)) {
-            //save will happen on success message from bukkit
-            sendBukkitLoginNotification(false);
-            String message = plugin.getCore().getMessage("auto-login");
-            if (message != null) {
-                player.sendMessage(TextComponent.fromLegacyText(message));
-            }
-        }
+        return super.forceRegister(player);
    }

-    private void sendBukkitLoginNotification(boolean autoRegister) {
+    @Override
+    public void onForceActionSuccess(LoginSession session) {
        ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
        //subchannel name
-        if (autoRegister) {
+        if (session.needsRegistration()) {
            dataOutput.writeUTF("AUTO_REGISTER");
        } else {
            dataOutput.writeUTF("AUTO_LOGIN");
@@ -124,12 +71,27 @@ public class ForceLoginTask implements Runnable {
        dataOutput.writeUTF(player.getName());

        //proxy identifier to check if it's a acceptable proxy
-        UUID proxyId = UUID.fromString(plugin.getProxy().getConfig().getUuid());
+        UUID proxyId = UUID.fromString(core.getPlugin().getProxy().getConfig().getUuid());
        dataOutput.writeLong(proxyId.getMostSignificantBits());
        dataOutput.writeLong(proxyId.getLeastSignificantBits());

        if (server != null) {
-            server.sendData(plugin.getDescription().getName(), dataOutput.toByteArray());
+            server.sendData(core.getPlugin().getName(), dataOutput.toByteArray());
        }
    }
+
+    @Override
+    public String getName(ProxiedPlayer player) {
+        return player.getName();
+    }
+
+    @Override
+    public boolean isOnline(ProxiedPlayer player) {
+        return !player.isConnected();
+    }
+
+    @Override
+    public boolean isOnlineMode() {
+        return player.getPendingConnection().isOnlineMode();
+    }
 }