From 260b93a565d33569d34aaa4f9612aefbf9933a0c Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Tue, 24 Jul 2018 10:15:16 +0200
Subject: [PATCH] Channel names should be lowercase according to the spec

Related #217, #218
---
 .../fastlogin/bukkit/FastLoginBukkit.java     | 14 +++++++----
 .../bukkit/listener/BungeeListener.java       |  9 -------
 .../fastlogin/bungee/FastLoginBungee.java     | 15 +++++++-----
 ...stener.java => PluginMessageListener.java} | 11 +++++----
 .../core/message/ChangePremiumMessage.java    |  2 +-
 .../core/message/LoginActionMessage.java      |  2 +-
 .../fastlogin/core/message/NamespaceKey.java  | 24 +++++++++++++++++++
 .../core/message/SuccessMessage.java          |  2 +-
 8 files changed, 51 insertions(+), 28 deletions(-)
 rename bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/{MessageListener.java => PluginMessageListener.java} (91%)
 create mode 100644 core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
index 25c9a42d..16cea7b4 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -12,6 +12,7 @@ import com.github.games647.fastlogin.core.CommonUtil;
 import com.github.games647.fastlogin.core.PremiumStatus;
 import com.github.games647.fastlogin.core.message.ChannelMessage;
 import com.github.games647.fastlogin.core.message.LoginActionMessage;
+import com.github.games647.fastlogin.core.message.NamespaceKey;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.PlatformPlugin;
 import com.google.common.io.ByteArrayDataOutput;
@@ -71,12 +72,14 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
             setServerStarted();
 
             // check for incoming messages from the bungeecord version of this plugin
-            String forceChannel = getName() + ':' + LoginActionMessage.FORCE_CHANNEL;
+            String forceChannel = new NamespaceKey(getName(), LoginActionMessage.FORCE_CHANNEL).getCombinedName();
             getServer().getMessenger().registerIncomingPluginChannel(this, forceChannel, new BungeeListener(this));
 
             // outgoing
-            getServer().getMessenger().registerOutgoingPluginChannel(this, getName() + ':' + SUCCESS_CHANNEL);
-            getServer().getMessenger().registerOutgoingPluginChannel(this, getName() + ':' + CHANGE_CHANNEL);
+            String successChannel = new NamespaceKey(getName(), SUCCESS_CHANNEL).getCombinedName();
+            String changeChannel = new NamespaceKey(getName(), CHANGE_CHANNEL).getCombinedName();
+            getServer().getMessenger().registerOutgoingPluginChannel(this, successChannel);
+            getServer().getMessenger().registerOutgoingPluginChannel(this, changeChannel);
         } else {
             if (!core.setupDatabase()) {
                 setEnabled(false);
@@ -176,8 +179,9 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
         if (player != null) {
             ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
             message.writeTo(dataOutput);
-            String channel = this.getName() + ':' + message.getChannelName();
-            player.sendPluginMessage(this, channel, dataOutput.toByteArray());
+
+            NamespaceKey channel = new NamespaceKey(getName(), message.getChannelName());
+            player.sendPluginMessage(this, channel.getCombinedName(), dataOutput.toByteArray());
         }
     }
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
index 8360974e..de477b35 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
@@ -46,16 +46,7 @@ public class BungeeListener implements PluginMessageListener {
 
     @Override
     public void onPluginMessageReceived(String channel, Player player, byte[] message) {
-        if (!channel.equals(plugin.getName())) {
-            return;
-        }
-
         ByteArrayDataInput dataInput = ByteStreams.newDataInput(message);
-        String subChannel = dataInput.readUTF();
-        if (!"LoginAction".equals(subChannel)) {
-            plugin.getLog().info("Unknown sub channel {}", subChannel);
-            return;
-        }
 
         LoginActionMessage loginMessage = new LoginActionMessage();
         loginMessage.readFrom(dataInput);
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
index e4cbf02a..d48b73a6 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
@@ -2,10 +2,11 @@ package com.github.games647.fastlogin.bungee;
 
 import com.github.games647.fastlogin.bungee.hook.BungeeAuthHook;
 import com.github.games647.fastlogin.bungee.listener.ConnectListener;
-import com.github.games647.fastlogin.bungee.listener.MessageListener;
+import com.github.games647.fastlogin.bungee.listener.PluginMessageListener;
 import com.github.games647.fastlogin.core.CommonUtil;
 import com.github.games647.fastlogin.core.message.ChangePremiumMessage;
 import com.github.games647.fastlogin.core.message.ChannelMessage;
+import com.github.games647.fastlogin.core.message.NamespaceKey;
 import com.github.games647.fastlogin.core.message.SuccessMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.PlatformPlugin;
@@ -50,11 +51,11 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
 
         //events
         getProxy().getPluginManager().registerListener(this, new ConnectListener(this));
-        getProxy().getPluginManager().registerListener(this, new MessageListener(this));
+        getProxy().getPluginManager().registerListener(this, new PluginMessageListener(this));
 
         //this is required to listen to incoming messages from the server
-        getProxy().registerChannel(getName() + ':' + ChangePremiumMessage.CHANGE_CHANNEL);
-        getProxy().registerChannel(getName() + ':' + SuccessMessage.SUCCESS_CHANNEL);
+        getProxy().registerChannel(new NamespaceKey(getName(), ChangePremiumMessage.CHANGE_CHANNEL).getCombinedName());
+        getProxy().registerChannel(new NamespaceKey(getName(), SuccessMessage.SUCCESS_CHANNEL).getCombinedName());
 
         registerHook();
     }
@@ -86,7 +87,9 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
         if (server != null) {
             ByteArrayDataOutput dataOutput = ByteStreams.newDataOutput();
             message.writeTo(dataOutput);
-            server.sendData(core.getPlugin().getName() + ':' + message.getChannelName(), dataOutput.toByteArray());
+
+            NamespaceKey channel = new NamespaceKey(getName(), message.getChannelName());
+            server.sendData(channel.getCombinedName(), dataOutput.toByteArray());
         }
     }
 
@@ -114,7 +117,7 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
     @SuppressWarnings("deprecation")
     public ThreadFactory getThreadFactory() {
         return new ThreadFactoryBuilder()
-                .setNameFormat(core.getPlugin().getName() + " Database Pool Thread #%1$d")
+                .setNameFormat(getName() + " Database Pool Thread #%1$d")
                 //Hikari create daemons by default
                 .setDaemon(true)
                 .setThreadFactory(new GroupedThreadFactory(this, getName()))
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java
similarity index 91%
rename from bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java
rename to bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java
index 51532850..0c23e4b2 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java
@@ -5,6 +5,7 @@ import com.github.games647.fastlogin.bungee.FastLoginBungee;
 import com.github.games647.fastlogin.bungee.task.AsyncToggleMessage;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.message.ChangePremiumMessage;
+import com.github.games647.fastlogin.core.message.NamespaceKey;
 import com.github.games647.fastlogin.core.message.SuccessMessage;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.google.common.io.ByteArrayDataInput;
@@ -21,24 +22,24 @@ import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
-public class MessageListener implements Listener {
+public class PluginMessageListener implements Listener {
 
     private final FastLoginBungee plugin;
 
     private final String successChannel;
     private final String changeChannel;
 
-    public MessageListener(FastLoginBungee plugin) {
+    public PluginMessageListener(FastLoginBungee plugin) {
         this.plugin = plugin;
 
-        this.successChannel = plugin.getName() + ':' + SuccessMessage.SUCCESS_CHANNEL;
-        this.changeChannel = plugin.getName() + ':' + ChangePremiumMessage.CHANGE_CHANNEL;
+        this.successChannel = new NamespaceKey(plugin.getName(), SuccessMessage.SUCCESS_CHANNEL).getCombinedName();
+        this.changeChannel = new NamespaceKey(plugin.getName(), ChangePremiumMessage.CHANGE_CHANNEL).getCombinedName();
     }
 
     @EventHandler
     public void onPluginMessage(PluginMessageEvent pluginMessageEvent) {
         String channel = pluginMessageEvent.getTag();
-        if (pluginMessageEvent.isCancelled() || !channel.startsWith(plugin.getName())) {
+        if (pluginMessageEvent.isCancelled() || !channel.startsWith(plugin.getName().toLowerCase())) {
             return;
         }
 
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java
index f9bdedfa..d59ea8b0 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java
@@ -5,7 +5,7 @@ import com.google.common.io.ByteArrayDataOutput;
 
 public class ChangePremiumMessage implements ChannelMessage {
 
-    public static final String CHANGE_CHANNEL = "ChStatus";
+    public static final String CHANGE_CHANNEL = "ch-status";
 
     private String playerName;
     private boolean willEnable;
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java
index b29523ca..8565bee5 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java
@@ -7,7 +7,7 @@ import java.util.UUID;
 
 public class LoginActionMessage implements ChannelMessage {
 
-    public static final String FORCE_CHANNEL = "ForceAct";
+    public static final String FORCE_CHANNEL = "force-act";
 
     private Type type;
 
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java b/core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java
new file mode 100644
index 00000000..acfcf461
--- /dev/null
+++ b/core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java
@@ -0,0 +1,24 @@
+package com.github.games647.fastlogin.core.message;
+
+public class NamespaceKey {
+
+    private final String namespace;
+    private final String key;
+
+    private final String combined;
+
+    public NamespaceKey(String namespace, String key) {
+        this.namespace = namespace.toLowerCase();
+        this.key = key.toLowerCase();
+
+        this.combined = namespace + ':' + key;
+    }
+
+    public String getCombinedName()  {
+        return combined;
+    }
+
+    public static String getCombined(String namespace, String key) {
+        return new NamespaceKey(namespace, key).combined;
+    }
+}
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java
index bafceec5..f834dcba 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java
@@ -5,7 +5,7 @@ import com.google.common.io.ByteArrayDataOutput;
 
 public class SuccessMessage implements ChannelMessage {
 
-    public static final String SUCCESS_CHANNEL = "Success";
+    public static final String SUCCESS_CHANNEL = "success";
 
     @Override
     public String getChannelName() {