remove query string from base proxy uri and fix bug parsing query params

Author: Krystal Culp

src/VirtualClient/VirtualClient.Core/DependencyFactory.cs

@@ -682,6 +682,14 @@ public static VirtualClientProxyApiClient CreateVirtualClientProxyApiClient(Uri
         {
             proxyApiUri.ThrowIfNull(nameof(proxyApiUri));
 
+            if (proxyApiUri.Query != null)
+            {
+                // e.g.
+                // https://any.service.azure.com/?miid=307591a4-abb2-4559-af59-b47177d140cf -> https://any.service.azure.com/
+
+                proxyApiUri = new Uri(proxyApiUri.OriginalString.Substring(0, proxyApiUri.OriginalString.IndexOf("?")));
+            }
+
             IRestClientBuilder builder = new RestClientBuilder(timeout)
                 .AlwaysTrustServerCertificate()
                 .AddAcceptedMediaType(MediaType.Json);

src/VirtualClient/VirtualClient.Core/EndpointUtility.cs

@@ -388,10 +388,12 @@ public static bool IsPackageUri(Uri endpointUri, string storeName)
         /// <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);
+            string queryString = Uri.UnescapeDataString(uri.Query).Trim('?').Replace("&", ",,,");
+
+            IDictionary<string, string> queryParameters = TextParsingExtensions.ParseDelimitedValues(queryString)?.ToDictionary(
+                entry => entry.Key,
+                entry => entry.Value?.ToString(),
+                StringComparer.OrdinalIgnoreCase);
 
             return TryGetCertificateReferenceForUri(queryParameters, out issuer, out subject);
         }

src/VirtualClient/VirtualClient.Main/CommandBase.cs

@@ -3,6 +3,7 @@
 
 namespace VirtualClient
 {
+
     using System;
     using System.Collections.Generic;
     using System.Data;
@@ -564,7 +565,7 @@ protected virtual IServiceCollection InitializeDependencies(string[] args)
             IApiManager apiManager = new ApiManager(systemManagement.FirewallManager);
             IProfileManager profileManager = new ProfileManager();
             ISshClientFactory sshClientFactory = new SshClientFactory();
-            List <IBlobManager> blobStores = new List<IBlobManager>();
+            List<IBlobManager> blobStores = new List<IBlobManager>();
 
             IKeyVaultManager keyVaultManager = new KeyVaultManager();
 
@@ -623,6 +624,12 @@ protected virtual IServiceCollection InitializeDependencies(string[] args)
 
                     CommandBase.proxyApiDebugLoggers.Add(debugLogger);
 
+                    X509Certificate2 certificate = null;
+                    if (EndpointUtility.TryParseCertificateReference(this.ProxyApiUri, out string issuer, out string subject))
+                    {
+                        certificate = this.CertificateManager.GetCertificateFromStoreAsync(issuer, subject).GetAwaiter().GetResult();
+                    }
+
                     blobStores.Add(DependencyFactory.CreateProxyBlobManager(new DependencyProxyStore(DependencyBlobStore.Packages, blobStore.EndpointUri), packageSource?.ToString(), debugLogger));
 
                     // Enabling ApiClientManager to save Proxy API will allow downstream to access proxy endpoints as required.