remove parsing logic from TextParsingExtensions and use existing URI certificate parsing functions instead

Author: Krystal Culp

src/VirtualClient/VirtualClient.Contracts/Parser/TextParsingExtensions.cs

@@ -61,7 +61,6 @@ public static class TextParsingExtensions
         private static readonly Regex CommaDelimitedExpression = new Regex(",", RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private static readonly Regex SemiColonDelimitedExpression = new Regex(";", RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private static readonly Regex TripleCommaDelimitedExpression = new Regex(",,,", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        private static readonly Regex AmpersandDelimitedExpression = new Regex("&", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>
         /// Remove rows that matches the regex.
@@ -121,7 +120,6 @@ public static IDictionary<string, IConvertible> ParseDelimitedValues(string text
             // 1) Triple-Comma Delimited (e.g. key1=value1,,,key2=value2)
             // 2) Semi-Colon Delimited   (e.g. key1=value1;key2=value2)
             // 3) Comma Delimited        (e.g. key1=value1,key2=value2)
-            // 4) Ampersand Delmited     (e.g. key1=value1&key2=value2)
 
             string[] delimitedKeyValuePairs = null;
             string normalizedText = text.Trim(new char[] { '\'', '"' });
@@ -141,11 +139,6 @@ public static IDictionary<string, IConvertible> ParseDelimitedValues(string text
                 // Comma delimiting
                 delimitedKeyValuePairs = TextParsingExtensions.CommaDelimitedExpression.Split(normalizedText);
             }
-            else if (TextParsingExtensions.AmpersandDelimitedExpression.IsMatch(normalizedText))
-            {
-                // Ampersand delimiting
-                delimitedKeyValuePairs = TextParsingExtensions.AmpersandDelimitedExpression.Split(normalizedText);
-            }
             else
             {
                 delimitedKeyValuePairs = new string[] { normalizedText };

src/VirtualClient/VirtualClient.Core/DependencyFactory.cs

@@ -682,7 +682,6 @@ public static VirtualClientProxyApiClient CreateVirtualClientProxyApiClient(Uri
         {
             proxyApiUri.ThrowIfNull(nameof(proxyApiUri));
 
-            // Check and see if AlwaysTrustServerCertificate was there
             IRestClientBuilder builder = new RestClientBuilder(timeout)
                 .AlwaysTrustServerCertificate()
                 .AddAcceptedMediaType(MediaType.Json);
@@ -704,7 +703,7 @@ public static VirtualClientProxyApiClient CreateVirtualClientProxyApiClient(Uri
         public static void FlushTelemetry(TimeSpan? timeout = null)
         {
             Parallel.ForEach(DependencyFactory.telemetryChannels, channel => channel.Flush(timeout));
-         }
+        }
 
         /// <summary>
         /// Applies a filter to the logger generated by the provider that will handle the logging

src/VirtualClient/VirtualClient.Core/EndpointUtility.cs

@@ -25,32 +25,6 @@ public static class EndpointUtility
     {
         private const string AllowedPackageUri = "https://packages.virtualclient.microsoft.com";
 
-#pragma warning disable CS1570 // XML comment has badly formed XML - the URI is not XML
-        /// <summary>
-        /// Parses the subject name and issuer from the provided uri. If the uri does not contain the correctly formatted certificate subject name
-        /// and issuer information the method will return false, and keep the two out parameters as null.
-        /// Ex. https://vegaprod01proxyapi.azurewebsites.net?crti=issuerName&crts=certSubject
-        /// </summary>
-        /// <param name="uri">The uri to attempt to parse the values from.</param>
-        /// <param name="issuer">The issuer of the certificate.</param>
-        /// <param name="subject">The subject of the certificate.</param>
-        /// <returns>True/False if the method was able to successfully parse both the subject name and the issuer of the certificate.</returns>
-        public static bool TryParseCertificateReference(Uri uri, out string issuer, out string subject)
-#pragma warning restore CS1570 // XML comment has badly formed XML
-        {
-            IDictionary<string, IConvertible> values = TextParsingExtensions.ParseDelimitedValues(uri.Query);
-
-            issuer = values.TryGetValue("crti", out IConvertible iss) ? iss.ToString() : null;
-            subject = values.TryGetValue("crts", out IConvertible sub) ? sub.ToString() : null;
-
-            if (!string.IsNullOrWhiteSpace(issuer) && !string.IsNullOrWhiteSpace(subject))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
         /// <summary>
         /// Creates a <see cref="DependencyBlobStore"/> definition from the connection properties provided.
         /// <list>
@@ -403,6 +377,25 @@ public static bool IsPackageUri(Uri endpointUri, string storeName)
             return storeName == DependencyStore.Packages && packageUri;
         }
 
+        /// <summary>
+        /// Parses the subject name and issuer from the provided uri. If the uri does not contain the correctly formatted certificate subject name
+        /// and issuer information the method will return false, and keep the two out parameters as null.
+        /// Ex. https://vegaprod01proxyapi.azurewebsites.net?crti=issuerName&amp;crts=certSubject
+        /// </summary>
+        /// <param name="uri">The uri to attempt to parse the values from.</param>
+        /// <param name="issuer">The issuer of the certificate.</param>
+        /// <param name="subject">The subject of the certificate.</param>
+        /// <returns>True/False if the method was able to successfully parse both the subject name and the issuer of the certificate.</returns>
+        public static bool TryParseCertificateReference(Uri uri, out string issuer, out string subject)
+        {
+            IDictionary<string, string> queryParameters = TextParsingExtensions.ParseDelimitedValues(uri.Query)?.ToDictionary(
+                    entry => entry.Key,
+                    entry => entry.Value?.ToString(),
+                    StringComparer.OrdinalIgnoreCase);
+
+            return TryGetCertificateReferenceForUri(queryParameters, out issuer, out subject);
+        }
+
         /// <summary>
         /// Returns the endpoint by verifying package uri checks.
         /// if the endpoint is a package uri without http or https protocols then append the protocol else return the endpoint value.

src/VirtualClient/VirtualClient.Main/CommandBase.cs

@@ -29,7 +29,7 @@ namespace VirtualClient
     using VirtualClient.Contracts.Proxy;
     using VirtualClient.Identity;
     using VirtualClient.Proxy;
-    
+
     /// <summary>
     /// Base class for Virtual Client commands.
     /// </summary>
@@ -362,7 +362,6 @@ protected IList<ILoggerProvider> CreateLoggerProviders(IConfiguration configurat
             }
 
             LogLevel loggingLevel = this.LoggingLevel ?? LogLevel.Information;
-
             foreach (string loggerDefinition in this.loggerDefinitions)
             {
                 string loggerName = loggerDefinition;