Merge branch '1.11.2-backport' into 1.11.2

Mumfrey
2 parents e13e19ac bbdf437a
Showing 3 changed files with 27 additions and 3 deletions
src/client/java/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
src/main/java/com/mumfrey/liteloader/core/PluginChannels.java
src/main/java/com/mumfrey/liteloader/core/ServerPluginChannels.java
@@ -7,6 +7,7 @@ package com.mumfrey.liteloader.client;
 import com.mumfrey.liteloader.client.ducks.IClientNetLoginHandler;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
+import com.mumfrey.liteloader.core.PluginChannels;
 import com.mumfrey.liteloader.core.exceptions.UnregisteredChannelException;
 import net.minecraft.client.Minecraft;
@@ -89,7 +90,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
     @Override
     protected boolean send(String channel, PacketBuffer data, ChannelPolicy policy)
     {
-        if (channel == null || channel.length() > 16 || CHANNEL_REGISTER.equals(channel) || CHANNEL_UNREGISTER.equals(channel))
+        if (!PluginChannels.isValidChannelName(channel))
         {
             throw new RuntimeException("Invalid channel name specified"); 
         }
@@ -32,6 +32,12 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
     // reserved channel consts
     protected static final String CHANNEL_REGISTER = "REGISTER";
     protected static final String CHANNEL_UNREGISTER = "UNREGISTER";
+    
+    /**
+     * Maximum allowable length of a channel name, previously 16 but increased
+     * to 20 at some point. 
+     */
+    private static final int MAX_CHANNEL_NAME_LENGTH = 20;
     /**
      * Number of faults for a specific listener before a warning is generated
@@ -180,7 +186,7 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
         {
             for (String channel : channels)
             {
-                if (channel.length() > 16 || channel.toUpperCase().equals(CHANNEL_REGISTER) || channel.toUpperCase().equals(CHANNEL_UNREGISTER))
+                if (!PluginChannels.isValidChannelName(channel))
                 {
                     continue;
                 }
@@ -194,6 +200,23 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
             }
         }
     }
+    
+    /**
+     * Check whether the supplied channel name is valid. Valid channel names
+     * must be between 1 and 20 characters long, and must not use the reserved
+     * channel names <tt>REGISTER</tt> and <tt>UNREGISTER</tt> 
+     * 
+     * @param channel channel name to validate
+     * @return true if the channel name is valid
+     */
+    public static boolean isValidChannelName(String channel)
+    {
+        return channel != null
+                && channel.length() > 0
+                && channel.length() <= PluginChannels.MAX_CHANNEL_NAME_LENGTH
+                && !channel.toUpperCase().equals(PluginChannels.CHANNEL_REGISTER)
+                && !channel.toUpperCase().equals(PluginChannels.CHANNEL_UNREGISTER);
+    }
     /**
      * Policy for dispatching plugin channel packets
@@ -230,7 +230,7 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
     {
         if (recipient == null) return false;
-        if (channel == null || channel.length() > 16 || CHANNEL_REGISTER.equals(channel) || CHANNEL_UNREGISTER.equals(channel))
+        if (!PluginChannels.isValidChannelName(channel))
         {
             throw new RuntimeException("Invalid channel name specified"); 
         }