Validate Max length of queue name

GrumpyBusted · GrumpyBusted · commit 96329bcd794a · 2018-02-04T01:05:28.000+01:00
diff --git a/Grumpy.MessageQueue.Msmq/Exceptions/QueueNameException.cs b/Grumpy.MessageQueue.Msmq/Exceptions/QueueNameException.cs
@@ -0,0 +1,20 @@
+﻿using System;
+using System.Runtime.Serialization;
+
+namespace Grumpy.MessageQueue.Msmq.Exceptions
+{
+    /// <inheritdoc />
+    [Serializable]
+    public sealed class QueueNameException : Exception
+    {
+        /// <inheritdoc />
+        private QueueNameException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+
+        /// <inheritdoc />
+        public QueueNameException(string name, int maxLength) : base("Queue Name too long")
+        {
+            Data.Add(nameof(name), name);
+            Data.Add(nameof(maxLength), maxLength);
+        }
+    }
+}
diff --git a/Grumpy.MessageQueue.Msmq/Grumpy.MessageQueue.Msmq.csproj b/Grumpy.MessageQueue.Msmq/Grumpy.MessageQueue.Msmq.csproj
@@ -57,6 +57,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Queue.cs" />
     <Compile Include="QueueFactory.cs" />
+    <Compile Include="Exceptions\QueueNameException.cs" />
     <Compile Include="RemoteQueue.cs" />
     <Compile Include="TransactionalMessage.cs" />
     <Compile Include="Exceptions\UnableToGetQueueException.cs" />
@@ -69,7 +70,7 @@
       <Version>1.2.3</Version>
     </PackageReference>
     <PackageReference Include="Grumpy.Logging">
-      <Version>0.9.2</Version>
+      <Version>0.9.3</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>10.0.3</Version>
diff --git a/Grumpy.MessageQueue.Msmq/MessageQueueManager.cs b/Grumpy.MessageQueue.Msmq/MessageQueueManager.cs
@@ -17,16 +17,29 @@ public class MessageQueueManager : IMessageQueueManager
     {
         private readonly ILogger _logger;
         private readonly object _lock;
+        private readonly string _serverName;
 
         /// <inheritdoc />
         public MessageQueueManager(ILogger logger)
         {
             _logger = logger;
             _lock = new object();
+            _serverName = Environment.GetEnvironmentVariable("COMPUTERNAME");
         }
 
         private const string PrivatePrefix = @"private$\";
-        private static string Path(string serverName, string name, bool privateQueue) => (Locale(serverName) ? "." : "FormatName:DIRECT=OS:" + serverName.ToLower()) + @"\" + Prefix(privateQueue) + name.ToLower();
+        private string Path(string serverName, string name, bool privateQueue) => (Locale(serverName) ? "" : $"FormatName:DIRECT=OS:") + Name(name, privateQueue);
+
+        private string Name(string name, bool privateQueue)
+        {
+            var res = _serverName.ToLower() + @"\" + Prefix(privateQueue) + name.ToLower();
+
+            if (res.Length > 124)
+                throw new QueueNameException(res, 124);
+
+            return res;
+        }
+        
         private static string Prefix(bool privateQueue) => privateQueue ? PrivatePrefix.ToLower() : "";
 
         /// <inheritdoc />
@@ -208,6 +221,9 @@ private bool Exists(string serverName, string name, bool privateQueue)
             }
         }
 
-        private static bool Locale(string serverName) => serverName.NullOrWhiteSpace() || serverName.In(".", Environment.GetEnvironmentVariable("COMPUTERNAME"));
+        private bool Locale(string serverName)
+        {
+            return serverName.NullOrWhiteSpace() ||serverName.In(".", _serverName);
+        }
     }
 }
diff --git a/Grumpy.MessageQueue.NuGet/Grumpy.MessageQueue.NuGet.csproj b/Grumpy.MessageQueue.NuGet/Grumpy.MessageQueue.NuGet.csproj
@@ -58,7 +58,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Grumpy.Logging">
-      <Version>0.9.2</Version>
+      <Version>0.9.3</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Grumpy.MessageQueue/Grumpy.MessageQueue.csproj b/Grumpy.MessageQueue/Grumpy.MessageQueue.csproj
@@ -58,7 +58,7 @@
       <Version>1.2.7</Version>
     </PackageReference>
     <PackageReference Include="Grumpy.Logging">
-      <Version>0.9.2</Version>
+      <Version>0.9.3</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Original file line number	Diff line number	Diff line change
`@@ -17,16 +17,29 @@ public class MessageQueueManager : IMessageQueueManager`
`17`	`17`	`{`
`18`	`18`	`private readonly ILogger _logger;`
`19`	`19`	`private readonly object _lock;`
	`20`	`+ private readonly string _serverName;`
`20`	`21`
`21`	`22`	`/// <inheritdoc />`
`22`	`23`	`public MessageQueueManager(ILogger logger)`
`23`	`24`	`{`
`24`	`25`	`_logger = logger;`
`25`	`26`	`_lock = new object();`
	`27`	`+ _serverName = Environment.GetEnvironmentVariable("COMPUTERNAME");`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`private const string PrivatePrefix = @"private$\";`
`29`		`- private static string Path(string serverName, string name, bool privateQueue) => (Locale(serverName) ? "." : "FormatName:DIRECT=OS:" + serverName.ToLower()) + @"\" + Prefix(privateQueue) + name.ToLower();`
	`31`	`+ private string Path(string serverName, string name, bool privateQueue) => (Locale(serverName) ? "" : $"FormatName:DIRECT=OS:") + Name(name, privateQueue);`
	`32`	`+`
	`33`	`+ private string Name(string name, bool privateQueue)`
	`34`	`+ {`
	`35`	`+ var res = _serverName.ToLower() + @"\" + Prefix(privateQueue) + name.ToLower();`
	`36`	`+`
	`37`	`+ if (res.Length > 124)`
	`38`	`+ throw new QueueNameException(res, 124);`
	`39`	`+`
	`40`	`+ return res;`
	`41`	`+ }`
	`42`	`+`
`30`	`43`	`private static string Prefix(bool privateQueue) => privateQueue ? PrivatePrefix.ToLower() : "";`
`31`	`44`
`32`	`45`	`/// <inheritdoc />`
`@@ -208,6 +221,9 @@ private bool Exists(string serverName, string name, bool privateQueue)`
`208`	`221`	`}`
`209`	`222`	`}`
`210`	`223`
`211`		`- private static bool Locale(string serverName) => serverName.NullOrWhiteSpace() \|\| serverName.In(".", Environment.GetEnvironmentVariable("COMPUTERNAME"));`
	`224`	`+ private bool Locale(string serverName)`
	`225`	`+ {`
	`226`	`+ return serverName.NullOrWhiteSpace() \|\|serverName.In(".", _serverName);`
	`227`	`+ }`
`212`	`228`	`}`
`213`	`229`	`}`