Changeset 3771 for trunk/sources/HeuristicLab.PluginInfrastructure/Advanced

Timestamp:

05/11/10 16:47:12 (14 years ago)

Author:

gkronber

Message:

Prepared deployment service proxy classes for migration of deployment server to a production environment. #989

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced

Files:

• DeploymentService/AdminClientFactory.cs (modified) (2 diffs)
• DeploymentService/DeploymentServerCertificateValidator.cs (added)
• DeploymentService/RegenerateServiceClasses.cmd (modified) (1 diff)
• DeploymentService/UpdateClientFactory.cs (modified) (2 diffs)
• DeploymentService/servdev.cer (deleted)
• DeploymentService/services.heuristiclab.com.cer (added)
• EditProductsView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/DeploymentService/AdminClientFactory.cs

@@ -39 +39 @@
     /// </summary>
     static AdminClientFactory() {
-      var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.servdev.cer");
+      var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.services.heuristiclab.com.cer");
       serverCrtData = new byte[stream.Length];
       stream.Read(serverCrtData, 0, serverCrtData.Length);
@@ -58 +58 @@
       client.ClientCredentials.UserName.Password = HeuristicLab.PluginInfrastructure.Properties.Settings.Default.UpdateLocationPassword;
       client.Endpoint.Address = new EndpointAddress(HeuristicLab.PluginInfrastructure.Properties.Settings.Default.UpdateLocationAdministrationAddress);
-      client.ClientCredentials.ServiceCertificate.DefaultCertificate = new X509Certificate2(serverCrtData);
-      client.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.None;
+      client.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.Custom;
+      client.ClientCredentials.ServiceCertificate.Authentication.CustomCertificateValidator =
+          new DeploymentServerCertificateValidator(new X509Certificate2(serverCrtData));
+
       return client;
     }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/DeploymentService/RegenerateServiceClasses.cmd

@@ -1 +1 @@
 #
-svcutil http://servdev.heuristiclab.com/Deployment-3.3/Update.svc/mex http://servdev.heuristiclab.com/Deployment-3.3/Admin.svc/mex  /language:C# /targetClientVersion:Version35 /out:DeploymentService /namespace:*,HeuristicLab.PluginInfrastructure.Advanced.DeploymentService /mergeConfig /config:../../app.config
+svcutil http://services.heuristiclab.com/Deployment-3.3/Update.svc/mex http://services.heuristiclab.com/Deployment-3.3/Admin.svc/mex  /language:C# /targetClientVersion:Version35 /out:DeploymentService /namespace:*,HeuristicLab.PluginInfrastructure.Advanced.DeploymentService /mergeConfig /config:../../app.config

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/DeploymentService/UpdateClientFactory.cs

@@ -39 +39 @@
     /// </summary>
     static UpdateClientFactory() {
-      var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.servdev.cer");
+      var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.services.heuristiclab.com.cer");
       serverCrtData = new byte[stream.Length];
       stream.Read(serverCrtData, 0, serverCrtData.Length);
@@ -58 +58 @@
       client.ClientCredentials.UserName.Password = HeuristicLab.PluginInfrastructure.Properties.Settings.Default.UpdateLocationPassword;
       client.Endpoint.Address = new EndpointAddress(HeuristicLab.PluginInfrastructure.Properties.Settings.Default.UpdateLocation);
-      client.ClientCredentials.ServiceCertificate.DefaultCertificate = new X509Certificate2(serverCrtData);
-      client.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.None;
+      client.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.Custom;
+      client.ClientCredentials.ServiceCertificate.Authentication.CustomCertificateValidator =
+          new DeploymentServerCertificateValidator(new X509Certificate2(serverCrtData));
       return client;
     }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/EditProductsView.cs

@@ -139 +139 @@
       try {
         foreach (var product in products) {
-          adminClient.DeployProduct(product);
+          // only upload necessary data (product name and version, and for each plugin only plugin name and version)
+          var lightWeightProduct = new DeploymentService.ProductDescription(product.Name, product.Version);
+          lightWeightProduct.Plugins = (from plugin in product.Plugins
+                                        select new DeploymentService.PluginDescription(plugin.Name, plugin.Version)).ToArray();
+          adminClient.DeployProduct(lightWeightProduct);
         }
         adminClient.Close();