Merge pull request #324 from solarwinds/feature/obsolete-protocols

Removed support for obsolete connection types
solarwinds · Sep 15, 2022 · 37d4428 · 37d4428
2 parents 20007a7 + 2ab0efe
commit 37d4428
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 191 deletions.
diff --git a/Src/SwqlStudio/ConnectionInfo.cs b/Src/SwqlStudio/ConnectionInfo.cs
@@ -105,23 +105,12 @@ public static List<ServerType> AvailableServerTypes
                     new ServerType { Type = "Orion (v3) AD", IsAuthenticationRequired = false },
                     new ServerType { Type = "Orion (v3) Certificate", IsAuthenticationRequired = false },
                     new ServerType { Type = "Orion (v3) over HTTPS", IsAuthenticationRequired = true },
-                    new ServerType { Type = "Orion (v2)", IsAuthenticationRequired = true },
-                    new ServerType { Type = "Orion (v2) AD", IsAuthenticationRequired = false },
-                    new ServerType { Type = "Orion (v2) Certificate", IsAuthenticationRequired = false },
-                    new ServerType { Type = "Orion (v2) over HTTPS", IsAuthenticationRequired = true },
-                    new ServerType { Type = "EOC", IsAuthenticationRequired = true },
-                    new ServerType { Type = "NCM", IsAuthenticationRequired = true },
-                    new ServerType { Type = "NCM (Windows Authentication)", IsAuthenticationRequired = false },
-                    new ServerType { Type = "NCM Integration", IsAuthenticationRequired = true },
-                    new ServerType { Type = "Java over HTTP", IsAuthenticationRequired = true }
                 };
 
                 if (Settings.Default.ShowCompressedModes)
                 {
                     serverTypes.AddRange(new[]
                                         {
-                                            new ServerType { Type = "Orion (v2) Compressed", IsAuthenticationRequired = true },
-                                            new ServerType { Type = "Orion (v2) AD Compressed", IsAuthenticationRequired = false },
                                             new ServerType { Type = "Orion (v3) Compressed", IsAuthenticationRequired = true },
                                             new ServerType { Type = "Orion (v3) AD Compressed", IsAuthenticationRequired = false },
                                         });

diff --git a/Src/SwqlStudio/InfoServiceFactory.cs b/Src/SwqlStudio/InfoServiceFactory.cs
@@ -6,44 +6,17 @@ public static InfoServiceBase Create(string serverType, string username, string
         {
             switch (serverType.ToUpperInvariant())
             {
-                case "EOC":
-                    return new EOCInfoService(username, password);
-
-                case "ORION (V2)":
-                    return new OrionInfoService(username, password);
-
-                case "ORION (V2) AD":
-                    return new OrionInfoServiceWindows(string.Empty, string.Empty);
-
-                case "ORION (V2) CERTIFICATE":
-                    return new OrionInfoServiceCertificate();
-
-                case "ORION (V2) OVER HTTPS":
-                    return new OrionHttpsInfoService(username, password);
-
                 case "ORION (V3)":
-                    return new OrionInfoService(username, password, isSwisV3: true);
+                    return new OrionInfoService(username, password);
 
                 case "ORION (V3) AD":
-                    return new OrionInfoServiceWindows(string.Empty, string.Empty, v3: true);
+                    return new OrionInfoServiceWindows(string.Empty, string.Empty);
 
                 case "ORION (V3) CERTIFICATE":
-                    return new OrionInfoServiceCertificate(v3: true);
+                    return new OrionInfoServiceCertificate();
 
                 case "ORION (V3) OVER HTTPS":
-                    return new OrionHttpsInfoService(username, password, v3: true);
-
-                case "NCM":
-                    return new NCMInfoService(username, password);
-
-                case "NCM (WINDOWS AUTHENTICATION)":
-                    return new NCMWindowsAuthInfoService(username, password);
-
-                case "NCM INTEGRATION":
-                    return new NCMForwarderInfoService(username, password);
-
-                case "JAVA OVER HTTP":
-                    return new JavaHttpInfoService(username, password);
+                    return new OrionHttpsInfoService(username, password);
             }
 
             return null;

diff --git a/Src/SwqlStudio/ProductSpecific/EOCInfoService.cs b/Src/SwqlStudio/ProductSpecific/EOCInfoService.cs
diff --git a/Src/SwqlStudio/ProductSpecific/JavaHttpInfoService.cs b/Src/SwqlStudio/ProductSpecific/JavaHttpInfoService.cs
diff --git a/Src/SwqlStudio/ProductSpecific/NCMForwarderInfoService.cs b/Src/SwqlStudio/ProductSpecific/NCMForwarderInfoService.cs
diff --git a/Src/SwqlStudio/ProductSpecific/NCMInfoService.cs b/Src/SwqlStudio/ProductSpecific/NCMInfoService.cs
diff --git a/Src/SwqlStudio/ProductSpecific/NCMWindowsAuthInfoService.cs b/Src/SwqlStudio/ProductSpecific/NCMWindowsAuthInfoService.cs
diff --git a/Src/SwqlStudio/ProductSpecific/OrionHttpsInfoService.cs b/Src/SwqlStudio/ProductSpecific/OrionHttpsInfoService.cs
@@ -23,10 +23,10 @@ private static bool ValidateRemoteCertificate(object sender, X509Certificate cer
                                     "SSL Certificate Issue", MessageBoxButtons.YesNo));
         }
 
-        public OrionHttpsInfoService(string username, string password, bool v3 = false)
+        public OrionHttpsInfoService(string username, string password)
         {
             _protocolName = "https";
-            _endpoint = v3 ? Settings.Default.OrionV3HttpsEndpointPath : Settings.Default.OrionHttpsEndpointPath;
+            _endpoint = Settings.Default.OrionV3HttpsEndpointPath;
             _endpointConfigName = "OrionHttpBinding_InformationServicev2";
             _binding = new BasicHttpBinding("SWIS.Over.HTTP");
             _credentials = new UsernameCredentials(username, password);

diff --git a/Src/SwqlStudio/ProductSpecific/OrionInfoService.cs b/Src/SwqlStudio/ProductSpecific/OrionInfoService.cs
@@ -8,22 +8,19 @@ namespace SwqlStudio
 {
     internal class OrionInfoService : InfoServiceBase
     {
-        private readonly bool _isSwisV3;
-
-        public OrionInfoService(string username, string password, bool isSwisV3 = false)
+        public OrionInfoService(string username, string password)
         {
-            _isSwisV3 = isSwisV3;
-            _endpoint = isSwisV3 ? Settings.Default.OrionV3EndpointPath : Settings.Default.OrionEndpointPath;
+            _endpoint = Settings.Default.OrionV3EndpointPath;
             _endpointConfigName = "OrionTcpBinding_InformationServicev2";
             _binding = new NetTcpBinding("TransportMessage");
             _credentials = new UsernameCredentials(username, password);
         }
 
-        public override string ServiceType => string.Format("Orion (v{0})", _isSwisV3 ? 3 : 2);
+        public override string ServiceType => "Orion (v3)";
 
         public override bool SupportsActiveSubscriber
         {
-            get { return Settings.Default.UseActiveSubscriber && _isSwisV3; }
+            get { return Settings.Default.UseActiveSubscriber; }
         }
 
         public override NotificationDeliveryServiceProxy CreateNotificationDeliveryServiceProxy(string server, INotificationSubscriber notificationSubscriber)

diff --git a/Src/SwqlStudio/ProductSpecific/OrionInfoServiceCertificate.cs b/Src/SwqlStudio/ProductSpecific/OrionInfoServiceCertificate.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Security;
 using SolarWinds.InformationService.Contract2;
@@ -12,11 +11,9 @@ namespace SwqlStudio
 {
     internal class OrionInfoServiceCertificate : InfoServiceBase
     {
-        public OrionInfoServiceCertificate(bool v3 = false)
+        public OrionInfoServiceCertificate()
         {
-            _endpoint = v3
-                ? Settings.Default.OrionV3EndpointPathCertificate
-                : Settings.Default.OrionEndpointPathCertificate;
+            _endpoint = Settings.Default.OrionV3EndpointPathCertificate;
             _endpointConfigName = "OrionCertificateTcpBinding";
             _binding = new NetTcpBinding("Certificate");
             _credentials = new MyCertificateCredential(Settings.Default.CertificateSubjectName,

diff --git a/Src/SwqlStudio/ProductSpecific/OrionInfoServiceWindows.cs b/Src/SwqlStudio/ProductSpecific/OrionInfoServiceWindows.cs
@@ -6,9 +6,9 @@ namespace SwqlStudio
 {
     internal class OrionInfoServiceWindows : InfoServiceBase
     {
-        public OrionInfoServiceWindows(string username, string password, bool v3 = false)
+        public OrionInfoServiceWindows(string username, string password)
         {
-            _endpoint = v3 ? Settings.Default.OrionV3EndpointPathAD : Settings.Default.OrionEndpointPathAD;
+            _endpoint = Settings.Default.OrionV3EndpointPathAD;
             _endpointConfigName = "OrionWindowsTcpBinding";
             _binding = new NetTcpBinding("Windows");
             _credentials = new WindowsCredential(username, password);