Merge pull request #297 from roncain/localhost-cert-fix

Fixes issue matching wrong localhost certificate
dotnet · Aug 31, 2015 · e299bba · e299bba
2 parents 54a9d0c + 3b72d45
commit e299bba
Show file tree

Hide file tree

Showing 3 changed files with 146 additions and 120 deletions.
diff --git a/src/System.Private.ServiceModel/tools/test/Bridge/Bridge/BridgeController.cs b/src/System.Private.ServiceModel/tools/test/Bridge/Bridge/BridgeController.cs
@@ -86,6 +86,9 @@ public static void ReleaseAllResources()
             // the chance to release resources they've acquired or installed
             AppDomainManager.ShutdownAllAppDomains();
 
+            // Uninstall any certificates added or used by the Bridge itself
+            CertificateManager.UninstallAllCertificates(force: true);
+
             // Force the removal of the SSL cert that may have been added
             // by another AppDomain or left from a prior run
             int httpsPort = ConfigController.BridgeConfiguration.BridgeHttpsPort;
@@ -94,7 +97,7 @@ public static void ReleaseAllResources()
                 CertificateManager.UninstallSslPortCertificate(httpsPort);
             }
 
-            CertificateManager.UninstallAllCertificates();
+            // Finally remove all firewall rules we added for the ports
             PortManager.RemoveAllBridgeFirewallRules();
         }
 

diff --git a/src/System.Private.ServiceModel/tools/test/Bridge/WcfTestBridgeCommon/AssemblyLoader.cs b/src/System.Private.ServiceModel/tools/test/Bridge/WcfTestBridgeCommon/AssemblyLoader.cs
@@ -19,8 +19,8 @@ public AssemblyLoader()
             {
                 // Uninstall all certificates we explicitly added within this AppDomain
                 CertificateManager.UninstallAllSslPortCertificates();
-                CertificateManager.UninstallAllMyCertificates();
-                CertificateManager.UninstallAllRootCertificates();
+                CertificateManager.UninstallAllMyCertificates(force: false);
+                CertificateManager.UninstallAllRootCertificates(force: false);
             };
         }