Better CN/SAN matching

Author: dgaley

src/GlobalSignCAProxy/Api/GlobalSignEnrollRequest.cs

@@ -7,18 +7,18 @@
 
 using CSS.Common.Logging;
 
-using Keyfactor.Extensions.AnyGateway.GlobalSign.Services.Order;
+using Keyfactor.Extensions.AnyGateway.GlobalSign.Services.Order;
 
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-
-namespace Keyfactor.Extensions.AnyGateway.GlobalSign.Api
-{
+using System.Text;
+
+namespace Keyfactor.Extensions.AnyGateway.GlobalSign.Api
+{
 	public class GlobalSignEnrollRequest : LoggingClientBase
 	{
 		internal GlobalSignCAConfig Config;
-
+
 		public GlobalSignEnrollRequest(GlobalSignCAConfig config)
 		{
 			Config = config;
@@ -90,27 +90,26 @@ public BmV2PvOrderRequest Request
 								Logger.Info($"SAN Entry {item} matches CN, removing from request");
 								continue;
 							}
-							string trimCN = CommonName, trimItem = item;
-							if (trimCN.StartsWith("*."))
-							{
-								trimCN = trimCN.Substring(2);
-							}
-							else if (trimCN.StartsWith("www."))
-							{
-								trimCN = trimCN.Substring(4);
-							}
-							if (trimItem.StartsWith("*."))
+							string trimCN = CommonName;
+							if (CommonName.StartsWith("*."))
 							{
-								trimItem = trimItem.Substring(2);
+								trimCN = CommonName.Substring(2);
+								List<string> equivs = new List<string> { $"*.{trimCN}", $"www.{trimCN}", $"{trimCN}" };
+								if (equivs.Contains(item, StringComparer.OrdinalIgnoreCase))
+								{
+									Logger.Info($"SAN Entry {item} is equivalent to CN ignoring wildcards or www prefix, removing from request");
+									continue;
+								}
 							}
-							else if (trimItem.StartsWith("www."))
+							else if (CommonName.StartsWith("www."))
 							{
-								trimItem = trimItem.Substring(4);
-							}
-							if (string.Equals(trimCN, trimItem, System.StringComparison.OrdinalIgnoreCase))
-							{
-								Logger.Info($"SAN Entry {item} is equivalent to CN ignoring wildcards or www prefix, removing from request");
-								continue;
+								trimCN = CommonName.Substring(4);
+								List<string> equivs = new List<string> { $"www.{trimCN}", $"{trimCN}" };
+								if (equivs.Contains(item, StringComparer.OrdinalIgnoreCase))
+								{
+									Logger.Info($"SAN Entry {item} is equivalent to CN ignoring wildcards or www prefix, removing from request");
+									continue;
+								}
 							}
 							SANEntry entry = new SANEntry();
 							entry.SubjectAltName = item;
@@ -156,9 +155,10 @@ public BmV2PvOrderRequest Request
 				{
 					request.OrderRequestParameter.BaseOption = BaseOption;
 				}
-
+
 				return request;
 			}
 		}
-	}
-}
+
+	}
+}