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

web portal folder permission fix

Browse source
This commit is contained in:
vfedosevich 2015-01-10 06:00:59 -08:00
parent 833b7c1aa4
commit 5d37adf09b
7 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs
View file

@ -61,6 +61,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
Session[WebDavAppConfigManager.Instance.SessionKeys.ItemId] = exchangeAccount.ItemId;
model.Groups = ES.Services.Organizations.GetSecurityGroupsByMember(exchangeAccount.ItemId, exchangeAccount.AccountId);
model.DisplayName = exchangeAccount.DisplayName;
WebDavManager manager = null;

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs
View file

@ -18,6 +18,8 @@ namespace WebsitePanel.WebDavPortal
BundleConfig.RegisterBundles(BundleTable.Bundles);
DependencyResolver.SetResolver(new NinjectDependecyResolver());
log4net.Config.XmlConfigurator.Configure();
}
protected void Application_Error(object sender, EventArgs e)

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs
View file

@ -23,6 +23,8 @@ namespace WebsitePanel.WebDavPortal.Models
}
}
public string DisplayName { get; set; }
public IEnumerable<ExchangeAccount> Groups { get; set; }
public string LdapError { get; set; }

8
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs
View file

@ -12,13 +12,16 @@ using WebsitePanel.Providers.OS;
using Ninject;
using WebsitePanel.WebDavPortal.DependencyInjection;
using System.Web.Mvc;
using log4net;
namespace WebsitePanel.WebDavPortal.Models
{
public class WebDavManager : IWebDavManager
{
private readonly WebDavSession _webDavSession = new WebDavSession();
private readonly AccountModel _accountModel;
private readonly ILog Log;
private IList<SystemFile> _rootFolders;
private int _itemId;
@ -40,6 +43,7 @@ namespace WebsitePanel.WebDavPortal.Models
public WebDavManager(NetworkCredential credential, int itemId)
{
_accountModel = DependencyResolver.Current.GetService<AccountModel>();
Log = LogManager.GetLogger(this.GetType());
_webDavSession.Credentials = credential;
_itemId = itemId;
@ -132,13 +136,15 @@ namespace WebsitePanel.WebDavPortal.Models
private IList<SystemFile> ConnectToWebDavServer(AccountModel user)
{
var rootFolders = new List<SystemFile>();
foreach (var folder in ES.Services.EnterpriseStorage.GetEnterpriseFolders(_itemId))
{
var permissions = ES.Services.EnterpriseStorage.GetEnterpriseFolderPermissions(_itemId, folder.Name);
foreach (var permission in permissions)
{
if ((!permission.IsGroup && permission.DisplayName == user.UserName)
if ((!permission.IsGroup
&& (permission.DisplayName == user.UserName || permission.DisplayName == user.DisplayName))
|| (permission.IsGroup && user.Groups.Any(x=> x.DisplayName == permission.DisplayName)))
{
rootFolders.Add(folder);

17
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
View file

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=301880
@ -6,7 +6,22 @@
<configuration>
<configSections>
<section name="webDavExplorerConfigurationSettings" type="WebsitePanel.WebDavPortal.WebConfigSections.WebDavExplorerConfigurationSettingsSection" allowLocation="true" allowDefinition="Everywhere" />
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<log4net>
<appender name="FileAppender" type="log4net.Appender.FileAppender">
<param name="File" value="Logs\log-debug.log" />
<param name="AppendToFile" value="true" />
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d %-5p %c - %m%n" />
</layout>
</appender>
<root>
<level value="DEBUG" />
<appender-ref ref="FileAppender" />
</root>
</log4net>
<appSettings>
<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>

3
WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
View file

@ -48,6 +48,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Services3">
<HintPath>..\..\Lib\Microsoft.Web.Services3.dll</HintPath>

1
WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config
View file

@ -4,6 +4,7 @@
<package id="bootstrap" version="3.3.0" targetFramework="net45" />
<package id="jQuery" version="2.1.1" targetFramework="net45" />
<package id="jQuery.Validation" version="1.13.1" targetFramework="net45" />
<package id="log4net" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />