Sanitize client setinfo metadata

src/StackExchange.Redis/ServerEndPoint.cs

@@ -26,7 +26,7 @@ internal sealed partial class ServerEndPoint : IDisposable
     {
         internal volatile ServerEndPoint? Primary;
         internal volatile ServerEndPoint[] Replicas = Array.Empty<ServerEndPoint>();
-        private static readonly Regex nameSanitizer = new Regex("[^!-~]", RegexOptions.Compiled);
+        private static readonly Regex nameSanitizer = new Regex("[^!-~]+", RegexOptions.Compiled);
 
         private readonly Hashtable knownScripts = new Hashtable(StringComparer.Ordinal);
 
@@ -1024,6 +1024,8 @@ private async Task HandshakeAsync(PhysicalConnection connection, ILogger? log)
                         // it, they should set SetClientLibrary to false, not set the name to empty string)
                         libName = config.Defaults.LibraryName;
                     }
+
+                    libName = ClientInfoSanitize(libName);
                     if (!string.IsNullOrWhiteSpace(libName))
                     {
                         msg = Message.Create(-1, CommandFlags.FireAndForget, RedisCommand.CLIENT,
@@ -1032,7 +1034,7 @@ private async Task HandshakeAsync(PhysicalConnection connection, ILogger? log)
                         await WriteDirectOrQueueFireAndForgetAsync(connection, msg, ResultProcessor.DemandOK).ForAwait();
                     }
 
-                    var version = Utils.GetLibVersion();
+                    var version = ClientInfoSanitize(Utils.GetLibVersion());
                     if (!string.IsNullOrWhiteSpace(version))
                     {
                         msg = Message.Create(-1, CommandFlags.FireAndForget, RedisCommand.CLIENT,
@@ -1091,6 +1093,11 @@ private void SetConfig<T>(ref T field, T value, [CallerMemberName] string? calle
                 Multiplexer?.ReconfigureIfNeeded(EndPoint, false, caller!);
             }
         }
+        internal static string ClientInfoSanitize(string? value)
+        {
+            if (string.IsNullOrWhiteSpace(value)) return "";
+            return nameSanitizer.Replace(value!.Trim(), "-");
+        }
 
         private void ClearMemoized()
         {

tests/StackExchange.Redis.Tests/Issues/Issue2653.cs

@@ -0,0 +1,16 @@
+using Xunit;
+
+namespace StackExchange.Redis.Tests.Issues;
+
+public class Issue2653
+{
+    [Theory]
+    [InlineData(null, "")]
+    [InlineData("", "")]
+    [InlineData("abcdef", "abcdef")]
+    [InlineData("abc.def", "abc.def")]
+    [InlineData("abc d \t  ef", "abc-d-ef")]
+    [InlineData("  abc\r\ndef\n", "abc-def")]
+    public void CheckLibraySanitization(string input, string expected)
+        => Assert.Equal(expected, ServerEndPoint.ClientInfoSanitize(input));
+}