RDS Help desk computer group added

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs

@@ -118,6 +118,8 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback SaveRdsCollectionLocalAdminsOperationCompleted;
         
+        private System.Threading.SendOrPostCallback InstallSessionHostsCertificateOperationCompleted;
+        
         /// <remarks/>
         public esRemoteDesktopServices() {
             this.Url = "http://localhost:9002/esRemoteDesktopServices.asmx";
@@ -255,6 +257,9 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event SaveRdsCollectionLocalAdminsCompletedEventHandler SaveRdsCollectionLocalAdminsCompleted;
         
+        /// <remarks/>
+        public event InstallSessionHostsCertificateCompletedEventHandler InstallSessionHostsCertificateCompleted;
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsCollection", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public RdsCollection GetRdsCollection(int collectionId) {
@@ -2238,6 +2243,53 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/InstallSessionHostsCertificate", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ResultObject InstallSessionHostsCertificate(int collectionId, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] certificate, string password) {
+            object[] results = this.Invoke("InstallSessionHostsCertificate", new object[] {
+                        collectionId,
+                        certificate,
+                        password});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginInstallSessionHostsCertificate(int collectionId, byte[] certificate, string password, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("InstallSessionHostsCertificate", new object[] {
+                        collectionId,
+                        certificate,
+                        password}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndInstallSessionHostsCertificate(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void InstallSessionHostsCertificateAsync(int collectionId, byte[] certificate, string password) {
+            this.InstallSessionHostsCertificateAsync(collectionId, certificate, password, null);
+        }
+        
+        /// <remarks/>
+        public void InstallSessionHostsCertificateAsync(int collectionId, byte[] certificate, string password, object userState) {
+            if ((this.InstallSessionHostsCertificateOperationCompleted == null)) {
+                this.InstallSessionHostsCertificateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnInstallSessionHostsCertificateOperationCompleted);
+            }
+            this.InvokeAsync("InstallSessionHostsCertificate", new object[] {
+                        collectionId,
+                        certificate,
+                        password}, this.InstallSessionHostsCertificateOperationCompleted, userState);
+        }
+        
+        private void OnInstallSessionHostsCertificateOperationCompleted(object arg) {
+            if ((this.InstallSessionHostsCertificateCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.InstallSessionHostsCertificateCompleted(this, new InstallSessionHostsCertificateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -3387,4 +3439,30 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void InstallSessionHostsCertificateCompletedEventHandler(object sender, InstallSessionHostsCertificateCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class InstallSessionHostsCertificateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal InstallSessionHostsCertificateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
 }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs

@@ -278,6 +278,51 @@ namespace WebsitePanel.EnterpriseServer
             return SaveRdsCollectionLocalAdminsInternal(users, collectionId);
         }
 
+        public static ResultObject InstallSessionHostsCertificate(int collectionId, byte[] certificate, string password)
+        {
+            return InstallSessionHostsCertificateInternal(collectionId, certificate, password);
+        }
+
+        private static ResultObject InstallSessionHostsCertificateInternal(int collectionId, byte[] certificate, string password)
+        {
+            var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "INSTALL_CERTIFICATE");
+
+            try
+            {
+                var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId));
+                Organization org = OrganizationController.GetOrganization(collection.ItemId);
+
+                if (org == null)
+                {
+                    result.IsSuccess = false;
+                    result.AddError("", new NullReferenceException("Organization not found"));
+                    return result;
+                }
+
+                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+                var servers = ObjectUtils.CreateListFromDataReader<RdsServer>(DataProvider.GetRDSServersByCollectionId(collection.Id)).ToList();
+
+                rds.InstallCertificate(certificate, password, servers.Select(s => s.FqdName).ToArray());
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                if (!result.IsSuccess)
+                {
+                    TaskManager.CompleteResultTask(result);
+                }
+                else
+                {
+                    TaskManager.CompleteResultTask();
+                }
+            }
+
+            return result;
+        }
+
         private static RdsCollection GetRdsCollectionInternal(int collectionId)
         {
             var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId));
@@ -373,8 +418,24 @@ namespace WebsitePanel.EnterpriseServer
         private static RdsCollectionSettings GetRdsCollectionSettingsInternal(int collectionId)
         {
             var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId));            
+            var settings = ObjectUtils.FillObjectFromDataReader<RdsCollectionSettings>(DataProvider.GetRdsCollectionSettingsByCollectionId(collectionId));
 
-            return ObjectUtils.FillObjectFromDataReader<RdsCollectionSettings>(DataProvider.GetRdsCollectionSettingsByCollectionId(collectionId));                        
+            if (settings.SecurityLayer == null)
+            {
+                settings.SecurityLayer = SecurityLayerValues.Negotiate.ToString();
+            }
+
+            if (settings.EncryptionLevel == null)
+            {
+                settings.EncryptionLevel = EncryptionLevel.ClientCompatible.ToString();
+            }
+
+            if (settings.AuthenticateUsingNLA == null)
+            {
+                settings.AuthenticateUsingNLA = true;
+            }
+
+            return settings;
         }
 
         private static List<RdsCollection> GetOrganizationRdsCollectionsInternal(int itemId)
@@ -426,7 +487,10 @@ namespace WebsitePanel.EnterpriseServer
                     ClientPrinterRedirected = true,
                     ClientPrinterAsDefault = true,
                     RDEasyPrintDriverEnabled = true,
-                    MaxRedirectedMonitors = 16
+                    MaxRedirectedMonitors = 16,
+                    EncryptionLevel = EncryptionLevel.ClientCompatible.ToString(),
+                    SecurityLayer = SecurityLayerValues.Negotiate.ToString(),
+                    AuthenticateUsingNLA = true
                 };                
 
                 rds.CreateCollection(org.OrganizationId, collection);                

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs

@@ -325,5 +325,11 @@ namespace WebsitePanel.EnterpriseServer
         {
             return RemoteDesktopServicesController.SaveRdsCollectionLocalAdmins(users, collectionId);
         }
+
+        [WebMethod]
+        public ResultObject InstallSessionHostsCertificate(int collectionId, byte[] certificate, string password)
+        {
+            return RemoteDesktopServicesController.InstallSessionHostsCertificate(collectionId, certificate, password);
+        }
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs

@@ -78,5 +78,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         List<string> GetRdsCollectionLocalAdmins(string hostName);
         void MoveRdsServerToTenantOU(string hostName, string organizationId);
         void RemoveRdsServerFromTenantOU(string hostName, string organizationId);
+        void InstallCertificate(byte[] certificate, string password, List<string> hostNames);
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsCollectionSettings.cs

@@ -22,5 +22,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         public bool ClientPrinterAsDefault { get; set; }
         public bool RDEasyPrintDriverEnabled { get; set; }
         public int MaxRedirectedMonitors { get; set; }
+        public string SecurityLayer { get; set; }
+        public string EncryptionLevel { get; set; }
+        public bool AuthenticateUsingNLA { get; set; }
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RemoteApplication.cs

@@ -36,5 +36,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         public string FileVirtualPath { get; set; }
         public bool ShowInWebAccess { get; set; }
         public string RequiredCommandLine { get; set; }
+        public string[] Users { get; set; }
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs

@@ -70,8 +70,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         private const string WspAdministratorsGroupName = "WSP-Administrators";
         private const string WspAdministratorsGroupDescription = "WSP Administrators";
         private const string RdsServersOU = "RDSServers";
-        private const uint ADS_GROUP_TYPE_UNIVERSAL_GROUP = 0x00000008;
+        private const string RDSHelpDeskComputerGroup = "Websitepanel-RDSHelpDesk-Computer";
-        private const uint ADS_GROUP_TYPE_SECURITY_ENABLED = 0x80000000;
 
         #endregion
 
@@ -309,6 +308,11 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                     //ActiveDirectoryUtils.AddObjectToGroup(GetComputerPath(ConnectionBroker), GetComputerGroupPath(organizationId, collection.Name));
                 }
 
+                if (!ActiveDirectoryUtils.AdObjectExists(GetHelpDeskComputerGroupPath()))
+                {
+                    ActiveDirectoryUtils.CreateGroup(GetRootOUPath(), RDSHelpDeskComputerGroup);
+                }
+
                 if (!ActiveDirectoryUtils.AdObjectExists(GetUsersGroupPath(organizationId, collection.Name)))
                 {
                     //Create user group
@@ -561,6 +565,11 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
                 ExecuteShellCommand(runSpace, cmd, false);
 
+                if (!ActiveDirectoryUtils.AdObjectExists(GetHelpDeskComputerGroupPath()))
+                {
+                    ActiveDirectoryUtils.CreateGroup(GetRootOUPath(), RDSHelpDeskComputerGroup);
+                }
+
                 AddComputerToCollectionAdComputerGroup(organizationId, collectionName, server);
             }
             catch (Exception e)
@@ -1134,15 +1143,41 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
         #region SSL
 
-        public void InstallCertificate(byte[] certificate, string password, string hostName)
+        public void InstallCertificate(byte[] certificate, string password, List<string> hostNames)
         {
             Runspace runspace = null;
 
             try
             {
+                var guid = Guid.NewGuid();                
                 var x509Cert = new X509Certificate2(certificate, password, X509KeyStorageFlags.Exportable);
+                //var content = x509Cert.Export(X509ContentType.Pfx);
+                var filePath = SaveCertificate(certificate, guid);
                 runspace = OpenRunspace();
-                CopyCertificateFile(certificate, hostName, runspace);
+
+                foreach (var hostName in hostNames)
+                {                    
+                    var destinationPath = string.Format("\\\\{0}\\c$\\{1}.pfx", hostName, guid);
+                    var errors = CopyCertificateFile(runspace, filePath, destinationPath);
+
+                    if (!errors.Any())
+                    {
+                        errors = ImportCertificate(runspace, hostName, password, string.Format("c:\\{0}.pfx", guid), x509Cert.Thumbprint);
+                    }
+
+                    DeleteCertificateFile(destinationPath, runspace);
+
+                    if (errors.Any())
+                    {
+                        Log.WriteWarning(string.Join("\r\n", errors.Select(e => e.ToString()).ToArray()));
+                        throw new Exception(string.Join("\r\n", errors.Select(e => e.ToString()).ToArray()));
+                    }
+                }
+
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);
+                }
             }
             finally
             {
@@ -1150,16 +1185,61 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
         }   
 
-        private string CopyCertificateFile(byte[] certificate, string hostName, Runspace runspace)
+        private object[] ImportCertificate(Runspace runspace, string hostName, string password, string certificatePath, string thumbprint)
         {
-            var destinationPath = string.Format("\\{0}\\c$\\remoteCert.pfx", hostName);
+            var scripts = new List<string>
+            {
+                string.Format("$mypwd = ConvertTo-SecureString -String {0} -Force –AsPlainText", password),
+                string.Format("Import-PfxCertificate –FilePath \"{0}\" cert:\\localMachine\\my -Password $mypwd", certificatePath),
+                string.Format("$cert = Get-Item cert:\\LocalMachine\\My\\{0}", thumbprint),
+                string.Format("$path = (Get-WmiObject -class \"Win32_TSGeneralSetting\" -Namespace root\\cimv2\\terminalservices -Filter \"TerminalName='RDP-tcp'\").__path"),
+                string.Format("Set-WmiInstance -Path $path -argument @{0}", string.Format("{{SSLCertificateSHA1Hash=\"{0}\"}}", thumbprint))
+            };
 
-            return destinationPath;
+            object[] errors = null;
+            ExecuteRemoteShellCommand(runspace, hostName, scripts, out errors);
+
+            return errors;
         }
 
-        private void DeleteCertificate(string path, Runspace runspace)
+        private string SaveCertificate(byte[] certificate, Guid guid)
         {
+            var filePath = string.Format("{0}{1}.pfx", Path.GetTempPath(), guid);
 
+            if (File.Exists(filePath))
+            {
+                File.Delete(filePath);
+            }
+
+            File.WriteAllBytes(filePath, certificate);
+
+            return filePath;
+        }
+     
+        private object[] CopyCertificateFile(Runspace runspace, string filePath, string destinationPath)
+        {                                  
+            var scripts = new List<string>
+            {
+                string.Format("Copy-Item \"{0}\" -Destination \"{1}\" -Force", filePath, destinationPath)
+            };
+
+            object[] errors = null;
+            ExecuteShellCommand(runspace, scripts, out errors);            
+
+            return errors;
+        }
+
+        private object[] DeleteCertificateFile(string destinationPath, Runspace runspace)
+        {
+            var scripts = new List<string>
+            {
+                string.Format("Remove-Item -Path \"{0}\" -Force", destinationPath)
+            };
+
+            object[] errors = null;
+            ExecuteShellCommand(runspace, scripts, out errors);
+
+            return errors;
         }
 
         #endregion
@@ -1273,6 +1353,11 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 {
                     ActiveDirectoryUtils.AddObjectToGroup(computerPath, GetComputerGroupPath(organizationId, collectionName));
                 }
+
+                if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RDSHelpDeskComputerGroup))
+                {
+                    ActiveDirectoryUtils.AddObjectToGroup(computerPath, GetHelpDeskComputerGroupPath());
+                }
             }
 
             SetRDServerNewConnectionAllowed(false, server);
@@ -1297,6 +1382,14 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 {
                     ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetComputerGroupPath(organizationId, collectionName));
                 }
+
+                if (ActiveDirectoryUtils.AdObjectExists(GetHelpDeskComputerGroupPath()))
+                {
+                    if (ActiveDirectoryUtils.IsComputerInGroup(samName, RDSHelpDeskComputerGroup))
+                    {
+                        ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetHelpDeskComputerGroupPath());
+                    }
+                }
             }
         }
 
@@ -1487,11 +1580,18 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 DisplayName = Convert.ToString(GetPSObjectProperty(psObject, "DisplayName")),
                 FilePath = Convert.ToString(GetPSObjectProperty(psObject, "FilePath")),
                 Alias = Convert.ToString(GetPSObjectProperty(psObject, "Alias")),
-                ShowInWebAccess = Convert.ToBoolean(GetPSObjectProperty(psObject, "ShowInWebAccess"))
+                ShowInWebAccess = Convert.ToBoolean(GetPSObjectProperty(psObject, "ShowInWebAccess")),
+                Users = null
             };
 
             var requiredCommandLine = GetPSObjectProperty(psObject, "RequiredCommandLine");
             remoteApp.RequiredCommandLine = requiredCommandLine == null ? null : requiredCommandLine.ToString();
+            var users = (string[])(GetPSObjectProperty(psObject, "UserGroups"));
+
+            if (users != null && users.Any())
+            {
+                remoteApp.Users = users;
+            }
             
             return remoteApp;
         }
@@ -1564,7 +1664,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         internal string GetComputerGroupPath(string organizationId, string collection)
         {
             StringBuilder sb = new StringBuilder();
-            // append provider
+            
             AppendProtocol(sb);
             AppendDomainController(sb);
             AppendCNPath(sb, GetComputersGroupName(collection));
@@ -1575,10 +1675,23 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return sb.ToString();
         }
 
+        internal string GetHelpDeskComputerGroupPath()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            AppendProtocol(sb);
+            AppendDomainController(sb);
+            AppendCNPath(sb, RDSHelpDeskComputerGroup);
+            AppendOUPath(sb, RootOU);
+            AppendDomainPath(sb, RootDomain);
+
+            return sb.ToString();
+        } 
+
         internal string GetUsersGroupPath(string organizationId, string collection)
         {
             StringBuilder sb = new StringBuilder();
-            // append provider
+            
             AppendProtocol(sb);
             AppendDomainController(sb);
             AppendCNPath(sb, GetUsersGroupName(collection));

WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs

@@ -98,6 +98,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         
         private System.Threading.SendOrPostCallback RemoveRdsServerFromTenantOUOperationCompleted;
         
+        private System.Threading.SendOrPostCallback InstallCertificateOperationCompleted;
+        
         /// <remarks/>
         public RemoteDesktopServices() {
             this.Url = "http://localhost:9003/RemoteDesktopServices.asmx";
@@ -205,6 +207,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         public event RemoveRdsServerFromTenantOUCompletedEventHandler RemoveRdsServerFromTenantOUCompleted;
         
+        /// <remarks/>
+        public event InstallCertificateCompletedEventHandler InstallCertificateCompleted;
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/CreateCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -1675,6 +1680,52 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/InstallCertificate", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void InstallCertificate([System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] certificate, string password, string[] hostNames) {
+            this.Invoke("InstallCertificate", new object[] {
+                        certificate,
+                        password,
+                        hostNames});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginInstallCertificate(byte[] certificate, string password, string[] hostNames, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("InstallCertificate", new object[] {
+                        certificate,
+                        password,
+                        hostNames}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndInstallCertificate(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void InstallCertificateAsync(byte[] certificate, string password, string[] hostNames) {
+            this.InstallCertificateAsync(certificate, password, hostNames, null);
+        }
+        
+        /// <remarks/>
+        public void InstallCertificateAsync(byte[] certificate, string password, string[] hostNames, object userState) {
+            if ((this.InstallCertificateOperationCompleted == null)) {
+                this.InstallCertificateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnInstallCertificateOperationCompleted);
+            }
+            this.InvokeAsync("InstallCertificate", new object[] {
+                        certificate,
+                        password,
+                        hostNames}, this.InstallCertificateOperationCompleted, userState);
+        }
+        
+        private void OnInstallCertificateOperationCompleted(object arg) {
+            if ((this.InstallCertificateCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.InstallCertificateCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -2300,4 +2351,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void RemoveRdsServerFromTenantOUCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void InstallCertificateCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
 }

WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs

@@ -630,5 +630,21 @@ namespace WebsitePanel.Server
                 throw;
             }
         }
+
+        [WebMethod, SoapHeader("settings")]
+        public void InstallCertificate(byte[] certificate, string password, List<string> hostNames)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' InstallCertificate", ProviderSettings.ProviderName);
+                RDSProvider.InstallCertificate(certificate, password, hostNames);
+                Log.WriteEnd("'{0}' InstallCertificate", ProviderSettings.ProviderName);
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' InstallCertificate", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx

@@ -5638,6 +5638,9 @@
   <data name="ERROR.RDSCOLLECTION_NOT_CREATED" xml:space="preserve">
     <value>Collection not created</value>
   </data>
+  <data name="ERROR.RDSSESSIONHOST_CERTIFICATE_NOT_INSTALLED" xml:space="preserve">
+    <value>Session host certificate not installed</value>
+  </data>
   <data name="ERROR.RDSCOLLECTIONSETTINGS_NOT_UPDATES" xml:space="preserve">
     <value>RDS Collection settings not updated</value>
   </data>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditCollectionSettings.ascx.resx

@@ -129,6 +129,9 @@
   <data name="locEnableRedirection.Text" xml:space="preserve">
     <value>Enable redirection for the following:</value>
   </data>
+  <data name="locEncryptionLevel.Text" xml:space="preserve">
+    <value>Encryption Level</value>
+  </data>
   <data name="locIdleSessionLimit.Text" xml:space="preserve">
     <value>Idle session limit:</value>
   </data>
@@ -141,6 +144,9 @@
   <data name="locPrinters.Text" xml:space="preserve">
     <value>Printers</value>
   </data>
+  <data name="locSecurityLayer.Text" xml:space="preserve">
+    <value>Security Layer</value>
+  </data>
   <data name="locSessionLimitHeader.Text" xml:space="preserve">
     <value>Set RD Session Host server timeout and reconnection settings for the session collection.</value>
   </data>
@@ -153,6 +159,9 @@
   <data name="secRdsClientSettings.Text" xml:space="preserve">
     <value>Client Settings</value>
   </data>
+  <data name="secRdsSecuritySettings.Text" xml:space="preserve">
+    <value>Security Settings</value>
+  </data>
   <data name="secRdsSessionSettings.Text" xml:space="preserve">
     <value>Session Settings</value>
   </data>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs

@@ -64,6 +64,21 @@ namespace WebsitePanel.Portal.RDS
 
                 RdsCollection collection = new RdsCollection{ Name = txtCollectionName.Text, DisplayName = txtCollectionName.Text, Servers = servers.GetServers(), Description = "" };
                 int collectionId = ES.Services.RDS.AddRdsCollection(PanelRequest.ItemID, collection);
+
+                try
+                {
+                    if (upPFX.HasFile.Equals(true))
+                    {
+                        byte[] pfx = upPFX.FileBytes;
+                        string certPassword = txtPFXInstallPassword.Text;
+                        //ES.Services.RDS.InstallSessionHostsCertificate(collectionId, pfx, certPassword);
+                    }
+                }
+                catch(Exception ex)
+                {
+                    messageBox.ShowErrorMessage("RDSSESSIONHOST_CERTIFICATE_NOT_INSTALLED", ex);
+                }
+
                 Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "rds_edit_collection", "CollectionId=" + collectionId, "ItemID=" + PanelRequest.ItemID));
             }
             catch (Exception ex)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionSettings.ascx

@@ -175,6 +175,43 @@
                         </div>                            
                     </asp:Panel>
 
+                    <wsp:CollapsiblePanel id="secRdsSecuritySettings" runat="server"
+                        TargetControlID="panelRdsSecuritySettings" meta:resourcekey="secRdsSecuritySettings" Text="">
+                    </wsp:CollapsiblePanel>		
+                    
+                    <asp:Panel runat="server" ID="panelRdsSecuritySettings">                                                
+                        <div style="padding: 10px;">                            
+                            <table>
+                                <tr>
+                                    <td class="Label" style="width:260px;"><asp:Localize ID="locSecurityLayer" runat="server" meta:resourcekey="locSecurityLayer" Text=""></asp:Localize></td>
+                                    <td style="width:250px;">
+                                        <asp:DropDownList ID="ddSecurityLayer" runat="server" CssClass="NormalTextBox">
+                                            <asp:ListItem Value="RDP" Text="RDP Security Layer" />
+                                            <asp:ListItem Value="Negotiate" Text="Negotiate" />
+                                            <asp:ListItem Value="SSL" Text="SSL (TLS 1.0)" />
+                                        </asp:DropDownList>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="Label" style="width:260px;"><asp:Localize ID="locEncryptionLevel" runat="server" meta:resourcekey="locEncryptionLevel" Text=""></asp:Localize></td>
+                                    <td style="width:250px;">
+                                        <asp:DropDownList ID="ddEncryptionLevel" runat="server" CssClass="NormalTextBox">
+                                            <asp:ListItem Value="Low" Text="Low" />
+                                            <asp:ListItem Value="ClientCompatible" Text="Client Compatible" />
+                                            <asp:ListItem Value="High" Text="High" />
+                                            <asp:ListItem Value="FipsCompliant" Text="FIPS Compliant" />
+                                        </asp:DropDownList>
+                                    </td>
+                                </tr> 
+                                <tr>                                    
+                                    <td colspan="2">
+                                        <asp:CheckBox ID="cbAuthentication" Text="Allow connections only from computers runnig Remote Desktop with Network Level Authentication" runat="server"/>
+                                    </td>
+                                </tr>                               
+                            </table>
+                        </div>                            
+                    </asp:Panel>
+
                     <div class="FormFooterClean">
                         <wsp:ItemButtonPanel id="buttonPanel" runat="server" ValidationGroup="SaveRDSCollection" 
                             OnSaveClick="btnSave_Click" OnSaveExitClick="btnSaveExit_Click" />

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionSettings.ascx.cs

@@ -43,7 +43,10 @@ namespace WebsitePanel.Portal.RDS
                         ClientPrinterRedirected = true,
                         ClientPrinterAsDefault = true,
                         RDEasyPrintDriverEnabled = true,
-                        MaxRedirectedMonitors = 16
+                        MaxRedirectedMonitors = 16,
+                        EncryptionLevel = EncryptionLevel.ClientCompatible.ToString(),
+                        SecurityLayer = SecurityLayerValues.Negotiate.ToString(),
+                        AuthenticateUsingNLA = true
                     };
                 }
 
@@ -89,6 +92,9 @@ namespace WebsitePanel.Portal.RDS
             chEasyPrint.Checked = collection.Settings.RDEasyPrintDriverEnabled;
             chEasyPrint.Enabled = collection.Settings.ClientPrinterRedirected;
             tbMonitorsNumber.Text = collection.Settings.MaxRedirectedMonitors.ToString();
+            cbAuthentication.Checked = collection.Settings.AuthenticateUsingNLA;
+            ddSecurityLayer.SelectedValue = collection.Settings.SecurityLayer;
+            ddEncryptionLevel.SelectedValue = collection.Settings.EncryptionLevel;
         }
 
         private bool EditCollectionSettings()
@@ -165,6 +171,9 @@ namespace WebsitePanel.Portal.RDS
             }
 
             settings.ClientDeviceRedirectionOptions = string.Join(",", redirectionOptions.ToArray());
+            settings.AuthenticateUsingNLA = cbAuthentication.Checked;
+            settings.SecurityLayer = ddSecurityLayer.SelectedItem.Value;
+            settings.EncryptionLevel = ddEncryptionLevel.SelectedItem.Value;            
 
             return settings;
         }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionSettings.ascx.designer.cs

@@ -354,6 +354,69 @@ namespace WebsitePanel.Portal.RDS {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox tbMonitorsNumber;
         
+        /// <summary>
+        /// secRdsSecuritySettings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secRdsSecuritySettings;
+        
+        /// <summary>
+        /// panelRdsSecuritySettings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panelRdsSecuritySettings;
+        
+        /// <summary>
+        /// locSecurityLayer control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locSecurityLayer;
+        
+        /// <summary>
+        /// ddSecurityLayer control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddSecurityLayer;
+        
+        /// <summary>
+        /// locEncryptionLevel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locEncryptionLevel;
+        
+        /// <summary>
+        /// ddEncryptionLevel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddEncryptionLevel;
+        
+        /// <summary>
+        /// cbAuthentication control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox cbAuthentication;
+        
         /// <summary>
         /// buttonPanel control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx

@@ -1,4 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RDSCollectionApps.ascx.cs" Inherits="WebsitePanel.Portal.RDS.UserControls.RDSCollectionApps" %>
+<%@ Import Namespace="WebsitePanel.Portal" %>
 <%@ Register Src="../../UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
 
 <asp:UpdatePanel ID="RDAppsUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
@@ -29,6 +30,12 @@
                     <asp:HiddenField ID="hfRequiredCommandLine" runat="server"  Value='<%# Eval("RequiredCommandLine") %>'/>
 				</ItemTemplate>
 			</asp:TemplateField>  
+            <asp:TemplateField>
+                <ItemStyle Width="20px" />
+                <ItemTemplate>
+                    <asp:Image ID="UsersImage" ImageUrl='<%# PortalUtils.GetThemedImage("user_16.png")%>' runat="server" Visible='<%# Eval("Users") != null %>'/>
+                </ItemTemplate>
+            </asp:TemplateField>          
 		</Columns>
 	</asp:GridView>
     <br />