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

webdav portal fixes

Browse source
This commit is contained in:
vfedosevich 2015-04-15 06:54:26 -07:00
parent 84f9f63407
commit e97f71d30e
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
View file

@ -294,13 +294,10 @@ namespace WebsitePanel.WebDav.Core.Managers
foreach (var folder in WSP.Services.EnterpriseStorage.GetEnterpriseFolders(WspContext.User.ItemId)) foreach (var folder in WSP.Services.EnterpriseStorage.GetEnterpriseFolders(WspContext.User.ItemId))
{ {
var permissions = WSP.Services.EnterpriseStorage.GetEnterpriseFolderPermissions(WspContext.User.ItemId, folder.Name); foreach (var rule in folder.Rules)
foreach (var permission in permissions)
{ {
if ((!permission.IsGroup if ((rule.Users.Any(x=> string.Compare(x, user.AccountName, StringComparison.InvariantCultureIgnoreCase) == 0))
&& (permission.DisplayName == user.UserName || permission.DisplayName == user.DisplayName)) || (userGroups.Any(x => rule.Roles.Any(r => string.Compare(r, x.AccountName, StringComparison.InvariantCultureIgnoreCase) == 0))))
|| (permission.IsGroup && userGroups.Any(x => x.DisplayName == permission.DisplayName)))
{ {
rootFolders.Add(folder); rootFolders.Add(folder);
break; break;

1
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs
View file

@ -40,6 +40,7 @@ namespace WebsitePanel.WebDav.Core.Security.Authentication
principal.ItemId = exchangeAccount.ItemId; principal.ItemId = exchangeAccount.ItemId;
principal.OrganizationId = organization.OrganizationId; principal.OrganizationId = organization.OrganizationId;
principal.DisplayName = exchangeAccount.DisplayName; principal.DisplayName = exchangeAccount.DisplayName;
principal.AccountName = exchangeAccount.AccountName;
principal.EncryptedPassword = _cryptography.Encrypt(password); principal.EncryptedPassword = _cryptography.Encrypt(password);
if (HttpContext.Current != null) if (HttpContext.Current != null)

1
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/Principals/WspPrincipal.cs
View file

@ -14,6 +14,7 @@ namespace WebsitePanel.WebDav.Core.Security.Authentication.Principals
public string Login { get; set; } public string Login { get; set; }
public string DisplayName { get; set; } public string DisplayName { get; set; }
public string AccountName { get; set; }
public string UserName public string UserName
{ {