zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RDS fixes

Browse source
This commit is contained in:
vfedosevich 2015-03-11 01:09:08 -07:00
parent fd8ca11f38
commit 743563baa2
3 changed files with 71 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

110
WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
View file

@ -71,8 +71,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
private const string WspAdministratorsGroupDescription = "WSP RDS Collection Adminstrators"; private const string WspAdministratorsGroupDescription = "WSP RDS Collection Adminstrators";
private const string RdsCollectionUsersGroupDescription = "WSP RDS Collection Users"; private const string RdsCollectionUsersGroupDescription = "WSP RDS Collection Users";
private const string RdsCollectionComputersGroupDescription = "WSP RDS Collection Computers"; private const string RdsCollectionComputersGroupDescription = "WSP RDS Collection Computers";
private const string RdsServersOU = "RDSServers"; private const string RdsServersOU = "RDSServersOU";
private const string RdsServersRootOU = "RDSRootServers"; private const string RdsServersRootOU = "RDSRootServersOU";
private const string RDSHelpDeskComputerGroup = "Websitepanel-RDSHelpDesk-Computer"; private const string RDSHelpDeskComputerGroup = "Websitepanel-RDSHelpDesk-Computer";
private const string RDSHelpDeskGroup = "WSP-HelpDeskAdministrators"; private const string RDSHelpDeskGroup = "WSP-HelpDeskAdministrators";
private const string RDSHelpDeskGroupDescription = "WSP Help Desk Administrators"; private const string RDSHelpDeskGroupDescription = "WSP Help Desk Administrators";
@ -344,6 +344,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
//add session servers to group //add session servers to group
foreach (var rdsServer in collection.Servers) foreach (var rdsServer in collection.Servers)
{ {
MoveRdsServerToTenantOU(rdsServer.Name, organizationId);
AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, helpDeskGroupSamAccountName); AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, helpDeskGroupSamAccountName);
AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, localAdminsGroupSamAccountName); AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, localAdminsGroupSamAccountName);
AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer); AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer);
@ -1282,27 +1283,21 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
private void AddComputerToCollectionAdComputerGroup(string organizationId, string collectionName, RdsServer server) private void AddComputerToCollectionAdComputerGroup(string organizationId, string collectionName, RdsServer server)
{ {
var computerPath = GetComputerPath(server.Name, false);
var computerGroupName = GetComputersGroupName( collectionName); var computerGroupName = GetComputersGroupName( collectionName);
var computerObject = GetComputerObject(server.Name);
if (!ActiveDirectoryUtils.AdObjectExists(computerPath)) if (computerObject != null)
{ {
computerPath = GetComputerPath(server.Name, true);
}
if (ActiveDirectoryUtils.AdObjectExists(computerPath))
{
var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName"); var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
if (!ActiveDirectoryUtils.IsComputerInGroup(samName, computerGroupName)) if (!ActiveDirectoryUtils.IsComputerInGroup(samName, computerGroupName))
{ {
ActiveDirectoryUtils.AddObjectToGroup(computerPath, GetComputerGroupPath(organizationId, collectionName)); ActiveDirectoryUtils.AddObjectToGroup(computerObject.Path, GetComputerGroupPath(organizationId, collectionName));
} }
if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RDSHelpDeskComputerGroup)) if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RDSHelpDeskComputerGroup))
{ {
ActiveDirectoryUtils.AddObjectToGroup(computerPath, GetHelpDeskGroupPath(RDSHelpDeskComputerGroup)); ActiveDirectoryUtils.AddObjectToGroup(computerObject.Path, GetHelpDeskGroupPath(RDSHelpDeskComputerGroup));
} }
} }
@ -1311,29 +1306,23 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
private void RemoveComputerFromCollectionAdComputerGroup(string organizationId, string collectionName, RdsServer server) private void RemoveComputerFromCollectionAdComputerGroup(string organizationId, string collectionName, RdsServer server)
{ {
var computerPath = GetComputerPath(server.Name, false);
var computerGroupName = GetComputersGroupName(collectionName); var computerGroupName = GetComputersGroupName(collectionName);
var computerObject = GetComputerObject(server.Name);
if (!ActiveDirectoryUtils.AdObjectExists(computerPath)) if (computerObject != null)
{ {
computerPath = GetComputerPath(server.Name, true);
}
if (ActiveDirectoryUtils.AdObjectExists(computerPath))
{
var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName"); var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
if (ActiveDirectoryUtils.IsComputerInGroup(samName, computerGroupName)) if (ActiveDirectoryUtils.IsComputerInGroup(samName, computerGroupName))
{ {
ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetComputerGroupPath(organizationId, collectionName)); ActiveDirectoryUtils.RemoveObjectFromGroup(computerObject.Path, GetComputerGroupPath(organizationId, collectionName));
} }
if (ActiveDirectoryUtils.AdObjectExists(GetHelpDeskGroupPath(RDSHelpDeskComputerGroup))) if (ActiveDirectoryUtils.AdObjectExists(GetHelpDeskGroupPath(RDSHelpDeskComputerGroup)))
{ {
if (ActiveDirectoryUtils.IsComputerInGroup(samName, RDSHelpDeskComputerGroup)) if (ActiveDirectoryUtils.IsComputerInGroup(samName, RDSHelpDeskComputerGroup))
{ {
ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetHelpDeskGroupPath(RDSHelpDeskComputerGroup)); ActiveDirectoryUtils.RemoveObjectFromGroup(computerObject.Path, GetHelpDeskGroupPath(RDSHelpDeskComputerGroup));
} }
} }
} }
@ -1372,7 +1361,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
{ {
if (ActiveDirectoryUtils.AdObjectExists(computersRootPath) && !ActiveDirectoryUtils.AdObjectExists(GetRdsServersGroupPath())) if (ActiveDirectoryUtils.AdObjectExists(computersRootPath) && !ActiveDirectoryUtils.AdObjectExists(GetRdsServersGroupPath()))
{ {
ActiveDirectoryUtils.CreateGroup(computersRootPath, RdsServersRootOU); //ActiveDirectoryUtils.CreateGroup(computersRootPath, RdsServersRootOU);
ActiveDirectoryUtils.CreateOrganizationalUnit(RdsServersRootOU, computersRootPath);
} }
} }
@ -1382,11 +1372,10 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
if (!ActiveDirectoryUtils.AdObjectExists(tenantComputerGroupPath)) if (!ActiveDirectoryUtils.AdObjectExists(tenantComputerGroupPath))
{ {
ActiveDirectoryUtils.CreateGroup(GetOrganizationPath(organizationId), RdsServersOU); ActiveDirectoryUtils.CreateOrganizationalUnit(RdsServersOU, GetOrganizationPath(organizationId));
} }
hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), ""); hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), "");
var computerPath = GetComputerPath(hostName, true);
var rootComputerPath = GetRdsServerPath(hostName); var rootComputerPath = GetRdsServerPath(hostName);
var tenantComputerPath = GetTenantComputerPath(hostName, organizationId); var tenantComputerPath = GetTenantComputerPath(hostName, organizationId);
@ -1395,30 +1384,16 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
CheckOrCreateComputersRoot(GetComputersRootPath()); CheckOrCreateComputersRoot(GetComputersRootPath());
} }
if(!ActiveDirectoryUtils.AdObjectExists(computerPath)) var computerObject = GetComputerObject(hostName);
{
computerPath = GetComputerPath(hostName, false);
}
if (ActiveDirectoryUtils.AdObjectExists(computerPath)) if (computerObject != null)
{ {
var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName"); var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
if (!string.IsNullOrEmpty(ComputersRootOU))
{
if (ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersRootOU))
{
ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetRdsServersGroupPath());
}
}
if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersOU)) if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersOU))
{ {
DirectoryEntry group = new DirectoryEntry(tenantComputerGroupPath); DirectoryEntry group = new DirectoryEntry(tenantComputerGroupPath);
group.Invoke("Add", computerObject.Path); computerObject.MoveTo(group);
group.CommitChanges();
} }
} }
} }
@ -1427,37 +1402,27 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
{ {
var tenantComputerGroupPath = GetTenantComputerGroupPath(organizationId); var tenantComputerGroupPath = GetTenantComputerGroupPath(organizationId);
hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), ""); hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), "");
var tenantComputerPath = GetTenantComputerPath(hostName, organizationId);
var rootComputerPath = GetRdsServerPath(hostName);
if (!string.IsNullOrEmpty(ComputersRootOU)) if (!string.IsNullOrEmpty(ComputersRootOU))
{ {
CheckOrCreateComputersRoot(GetComputersRootPath()); CheckOrCreateComputersRoot(GetComputersRootPath());
} }
var computerPath = GetComputerPath(hostName, true); if (!ActiveDirectoryUtils.AdObjectExists(tenantComputerGroupPath))
if (!ActiveDirectoryUtils.AdObjectExists(computerPath))
{ {
computerPath = GetComputerPath(hostName, false); ActiveDirectoryUtils.CreateOrganizationalUnit(RdsServersOU, GetOrganizationPath(organizationId));
} }
if (ActiveDirectoryUtils.AdObjectExists(computerPath)) var computerObject = GetComputerObject(hostName);
if (computerObject != null)
{ {
var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName"); var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
if (ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersOU))
{
ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, tenantComputerGroupPath);
}
if (ActiveDirectoryUtils.AdObjectExists(GetComputersRootPath()) && !string.IsNullOrEmpty(ComputersRootOU) && !ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersRootOU)) if (ActiveDirectoryUtils.AdObjectExists(GetComputersRootPath()) && !string.IsNullOrEmpty(ComputersRootOU) && !ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersRootOU))
{ {
DirectoryEntry group = new DirectoryEntry(GetRdsServersGroupPath()); DirectoryEntry group = new DirectoryEntry(GetRdsServersGroupPath());
group.Invoke("Add", computerObject.Path); computerObject.MoveTo(group);
group.CommitChanges();
} }
} }
} }
@ -1744,25 +1709,16 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
return sb.ToString(); return sb.ToString();
} }
private string GetComputerPath(string objName, bool domainController) private DirectoryEntry GetComputerObject(string computerName)
{ {
StringBuilder sb = new StringBuilder(); DirectorySearcher deSearch = new DirectorySearcher
// append provider
AppendProtocol(sb);
AppendDomainController(sb);
AppendCNPath(sb, objName);
if (domainController)
{ {
AppendOUPath(sb, AdDcComputers); Filter = string.Format("(&(objectCategory=computer)(name={0}))", computerName)
} };
else
{
AppendCNPath(sb, Computers);
} SearchResult results = deSearch.FindOne();
AppendDomainPath(sb, RootDomain);
return sb.ToString(); return results.GetDirectoryEntry();
} }
private string GetTenantComputerPath(string objName, string organizationId) private string GetTenantComputerPath(string objName, string organizationId)
@ -1772,7 +1728,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
AppendProtocol(sb); AppendProtocol(sb);
AppendDomainController(sb); AppendDomainController(sb);
AppendCNPath(sb, objName); AppendCNPath(sb, objName);
AppendCNPath(sb, RdsServersOU); AppendOUPath(sb, RdsServersOU);
AppendOUPath(sb, organizationId); AppendOUPath(sb, organizationId);
AppendOUPath(sb, RootOU); AppendOUPath(sb, RootOU);
AppendDomainPath(sb, RootDomain); AppendDomainPath(sb, RootDomain);
@ -1798,7 +1754,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
AppendProtocol(sb); AppendProtocol(sb);
AppendDomainController(sb); AppendDomainController(sb);
AppendCNPath(sb, RdsServersRootOU); AppendOUPath(sb, RdsServersRootOU);
AppendOUPath(sb, ComputersRootOU); AppendOUPath(sb, ComputersRootOU);
AppendDomainPath(sb, RootDomain); AppendDomainPath(sb, RootDomain);
@ -1812,7 +1768,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
AppendProtocol(sb); AppendProtocol(sb);
AppendDomainController(sb); AppendDomainController(sb);
AppendCNPath(sb, name); AppendCNPath(sb, name);
AppendCNPath(sb, RdsServersRootOU); AppendOUPath(sb, RdsServersRootOU);
AppendOUPath(sb, ComputersRootOU); AppendOUPath(sb, ComputersRootOU);
AppendDomainPath(sb, RootDomain); AppendDomainPath(sb, RootDomain);
@ -1836,7 +1792,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
AppendProtocol(sb); AppendProtocol(sb);
AppendDomainController(sb); AppendDomainController(sb);
AppendCNPath(sb, RdsServersOU); AppendOUPath(sb, RdsServersOU);
AppendOUPath(sb, organizationId); AppendOUPath(sb, organizationId);
AppendOUPath(sb, RootOU); AppendOUPath(sb, RootOU);
AppendDomainPath(sb, RootDomain); AppendDomainPath(sb, RootDomain);

6
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
View file

@ -77,6 +77,12 @@ namespace WebsitePanel.Portal.RDS
{ {
usersQuota.QuotaAvailable = tenantStats.AllocatedRdsUsers - tenantStats.CreatedRdsUsers; usersQuota.QuotaAvailable = tenantStats.AllocatedRdsUsers - tenantStats.CreatedRdsUsers;
} }
if (cntx.Quotas.ContainsKey(Quotas.RDS_USERS))
{
int rdsUsersCount = ES.Services.RDS.GetOrganizationRdsUsersCount(PanelRequest.ItemID);
users.ButtonAddEnabled = (!(cntx.Quotas[Quotas.RDS_USERS].QuotaAllocatedValue <= rdsUsersCount) || (cntx.Quotas[Quotas.RDS_USERS].QuotaAllocatedValue == -1));
}
} }
private bool SaveRdsUsers() private bool SaveRdsUsers()

19
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
View file

@ -42,6 +42,18 @@ namespace WebsitePanel.Portal.RDS.UserControls
{ {
public const string DirectionString = "DirectionString"; public const string DirectionString = "DirectionString";
public bool ButtonAddEnabled
{
get
{
return btnAdd.Enabled;
}
set
{
btnAdd.Enabled = value;
}
}
protected enum SelectedState protected enum SelectedState
{ {
All, All,
@ -75,13 +87,6 @@ namespace WebsitePanel.Portal.RDS.UserControls
Page.ClientScript.RegisterClientScriptBlock(typeof(RDSCollectionUsers), "SelectAllCheckboxes", Page.ClientScript.RegisterClientScriptBlock(typeof(RDSCollectionUsers), "SelectAllCheckboxes",
script, true); script, true);
} }
PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
if (cntx.Quotas.ContainsKey(Quotas.RDS_USERS))
{
int rdsUsersCount = ES.Services.RDS.GetOrganizationRdsUsersCount(PanelRequest.ItemID);
btnAdd.Enabled = (!(cntx.Quotas[Quotas.RDS_USERS].QuotaAllocatedValue <= rdsUsersCount) || (cntx.Quotas[Quotas.RDS_USERS].QuotaAllocatedValue == -1));
}
} }
protected void btnAdd_Click(object sender, EventArgs e) protected void btnAdd_Click(object sender, EventArgs e)