From c32aafcaac0d002487b40859a631d86e3f488603 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 6 Jan 2015 05:58:18 -0800 Subject: [PATCH 01/23] Domain expiration sub domain fix --- .../SchedulerTasks/DomainExpirationTask.cs | 13 ++++++------- .../Servers/ServerController.cs | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs index b6c9c613..5ca21217 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2015, Outercurve Foundation. +// Copyright (c) 2015, Outercurve Foundation. // All rights reserved. // // Redistribution and use in source and binary forms, with or without modification, @@ -57,7 +57,7 @@ namespace WebsitePanel.EnterpriseServer { BackgroundTask topTask = TaskManager.TopTask; var domainUsers = new Dictionary(); - var checkedDomains = new List(); + var checkedDomains = new List(); var expiredDomains = new List(); var nonExistenDomains = new List(); var allDomains = new List(); @@ -101,12 +101,12 @@ namespace WebsitePanel.EnterpriseServer foreach (var domain in domains) { - if (checkedDomains.Contains(domain.DomainId)) + if (checkedDomains.Any(x=> x.DomainId == domain.DomainId)) { continue; } - checkedDomains.Add(domain.DomainId); + checkedDomains.Add(domain); ServerController.UpdateDomainWhoisData(domain); @@ -124,12 +124,11 @@ namespace WebsitePanel.EnterpriseServer } } - var subDomains = allDomains.Where(x => x.ExpirationDate == null || CheckDomainExpiration(x.ExpirationDate, daysBeforeNotify)).GroupBy(p => p.DomainId).Select(g => g.First()).ToList(); - allTopLevelDomains = allTopLevelDomains.GroupBy(p => p.DomainId).Select(g => g.First()).ToList(); + var subDomains = allDomains.Where(x => !checkedDomains.Any(z => z.DomainId == x.DomainId)).GroupBy(p => p.DomainId).Select(g => g.First()).ToList(); foreach (var subDomain in subDomains) { - var mainDomain = allTopLevelDomains.Where(x => subDomain.DomainId != x.DomainId && subDomain.DomainName.ToLowerInvariant().Contains(x.DomainName.ToLowerInvariant())).OrderByDescending(s => s.DomainName.Length).FirstOrDefault(); ; + var mainDomain = checkedDomains.Where(x => subDomain.DomainId != x.DomainId && subDomain.DomainName.ToLowerInvariant().Contains(x.DomainName.ToLowerInvariant())).OrderByDescending(s => s.DomainName.Length).FirstOrDefault(); ; if (mainDomain != null) { diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs index d0d17ade..c9aec104 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs @@ -2709,6 +2709,7 @@ namespace WebsitePanel.EnterpriseServer domain.CreationDate = ParseDate(creationDateString); domain.ExpirationDate = ParseDate(expirationDateString); domain.RegistrarName = ParseWhoisDomainInfo(whoisResult.Raw, _registrarNamePatterns); + domain.LastUpdateDate = DateTime.Now; DataProvider.UpdateWhoisDomainInfo(domain.DomainId, domain.CreationDate, domain.ExpirationDate, DateTime.Now, domain.RegistrarName); } @@ -2727,6 +2728,7 @@ namespace WebsitePanel.EnterpriseServer domain.CreationDate = creationDate; domain.ExpirationDate = expirationDate; domain.RegistrarName = registrarName; + domain.LastUpdateDate = DateTime.Now; return domain; } From 8f31f63054df3778ec73978a12fbee2f43ccee1c Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 6 Jan 2015 06:17:11 -0800 Subject: [PATCH 02/23] Domain expiration task subdomains fix --- .../SchedulerTasks/DomainExpirationTask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs index 5ca21217..be4f50a3 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs @@ -124,7 +124,7 @@ namespace WebsitePanel.EnterpriseServer } } - var subDomains = allDomains.Where(x => !checkedDomains.Any(z => z.DomainId == x.DomainId)).GroupBy(p => p.DomainId).Select(g => g.First()).ToList(); + var subDomains = allDomains.Where(x => !checkedDomains.Any(z => z.DomainId == x.DomainId && z.ExpirationDate != null)).GroupBy(p => p.DomainId).Select(g => g.First()).ToList(); foreach (var subDomain in subDomains) { From 2ec10f698830563da1d566e4711331b79a9a9e5c Mon Sep 17 00:00:00 2001 From: "a.skorina" Date: Fri, 9 Jan 2015 11:48:38 +0300 Subject: [PATCH 03/23] webdav portal web.config file added to ignore --- .../Config/Entities/ElementsRendering.cs | 7 ++++++- .../Controllers/FileSystemController.cs | 3 ++- WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config | 2 +- .../WebConfigSections/ElementsRenderingElement.cs | 8 ++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/ElementsRendering.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/ElementsRendering.cs index 04a1105d..c5703a8a 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/ElementsRendering.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/ElementsRendering.cs @@ -1,14 +1,19 @@ -namespace WebsitePanel.WebDavPortal.Config.Entities +using System.Collections.Generic; +using System.Linq; + +namespace WebsitePanel.WebDavPortal.Config.Entities { public class ElementsRendering : AbstractConfigCollection { public int DefaultCount { get; private set; } public int AddElementsCount { get; private set; } + public List ElementsToIgnore { get; private set; } public ElementsRendering() { DefaultCount = ConfigSection.ElementsRendering.DefaultCount; AddElementsCount = ConfigSection.ElementsRendering.AddElementsCount; + ElementsToIgnore = ConfigSection.ElementsRendering.ElementsToIgnore.Split(',').ToList(); } } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs index c8d77ab4..482a1fea 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs @@ -41,7 +41,8 @@ namespace WebsitePanel.WebDavPortal.Controllers try { webDavManager.OpenFolder(pathPart); - IEnumerable children = webDavManager.GetChildren(); + IEnumerable children = webDavManager.GetChildren().Where(x => !WebDavAppConfigManager.Instance.ElementsRendering.ElementsToIgnore.Contains(x.DisplayName.Trim('/'))); + var model = new ModelForWebDav { Items = children.Take(WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount), UrlSuffix = pathPart }; Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount] = WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config index 8fdb594d..c45fcad6 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config @@ -24,7 +24,7 @@ - + diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ElementsRenderingElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ElementsRenderingElement.cs index 996d4a30..a5a9a6ce 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ElementsRenderingElement.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ElementsRenderingElement.cs @@ -6,6 +6,7 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections { private const string DefaultCountKey = "defaultCount"; private const string AddElementsCountKey = "addElementsCount"; + private const string ElementsToIgnoreKey = "elementsToIgnoreKey"; [ConfigurationProperty(DefaultCountKey, IsKey = true, IsRequired = true, DefaultValue = 30)] public int DefaultCount @@ -20,5 +21,12 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections get { return (int)this[AddElementsCountKey]; } set { this[AddElementsCountKey] = value; } } + + [ConfigurationProperty(ElementsToIgnoreKey, IsKey = true, IsRequired = true, DefaultValue = "")] + public string ElementsToIgnore + { + get { return (string)this[ElementsToIgnoreKey]; } + set { this[ElementsToIgnoreKey] = value; } + } } } \ No newline at end of file From e4785dabca2533e36630fb23de1bc6d545fafae0 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Fri, 9 Jan 2015 04:52:51 -0800 Subject: [PATCH 04/23] webdav portal group permission fix added logout button --- .../App_Start/RouteConfig.cs | 13 +++++++++++++ .../WebsitePanel.WebDavPortal/Content/Site.css | 15 ++++++++++++++- .../Controllers/AccountController.cs | 13 ++++++++++++- .../Models/AccountModel.cs | 6 +++++- .../Models/WebDavManager.cs | 16 ++++++++++++---- .../UI/Routes/AccountRouteNames.cs | 13 +++++++++++++ .../Views/Shared/_Layout.cshtml | 6 ++++-- .../WebsitePanel.WebDavPortal.csproj | 2 ++ 8 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/AccountRouteNames.cs diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs index c7b92062..3316d657 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs @@ -1,5 +1,6 @@ using System.Web.Mvc; using System.Web.Routing; +using WebsitePanel.WebDavPortal.UI.Routes; namespace WebsitePanel.WebDavPortal { @@ -9,6 +10,18 @@ namespace WebsitePanel.WebDavPortal { routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); + routes.MapRoute( + name: AccountRouteNames.Logout, + url: "account/logout", + defaults: new { controller = "Account", action = "Logout" } + ); + + routes.MapRoute( + name: AccountRouteNames.Login, + url: "account/login", + defaults: new { controller = "Account", action = "Login" } + ); + routes.MapRoute( name: "Office365DocumentRoute", url: "office365/{org}/{*pathPart}", diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css index 20e5c6b1..2389aea4 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css @@ -32,4 +32,17 @@ textarea { color: red; font-weight: bold; padding-top: 5px; - } \ No newline at end of file + } + +#username { + display:inline-block; +} + +#logout { + font-size: 1.2em; + color: #9d9d9d; +} + +#logout :hover { + color: white; +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs index 242cd617..b95f91d6 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs @@ -22,6 +22,7 @@ using WebsitePanel.WebDavPortal.Models; using System.Collections.Generic; using WebsitePanel.Providers.OS; using WebDAV; +using WebsitePanel.WebDavPortal.UI.Routes; namespace WebsitePanel.WebDavPortal.Controllers { @@ -50,7 +51,9 @@ namespace WebsitePanel.WebDavPortal.Controllers if (isAuthenticated) { Session[WebDavAppConfigManager.Instance.SessionKeys.ItemId] = exchangeAccount.ItemId; - + + model.Groups = ES.Services.Organizations.GetSecurityGroupsByMember(exchangeAccount.ItemId, exchangeAccount.AccountId); + try { Session[WebDavAppConfigManager.Instance.SessionKeys.AccountInfo] = model; @@ -65,6 +68,14 @@ namespace WebsitePanel.WebDavPortal.Controllers return View(new AccountModel { LdapError = "The user name or password is incorrect" }); } + [HttpGet] + public ActionResult Logout() + { + Session[WebDavAppConfigManager.Instance.SessionKeys.AccountInfo] = null; + + return RedirectToRoute(AccountRouteNames.Login); + } + private void AutheticationToServicesUsingWebsitePanelUser() { var crypto = _kernel.Get(); diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs index 72956e73..2ad1e6a8 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs @@ -1,4 +1,6 @@ -using System.ComponentModel.DataAnnotations; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using WebsitePanel.Providers.HostedSolution; namespace WebsitePanel.WebDavPortal.Models { @@ -21,6 +23,8 @@ namespace WebsitePanel.WebDavPortal.Models } } + public IEnumerable Groups { get; set; } + public string LdapError { get; set; } } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs index 05f578d8..319a54bb 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs @@ -40,7 +40,7 @@ namespace WebsitePanel.WebDavPortal.Models _itemId = itemId; IKernel _kernel = new StandardKernel(new NinjectSettings { AllowNullInjection = true }, new WebDavExplorerAppModule()); var accountModel = _kernel.Get(); - _rootFolders = ConnectToWebDavServer(accountModel.UserName); + _rootFolders = ConnectToWebDavServer(accountModel); if (_rootFolders.Any()) { @@ -126,14 +126,22 @@ namespace WebsitePanel.WebDavPortal.Models } } - private IList ConnectToWebDavServer(string userName) + private IList ConnectToWebDavServer(AccountModel user) { var rootFolders = new List(); foreach (var folder in ES.Services.EnterpriseStorage.GetEnterpriseFolders(_itemId)) { var permissions = ES.Services.EnterpriseStorage.GetEnterpriseFolderPermissions(_itemId, folder.Name); - if (permissions.Any(x => x.DisplayName == userName)) - rootFolders.Add(folder); + + foreach (var permission in permissions) + { + if ((!permission.IsGroup && permission.DisplayName == user.UserName) + || (permission.IsGroup && user.Groups.Any(x=> x.DisplayName == permission.DisplayName))) + { + rootFolders.Add(folder); + break; + } + } } return rootFolders; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/AccountRouteNames.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/AccountRouteNames.cs new file mode 100644 index 00000000..035fde95 --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/AccountRouteNames.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebsitePanel.WebDavPortal.UI.Routes +{ + public class AccountRouteNames + { + public const string Logout = "AccountLogout"; + public const string Login = "AccountLogin"; + } +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml index 6162ed3a..a03b50f7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml @@ -2,6 +2,7 @@ @using WebsitePanel.WebDavPortal.Config @using WebsitePanel.WebDavPortal.DependencyInjection @using WebsitePanel.WebDavPortal.Models +@using WebsitePanel.WebDavPortal.UI.Routes; @@ -28,9 +29,10 @@ var account = kernel.Get(); if (account != null) { -

@account.UserName

+ +

@account.UserName

} - } +} diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj index 5b2ea9ec..f49ff0d3 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj @@ -179,6 +179,7 @@ + @@ -289,6 +290,7 @@ GlobalResourceProxyGenerator Resource.errors.designer.cs + Designer From 6e6b2abd8a82b399cf48ea8a1c301143ac32174c Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Fri, 9 Jan 2015 23:29:10 -0800 Subject: [PATCH 05/23] webdav portal home link added to logo --- .../WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs | 8 ++++++-- .../WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml | 2 +- .../WebsitePanel.WebDavPortal.csproj | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs index 3316d657..65491262 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs @@ -10,6 +10,8 @@ namespace WebsitePanel.WebDavPortal { routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); + #region Account + routes.MapRoute( name: AccountRouteNames.Logout, url: "account/logout", @@ -20,7 +22,9 @@ namespace WebsitePanel.WebDavPortal name: AccountRouteNames.Login, url: "account/login", defaults: new { controller = "Account", action = "Login" } - ); + ); + + #endregion routes.MapRoute( name: "Office365DocumentRoute", @@ -29,7 +33,7 @@ namespace WebsitePanel.WebDavPortal ); routes.MapRoute( - name: "FilePathRoute", + name: FileSystemRouteNames.FilePath, url: "{org}/{*pathPart}", defaults: new { controller = "FileSystem", action = "ShowContent", pathPart = UrlParameter.Optional }, constraints: new { org = new WebsitePanel.WebDavPortal.Constraints.OrganizationRouteConstraint() } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml index a03b50f7..323bb3a5 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml @@ -21,7 +21,7 @@ - @Html.ActionLink(WebDavAppConfigManager.Instance.ApplicationName, "Login", "Account", new { area = "" }, new { @class = "navbar-brand" }) + @Html.RouteLink(WebDavAppConfigManager.Instance.ApplicationName, FileSystemRouteNames.FilePath, new { pathPart = string.Empty }, new { @class = "navbar-brand" })
@{ diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj index f49ff0d3..4c3e95e3 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj @@ -180,6 +180,7 @@ + From 2244ce5add2910a87f808229591141b9b9328e7f Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Sat, 10 Jan 2015 00:49:29 -0800 Subject: [PATCH 06/23] webdav portal Dependency resolver added --- .../OrganizationRouteConstraint.cs | 7 ++-- .../Controllers/AccountController.cs | 32 +++++++++++++---- .../Controllers/FileSystemController.cs | 27 ++++++++------ .../LdapAuthorizationAttribute.cs | 10 ++++-- .../NinjectDependecyResolver.cs | 35 +++++++++++++++++++ .../DependencyInjection/PortalDependencies.cs | 23 ++++++++++++ .../Providers/AccountInfoProvider.cs | 25 +++++++++++++ .../Providers/HttpSessionStateProvider.cs | 17 +++++++++ .../Providers/WebDavManagerProvider.cs | 25 +++++++++++++ .../WebsitePanel.WebDavPortal/Global.asax.cs | 3 ++ .../Models/WebDavManager.cs | 9 +++-- .../UI/Routes/FileSystemRouteNames.cs | 12 +++++++ .../Views/FileSystem/ShowContent.cshtml | 2 +- .../Views/FileSystem/_ResoursePartial.cshtml | 3 +- .../Views/Shared/_Layout.cshtml | 7 ++-- .../WebsitePanel.WebDavPortal.csproj | 8 +++-- 16 files changed, 210 insertions(+), 35 deletions(-) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/NinjectDependecyResolver.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/PortalDependencies.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/AccountInfoProvider.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/HttpSessionStateProvider.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/WebDavManagerProvider.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/FileSystemRouteNames.cs diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constraints/OrganizationRouteConstraint.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constraints/OrganizationRouteConstraint.cs index 95e95750..65165a0c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constraints/OrganizationRouteConstraint.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constraints/OrganizationRouteConstraint.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; +using System.Web.Mvc; using System.Web.Routing; using WebsitePanel.WebDavPortal.Config; using WebsitePanel.WebDavPortal.DependencyInjection; @@ -16,6 +17,8 @@ namespace WebsitePanel.WebDavPortal.Constraints public bool Match(HttpContextBase httpContext, Route route, string parameterName, RouteValueDictionary values, RouteDirection routeDirection) { + var webdavManager = DependencyResolver.Current.GetService(); + object value; if (!values.TryGetValue(parameterName, out value)) return false; @@ -30,9 +33,7 @@ namespace WebsitePanel.WebDavPortal.Constraints if (httpContext.Session == null) return false; - IKernel kernel = new StandardKernel(new WebDavExplorerAppModule()); - var webDavManager = kernel.Get(); - if (webDavManager != null && str == webDavManager.OrganizationName) + if (webdavManager != null && str == webdavManager.OrganizationName) { actualOrgName = str; return true; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs index b95f91d6..7c9f5602 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs @@ -28,13 +28,21 @@ namespace WebsitePanel.WebDavPortal.Controllers { public class AccountController : Controller { - private readonly IKernel _kernel = new StandardKernel(new NinjectSettings {AllowNullInjection = true}, new WebDavExplorerAppModule()); + private readonly AccountModel _accountModel; + private readonly IWebDavManager _webdavManager; + private readonly ICryptography _cryptography; + + public AccountController(AccountModel accountModel, IWebDavManager webdavManager, ICryptography cryptography) + { + _accountModel = accountModel; + _webdavManager = webdavManager; + _cryptography = cryptography; + } [HttpGet] public ActionResult Login() { - object isAuthentication = _kernel.Get(); - if (isAuthentication != null) + if (_accountModel != null) return RedirectToAction("ShowContent", "FileSystem"); return View(); } @@ -54,16 +62,22 @@ namespace WebsitePanel.WebDavPortal.Controllers model.Groups = ES.Services.Organizations.GetSecurityGroupsByMember(exchangeAccount.ItemId, exchangeAccount.AccountId); + WebDavManager manager = null; + try { Session[WebDavAppConfigManager.Instance.SessionKeys.AccountInfo] = model; - Session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] = new WebDavManager(new NetworkCredential(model.Login, model.Password, WebDavAppConfigManager.Instance.UserDomain), exchangeAccount.ItemId); + + manager = new WebDavManager(new NetworkCredential(model.Login, model.Password, WebDavAppConfigManager.Instance.UserDomain), exchangeAccount.ItemId); + + Session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] = manager; } catch (ConnectToWebDavServerException exception) { return View(new AccountModel { LdapError = exception.Message }); } - return RedirectToAction("ShowContent", "FileSystem", new { org = _kernel.Get().OrganizationName }); + + return RedirectToAction("ShowContent", "FileSystem", new { org = manager.OrganizationName }); } return View(new AccountModel { LdapError = "The user name or password is incorrect" }); } @@ -78,15 +92,19 @@ namespace WebsitePanel.WebDavPortal.Controllers private void AutheticationToServicesUsingWebsitePanelUser() { - var crypto = _kernel.Get(); var websitePanelLogin = WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Login; - var websitePanelPassword = crypto.Decrypt(WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Password); + var websitePanelPassword = _cryptography.Decrypt(WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Password); + var authTicket = new FormsAuthenticationTicket(1, websitePanelLogin, DateTime.Now, DateTime.Now.Add(FormsAuthentication.Timeout), FormsAuthentication.SlidingExpiration, websitePanelPassword + Environment.NewLine); var encryptedTicket = FormsAuthentication.Encrypt(authTicket); var authCookie = new HttpCookie(FormsAuthentication.FormsCookieName, encryptedTicket); + if (FormsAuthentication.SlidingExpiration) + { authCookie.Expires = authTicket.Expiration; + } + Response.Cookies.Add(authCookie); } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs index 482a1fea..81a54ce1 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs @@ -22,26 +22,30 @@ namespace WebsitePanel.WebDavPortal.Controllers [LdapAuthorization] public class FileSystemController : Controller { - private readonly IKernel _kernel = new StandardKernel(new WebDavExplorerAppModule()); + private readonly IWebDavManager _webdavManager; + + public FileSystemController(IWebDavManager webdavManager) + { + _webdavManager = webdavManager; + } [HttpGet] public ActionResult ShowContent(string org, string pathPart = "") { - var webDavManager = new StandardKernel(new WebDavExplorerAppModule()).Get(); - if (org != webDavManager.OrganizationName) + if (org != _webdavManager.OrganizationName) return new HttpStatusCodeResult(HttpStatusCode.NoContent); string fileName = pathPart.Split('/').Last(); - if (webDavManager.IsFile(fileName)) + if (_webdavManager.IsFile(fileName)) { - var fileBytes = webDavManager.GetFileBytes(fileName); + var fileBytes = _webdavManager.GetFileBytes(fileName); return File(fileBytes, MediaTypeNames.Application.Octet, fileName); } try { - webDavManager.OpenFolder(pathPart); - IEnumerable children = webDavManager.GetChildren().Where(x => !WebDavAppConfigManager.Instance.ElementsRendering.ElementsToIgnore.Contains(x.DisplayName.Trim('/'))); + _webdavManager.OpenFolder(pathPart); + IEnumerable children = _webdavManager.GetChildren().Where(x => !WebDavAppConfigManager.Instance.ElementsRendering.ElementsToIgnore.Contains(x.DisplayName.Trim('/'))); var model = new ModelForWebDav { Items = children.Take(WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount), UrlSuffix = pathPart }; Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount] = WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount; @@ -56,8 +60,7 @@ namespace WebsitePanel.WebDavPortal.Controllers public ActionResult ShowOfficeDocument(string org, string pathPart = "") { - var webDavManager = _kernel.Get(); - string fileUrl = webDavManager.RootPath.TrimEnd('/') + "/" + pathPart.TrimStart('/'); + string fileUrl = _webdavManager.RootPath.TrimEnd('/') + "/" + pathPart.TrimStart('/'); var uri = new Uri(WebDavAppConfigManager.Instance.OfficeOnline.Url).AddParameter("src", fileUrl).ToString(); return View(new OfficeOnlineModel(uri, new Uri(fileUrl).Segments.Last())); @@ -69,9 +72,11 @@ namespace WebsitePanel.WebDavPortal.Controllers if (Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount] != null) { var renderedElementsCount = (int)Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount]; - var webDavManager = _kernel.Get(); - IEnumerable children = webDavManager.GetChildren(); + + IEnumerable children = _webdavManager.GetChildren(); + var result = children.Skip(renderedElementsCount).Take(WebDavAppConfigManager.Instance.ElementsRendering.AddElementsCount); + Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount] = renderedElementsCount + WebDavAppConfigManager.Instance.ElementsRendering.AddElementsCount; return PartialView("_ResourseCollectionPartial", result); diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/LdapAuthorizationAttribute.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/LdapAuthorizationAttribute.cs index 3d51c373..69d87efc 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/LdapAuthorizationAttribute.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/LdapAuthorizationAttribute.cs @@ -4,6 +4,7 @@ using System.Web.Routing; using Ninject; using WebsitePanel.WebDavPortal.DependencyInjection; using WebsitePanel.WebDavPortal.Models; +using WebsitePanel.WebDavPortal.UI.Routes; namespace WebsitePanel.WebDavPortal.CustomAttributes { @@ -11,16 +12,19 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes { protected override bool AuthorizeCore(HttpContextBase httpContext) { - IKernel kernel = new StandardKernel(new NinjectSettings { AllowNullInjection = true }, new WebDavExplorerAppModule()); - var accountInfo = kernel.Get(); + var accountInfo = DependencyResolver.Current.GetService(); + if (accountInfo == null) + { return false; + } + return true; } protected override void HandleUnauthorizedRequest(AuthorizationContext filterContext) { - filterContext.Result = new RedirectToRouteResult(new RouteValueDictionary(new { controller = "Account", action = "Login" })); + filterContext.Result = new RedirectToRouteResult(AccountRouteNames.Login, null); } } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/NinjectDependecyResolver.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/NinjectDependecyResolver.cs new file mode 100644 index 00000000..480cb19e --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/NinjectDependecyResolver.cs @@ -0,0 +1,35 @@ +using Ninject; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; + +namespace WebsitePanel.WebDavPortal.DependencyInjection +{ + public class NinjectDependecyResolver : IDependencyResolver + { + IKernel kernal; + + public NinjectDependecyResolver() + { + kernal = new StandardKernel(new NinjectSettings { AllowNullInjection = true }); + AddBindings(); + } + + public object GetService(Type serviceType) + { + return kernal.TryGet(serviceType); + } + + public IEnumerable GetServices(Type serviceType) + { + return kernal.GetAll(serviceType); + } + + private void AddBindings() + { + PortalDependencies.Configure(kernal); + } + } +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/PortalDependencies.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/PortalDependencies.cs new file mode 100644 index 00000000..be866fab --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/PortalDependencies.cs @@ -0,0 +1,23 @@ +using Ninject; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.SessionState; +using WebsitePanel.WebDavPortal.Cryptography; +using WebsitePanel.WebDavPortal.DependencyInjection.Providers; +using WebsitePanel.WebDavPortal.Models; + +namespace WebsitePanel.WebDavPortal.DependencyInjection +{ + public class PortalDependencies + { + public static void Configure(IKernel kernerl) + { + kernerl.Bind().ToProvider(); + kernerl.Bind().ToProvider(); + kernerl.Bind().ToProvider(); + kernerl.Bind().To(); + } + } +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/AccountInfoProvider.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/AccountInfoProvider.cs new file mode 100644 index 00000000..6a2f8dc0 --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/AccountInfoProvider.cs @@ -0,0 +1,25 @@ +using System.Web.SessionState; +using Ninject; +using Ninject.Activation; +using WebsitePanel.WebDavPortal.Config; +using WebsitePanel.WebDavPortal.Models; + +namespace WebsitePanel.WebDavPortal.DependencyInjection.Providers +{ + public class AccountInfoProvider : Provider + { + protected override AccountModel CreateInstance(IContext context) + { + var session = context.Kernel.Get(); + + AccountModel accountInfo = null; + + if (session != null) + { + accountInfo = session[WebDavAppConfigManager.Instance.SessionKeys.AccountInfo] as AccountModel; + } + + return accountInfo; + } + } +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/HttpSessionStateProvider.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/HttpSessionStateProvider.cs new file mode 100644 index 00000000..738312bf --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/HttpSessionStateProvider.cs @@ -0,0 +1,17 @@ +using Ninject.Activation; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.SessionState; + +namespace WebsitePanel.WebDavPortal.DependencyInjection.Providers +{ + public class HttpSessionStateProvider : Provider + { + protected override HttpSessionState CreateInstance(IContext context) + { + return HttpContext.Current.Session; + } + } +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/WebDavManagerProvider.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/WebDavManagerProvider.cs new file mode 100644 index 00000000..b52d83a3 --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/WebDavManagerProvider.cs @@ -0,0 +1,25 @@ +using System.Web.SessionState; +using Ninject; +using Ninject.Activation; +using WebsitePanel.WebDavPortal.Config; +using WebsitePanel.WebDavPortal.Models; + +namespace WebsitePanel.WebDavPortal.DependencyInjection.Providers +{ + public class WebDavManagerProvider : Provider + { + protected override WebDavManager CreateInstance(IContext context) + { + var session = context.Kernel.Get(); + + WebDavManager webDavManager = null; + + if (session != null) + { + webDavManager = session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] as WebDavManager; + } + + return webDavManager; + } + } +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs index 69fb92f6..f62048b9 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs @@ -4,6 +4,7 @@ using System.Web.Mvc; using System.Web.Optimization; using System.Web.Routing; using WebsitePanel.WebDavPortal.Controllers; +using WebsitePanel.WebDavPortal.DependencyInjection; namespace WebsitePanel.WebDavPortal { @@ -15,6 +16,8 @@ namespace WebsitePanel.WebDavPortal FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); RouteConfig.RegisterRoutes(RouteTable.Routes); BundleConfig.RegisterBundles(BundleTable.Bundles); + + DependencyResolver.SetResolver(new NinjectDependecyResolver()); } protected void Application_Error(object sender, EventArgs e) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs index 319a54bb..d4ba4fba 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs @@ -11,12 +11,15 @@ using WebsitePanel.Portal; using WebsitePanel.Providers.OS; using Ninject; using WebsitePanel.WebDavPortal.DependencyInjection; +using System.Web.Mvc; namespace WebsitePanel.WebDavPortal.Models { public class WebDavManager : IWebDavManager { private readonly WebDavSession _webDavSession = new WebDavSession(); + private readonly AccountModel _accountModel; + private IList _rootFolders; private int _itemId; private IFolder _currentFolder; @@ -36,11 +39,11 @@ namespace WebsitePanel.WebDavPortal.Models public WebDavManager(NetworkCredential credential, int itemId) { + _accountModel = DependencyResolver.Current.GetService(); + _webDavSession.Credentials = credential; _itemId = itemId; - IKernel _kernel = new StandardKernel(new NinjectSettings { AllowNullInjection = true }, new WebDavExplorerAppModule()); - var accountModel = _kernel.Get(); - _rootFolders = ConnectToWebDavServer(accountModel); + _rootFolders = ConnectToWebDavServer(_accountModel); if (_rootFolders.Any()) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/FileSystemRouteNames.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/FileSystemRouteNames.cs new file mode 100644 index 00000000..80d0d67d --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/FileSystemRouteNames.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebsitePanel.WebDavPortal.UI.Routes +{ + public class FileSystemRouteNames + { + public const string FilePath = "FilePathRoute"; + } +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml index dbd14ec9..0d7d6f9f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml @@ -2,7 +2,7 @@ @using Ninject @model WebsitePanel.WebDavPortal.Models.ModelForWebDav @{ - var webDavManager = (new StandardKernel(new WebsitePanel.WebDavPortal.DependencyInjection.WebDavExplorerAppModule())).Get(); + var webDavManager = DependencyResolver.Current.GetService(); ViewBag.Title = (string.IsNullOrEmpty(Model.UrlSuffix) ? webDavManager.OrganizationName : Model.UrlSuffix); } @Scripts.Render("~/bundles/jquery") diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml index 8e6a0663..1bd9cf33 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml @@ -18,8 +18,7 @@ break; default: isTargetBlank = false; - IKernel _kernel = new StandardKernel(new WebsitePanel.WebDavPortal.DependencyInjection.WebDavExplorerAppModule()); - var webDavManager = _kernel.Get(); + var webDavManager = DependencyResolver.Current.GetService(); href = Model.Href.AbsolutePath; break; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml index 323bb3a5..ea0501a0 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml @@ -3,6 +3,11 @@ @using WebsitePanel.WebDavPortal.DependencyInjection @using WebsitePanel.WebDavPortal.Models @using WebsitePanel.WebDavPortal.UI.Routes; + +@{ + var account = DependencyResolver.Current.GetService(); +} + @@ -25,8 +30,6 @@
@{ - IKernel kernel = new StandardKernel(new NinjectSettings { AllowNullInjection = true }, new WebDavExplorerAppModule()); - var account = kernel.Get(); if (account != null) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj index 4c3e95e3..faebb242 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj @@ -158,9 +158,11 @@ - - - + + + + + From 996e56a835e34610a820a66340701ca4a1d3fd90 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Sat, 10 Jan 2015 00:50:25 -0800 Subject: [PATCH 07/23] webdav portal unused file removed --- .../AccountInfoProvider.cs | 19 ------------------- .../WebDavExplorerAppModule.cs | 19 ------------------- .../WebDavManagerProvider.cs | 19 ------------------- 3 files changed, 57 deletions(-) delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/AccountInfoProvider.cs delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/WebDavExplorerAppModule.cs delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/WebDavManagerProvider.cs diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/AccountInfoProvider.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/AccountInfoProvider.cs deleted file mode 100644 index 1781b8bb..00000000 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/AccountInfoProvider.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Web.SessionState; -using Ninject; -using Ninject.Activation; -using WebsitePanel.WebDavPortal.Config; -using WebsitePanel.WebDavPortal.Models; - -namespace WebsitePanel.WebDavPortal.DependencyInjection -{ - public class AccountInfoProvider : Provider - { - protected override AccountModel CreateInstance(IContext context) - { - var session = context.Kernel.Get(); - - var accountInfo = session[WebDavAppConfigManager.Instance.SessionKeys.AccountInfo] as AccountModel; - return accountInfo; - } - } -} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/WebDavExplorerAppModule.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/WebDavExplorerAppModule.cs deleted file mode 100644 index 0029f886..00000000 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/WebDavExplorerAppModule.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Web; -using System.Web.SessionState; -using Ninject.Modules; -using WebsitePanel.WebDavPortal.Cryptography; -using WebsitePanel.WebDavPortal.Models; - -namespace WebsitePanel.WebDavPortal.DependencyInjection -{ - public class WebDavExplorerAppModule : NinjectModule - { - public override void Load() - { - Bind().ToConstant(HttpContext.Current.Session); - Bind().ToProvider(); - Bind().ToProvider(); - Bind().To(); - } - } -} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/WebDavManagerProvider.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/WebDavManagerProvider.cs deleted file mode 100644 index 7dd6df04..00000000 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/WebDavManagerProvider.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Web.SessionState; -using Ninject; -using Ninject.Activation; -using WebsitePanel.WebDavPortal.Config; -using WebsitePanel.WebDavPortal.Models; - -namespace WebsitePanel.WebDavPortal.DependencyInjection -{ - public class WebDavManagerProvider : Provider - { - protected override WebDavManager CreateInstance(IContext context) - { - var session = context.Kernel.Get(); - - var webDavManager = session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] as WebDavManager; - return webDavManager; - } - } -} \ No newline at end of file From 833b7c1aa4fde9ce14f1a56e00e667073c20e6a8 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Sat, 10 Jan 2015 03:55:47 -0800 Subject: [PATCH 08/23] webdav portal fixes --- .../Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs | 5 ++++- .../Scripts/appScripts/uploadingData2.js | 2 ++ .../WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs index acebf9ac..94f7348f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs @@ -59,7 +59,10 @@ namespace WebsitePanel.WebDav.Core { get { - string displayName = _href.AbsoluteUri.Replace(_baseUri.AbsoluteUri, ""); + var href = HttpUtility.UrlDecode(_href.AbsoluteUri); + var baseUri = HttpUtility.UrlDecode(_baseUri.AbsoluteUri); + + string displayName = href.Replace(baseUri, ""); displayName = Regex.Replace(displayName, "\\/$", ""); Match displayNameMatch = Regex.Match(displayName, "([\\/]+)$"); if (displayNameMatch.Success) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js index 42c5384c..7988b483 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js @@ -24,6 +24,8 @@ function GetResources() { GetResources(); oldResourcesDivHeight = $('#resourcesDiv').height(); }; + + recalculateResourseHeight(); } }); }; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml index ea0501a0..d07565d5 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml @@ -33,7 +33,7 @@ if (account != null) { -

@account.UserName

+

@account.Login

} }
From c341c7f58e4640d82fd884aae4ab2ea737040494 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Sat, 10 Jan 2015 05:54:31 -0800 Subject: [PATCH 09/23] Checking RDS servers in existing collections by powershell --- .../RemoteDesktopServicesProxy.cs | 13 ++- .../RemoteDesktopServicesController.cs | 21 ++-- .../esRemoteDesktopServices.asmx.cs | 4 +- .../IRemoteDesktopServices.cs | 1 + .../Windows2012.cs | 100 +++++++++++++++++- .../RemoteDesktopServicesProxy.cs | 70 ++++++++++++ .../RemoteDesktopServices.asmx.cs | 17 +++ .../WebsitePanel_SharedResources.ascx.resx | 3 + .../WebsitePanel/Code/Helpers/RDSHelper.cs | 4 +- .../WebsitePanel/RDS/AddRDSServer.ascx.cs | 2 +- .../RDS/RDSCreateCollection.ascx.cs | 13 ++- 11 files changed, 226 insertions(+), 22 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs index 8b6f1e32..fee2d2d2 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs @@ -515,8 +515,9 @@ namespace WebsitePanel.EnterpriseServer { /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetFreeRdsServersPaged", 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 RdsServersPaged GetFreeRdsServersPaged(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) { + public RdsServersPaged GetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) { object[] results = this.Invoke("GetFreeRdsServersPaged", new object[] { + packageId, filterColumn, filterValue, sortColumn, @@ -526,8 +527,9 @@ namespace WebsitePanel.EnterpriseServer { } /// - public System.IAsyncResult BeginGetFreeRdsServersPaged(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) { + public System.IAsyncResult BeginGetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) { return this.BeginInvoke("GetFreeRdsServersPaged", new object[] { + packageId, filterColumn, filterValue, sortColumn, @@ -542,16 +544,17 @@ namespace WebsitePanel.EnterpriseServer { } /// - public void GetFreeRdsServersPagedAsync(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) { - this.GetFreeRdsServersPagedAsync(filterColumn, filterValue, sortColumn, startRow, maximumRows, null); + public void GetFreeRdsServersPagedAsync(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) { + this.GetFreeRdsServersPagedAsync(packageId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null); } /// - public void GetFreeRdsServersPagedAsync(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) { + public void GetFreeRdsServersPagedAsync(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) { if ((this.GetFreeRdsServersPagedOperationCompleted == null)) { this.GetFreeRdsServersPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFreeRdsServersPagedOperationCompleted); } this.InvokeAsync("GetFreeRdsServersPaged", new object[] { + packageId, filterColumn, filterValue, sortColumn, diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs index 3179899a..e0bbf5b9 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs @@ -93,9 +93,9 @@ namespace WebsitePanel.EnterpriseServer return GetRdsServersPagedInternal(filterColumn, filterValue, sortColumn, startRow, maximumRows); } - public static RdsServersPaged GetFreeRdsServersPaged(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) + public static RdsServersPaged GetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) { - return GetFreeRdsServersPagedInternal(filterColumn, filterValue, sortColumn, startRow, maximumRows); + return GetFreeRdsServersPagedInternal(packageId, filterColumn, filterValue, sortColumn, startRow, maximumRows); } public static RdsServersPaged GetOrganizationRdsServersPaged(int itemId, int? collectionId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) @@ -477,17 +477,26 @@ namespace WebsitePanel.EnterpriseServer return result; } - private static RdsServersPaged GetFreeRdsServersPagedInternal(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) + private static RdsServersPaged GetFreeRdsServersPagedInternal(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) { - DataSet ds = DataProvider.GetRDSServersPaged(null, null, filterColumn, filterValue, sortColumn, startRow, maximumRows); - RdsServersPaged result = new RdsServersPaged(); + Organization org = OrganizationController.GetOrganization(itemId); + + if (org == null) + { + return result; + } + + var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId)); + var existingServers = rds.GetServersExistingInCollections(); + + DataSet ds = DataProvider.GetRDSServersPaged(null, null, filterColumn, filterValue, sortColumn, startRow, maximumRows); result.RecordsCount = (int)ds.Tables[0].Rows[0][0]; List tmpServers = new List(); ObjectUtils.FillCollectionFromDataView(tmpServers, ds.Tables[1].DefaultView); - + tmpServers = tmpServers.Where(x => !existingServers.Select(y => y.ToUpper()).Contains(x.FqdName.ToUpper())).ToList(); result.Servers = tmpServers.ToArray(); return result; diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs index f05d3ca3..4323237f 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs @@ -99,10 +99,10 @@ namespace WebsitePanel.EnterpriseServer } [WebMethod] - public RdsServersPaged GetFreeRdsServersPaged(string filterColumn, string filterValue, + public RdsServersPaged GetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) { - return RemoteDesktopServicesController.GetFreeRdsServersPaged(filterColumn, filterValue, + return RemoteDesktopServicesController.GetFreeRdsServersPaged(packageId, filterColumn, filterValue, sortColumn, startRow, maximumRows); } diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs index acb3cc5d..2a9800fc 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs @@ -64,5 +64,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices string[] GetApplicationUsers(string collectionName, string applicationName); bool SetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users); bool CheckRDSServerAvaliable(string hostname); + List GetServersExistingInCollections(); } } diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs index 77fe591f..bfb230f0 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs @@ -220,7 +220,15 @@ namespace WebsitePanel.Providers.RemoteDesktopServices try { - runSpace = OpenRunspace(); + runSpace = OpenRunspace(); + + var existingServers = GetServersExistingInCollections(runSpace); + existingServers = existingServers.Select(x => x.ToUpper()).Intersect(collection.Servers.Select(x => x.FqdName.ToUpper())).ToList(); + + if (existingServers.Any()) + { + throw new Exception(string.Format("Server{0} {1} already added to another collection", existingServers.Count == 1 ? "" : "s", string.Join(" ,", existingServers.ToArray()))); + } foreach (var server in collection.Servers) { @@ -302,6 +310,24 @@ namespace WebsitePanel.Providers.RemoteDesktopServices return result; } + public List GetServersExistingInCollections() + { + Runspace runSpace = null; + List existingServers = new List(); + + try + { + runSpace = OpenRunspace(); + existingServers = GetServersExistingInCollections(runSpace); + } + finally + { + CloseRunspace(runSpace); + } + + return existingServers; + } + public RdsCollection GetCollection(string collectionName) { RdsCollection collection =null; @@ -1380,6 +1406,23 @@ namespace WebsitePanel.Providers.RemoteDesktopServices return ExecuteShellCommand(runSpace, invokeCommand, false); } + internal Collection ExecuteRemoteShellCommand(Runspace runSpace, string hostName, List scripts, params string[] moduleImports) + { + Command invokeCommand = new Command("Invoke-Command"); + invokeCommand.Parameters.Add("ComputerName", hostName); + + RunspaceInvoke invoke = new RunspaceInvoke(); + string commandString = moduleImports.Any() ? string.Format("import-module {0};", string.Join(",", moduleImports)) : string.Empty; + + commandString = string.Format("{0};{1}", commandString, string.Join(";", scripts.ToArray())); + + ScriptBlock sb = invoke.Invoke(string.Format("{{{0}}}", commandString))[0].BaseObject as ScriptBlock; + + invokeCommand.Parameters.Add("ScriptBlock", sb); + + return ExecuteShellCommand(runSpace, invokeCommand, false); + } + internal Collection ExecuteShellCommand(Runspace runSpace, Command cmd) { return ExecuteShellCommand(runSpace, cmd, true); @@ -1396,6 +1439,38 @@ namespace WebsitePanel.Providers.RemoteDesktopServices return ExecuteShellCommand(runSpace, cmd, true, out errors); } + internal Collection ExecuteShellCommand(Runspace runspace, List scripts, out object[] errors) + { + Log.WriteStart("ExecuteShellCommand"); + var errorList = new List(); + Collection results; + + using (Pipeline pipeLine = runspace.CreatePipeline()) + { + foreach (string script in scripts) + { + pipeLine.Commands.AddScript(script); + } + + results = pipeLine.Invoke(); + + if (pipeLine.Error != null && pipeLine.Error.Count > 0) + { + foreach (object item in pipeLine.Error.ReadToEnd()) + { + errorList.Add(item); + string errorMessage = string.Format("Invoke error: {0}", item); + Log.WriteWarning(errorMessage); + } + } + } + + errors = errorList.ToArray(); + Log.WriteEnd("ExecuteShellCommand"); + + return results; + } + internal Collection ExecuteShellCommand(Runspace runSpace, Command cmd, bool useDomainController, out object[] errors) { @@ -1517,6 +1592,29 @@ namespace WebsitePanel.Providers.RemoteDesktopServices return result; } + internal List GetServersExistingInCollections(Runspace runSpace) + { + var existingHosts = new List(); + var scripts = new List(); + scripts.Add(string.Format("$sessions = Get-RDSessionCollection -ConnectionBroker {0}", ConnectionBroker)); + scripts.Add(string.Format("foreach($session in $sessions){{Get-RDSessionHost $session.CollectionName -ConnectionBroker {0}|Select SessionHost}}", ConnectionBroker)); + object[] errors; + + var sessionHosts = ExecuteShellCommand(runSpace, scripts, out errors); + + foreach(var host in sessionHosts) + { + var sessionHost = GetPSObjectProperty(host, "SessionHost"); + + if (sessionHost != null) + { + existingHosts.Add(sessionHost.ToString()); + } + } + + return existingHosts; + } + #endregion } } diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs index 79bd1a40..65ca3c47 100644 --- a/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs +++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs @@ -71,6 +71,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices { private System.Threading.SendOrPostCallback CheckRDSServerAvaliableOperationCompleted; + private System.Threading.SendOrPostCallback GetServersExistingInCollectionsOperationCompleted; + /// public RemoteDesktopServices() { this.Url = "http://localhost:9003/RemoteDesktopServices.asmx"; @@ -139,6 +141,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices { /// public event CheckRDSServerAvaliableCompletedEventHandler CheckRDSServerAvaliableCompleted; + /// + public event GetServersExistingInCollectionsCompletedEventHandler GetServersExistingInCollectionsCompleted; + /// [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)] @@ -1068,6 +1073,45 @@ namespace WebsitePanel.Providers.RemoteDesktopServices { } } + /// + [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")] + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetServersExistingInCollections", 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 string[] GetServersExistingInCollections() { + object[] results = this.Invoke("GetServersExistingInCollections", new object[0]); + return ((string[])(results[0])); + } + + /// + public System.IAsyncResult BeginGetServersExistingInCollections(System.AsyncCallback callback, object asyncState) { + return this.BeginInvoke("GetServersExistingInCollections", new object[0], callback, asyncState); + } + + /// + public string[] EndGetServersExistingInCollections(System.IAsyncResult asyncResult) { + object[] results = this.EndInvoke(asyncResult); + return ((string[])(results[0])); + } + + /// + public void GetServersExistingInCollectionsAsync() { + this.GetServersExistingInCollectionsAsync(null); + } + + /// + public void GetServersExistingInCollectionsAsync(object userState) { + if ((this.GetServersExistingInCollectionsOperationCompleted == null)) { + this.GetServersExistingInCollectionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetServersExistingInCollectionsOperationCompleted); + } + this.InvokeAsync("GetServersExistingInCollections", new object[0], this.GetServersExistingInCollectionsOperationCompleted, userState); + } + + private void OnGetServersExistingInCollectionsOperationCompleted(object arg) { + if ((this.GetServersExistingInCollectionsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetServersExistingInCollectionsCompleted(this, new GetServersExistingInCollectionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + /// public new void CancelAsync(object userState) { base.CancelAsync(userState); @@ -1509,4 +1553,30 @@ namespace WebsitePanel.Providers.RemoteDesktopServices { } } } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")] + public delegate void GetServersExistingInCollectionsCompletedEventHandler(object sender, GetServersExistingInCollectionsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetServersExistingInCollectionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetServersExistingInCollectionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string[] Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string[])(this.results[0])); + } + } + } } diff --git a/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs index facdb011..3af935f3 100644 --- a/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs +++ b/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs @@ -410,5 +410,22 @@ namespace WebsitePanel.Server throw; } } + + [WebMethod, SoapHeader("settings")] + public List GetServersExistingInCollections() + { + try + { + Log.WriteStart("'{0}' GetServersExistingInCollections", ProviderSettings.ProviderName); + var result = RDSProvider.GetServersExistingInCollections(); + Log.WriteEnd("'{0}' GetServersExistingInCollections", ProviderSettings.ProviderName); + return result; + } + catch (Exception ex) + { + Log.WriteError(String.Format("'{0}' GetServersExistingInCollections", ProviderSettings.ProviderName), ex); + throw; + } + } } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx index f3dc6d89..27771dda 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx @@ -5626,4 +5626,7 @@ You cannot use a IDN domain name for organizations + + Collection not created + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs index 8b8f8f72..1af8a885 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs @@ -71,9 +71,9 @@ namespace WebsitePanel.Portal return rdsServers.Servers; } - public RdsServer[] GetFreeRDSServers() + public RdsServer[] GetFreeRDSServers(int packageId) { - return ES.Services.RDS.GetFreeRdsServersPaged("", "", "", 0, 1000).Servers; + return ES.Services.RDS.GetFreeRdsServersPaged(packageId, "", "", "", 0, 1000).Servers; } #endregion diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AddRDSServer.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AddRDSServer.ascx.cs index cd879f04..f0ed0cd1 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AddRDSServer.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AddRDSServer.ascx.cs @@ -50,7 +50,7 @@ namespace WebsitePanel.Portal.RDS private void BindRDSServers() { - ddlServers.DataSource = new RDSHelper().GetFreeRDSServers(); + ddlServers.DataSource = new RDSHelper().GetFreeRDSServers(PanelRequest.ItemID); ddlServers.DataTextField = "Name"; ddlServers.DataValueField = "Id"; ddlServers.DataBind(); diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs index ba53d8a8..e8ee55af 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs @@ -50,7 +50,9 @@ namespace WebsitePanel.Portal.RDS protected void btnSave_Click(object sender, EventArgs e) { if (!Page.IsValid) + { return; + } try { @@ -59,14 +61,15 @@ namespace WebsitePanel.Portal.RDS messageBox.ShowErrorMessage("RDS_CREATE_COLLECTION_RDSSERVER_REQUAIRED"); return; } + RdsCollection collection = new RdsCollection{ Name = txtCollectionName.Text, Servers = servers.GetServers(), Description = "" }; - ES.Services.RDS.AddRdsCollection(PanelRequest.ItemID, collection); - - Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "rds_collections", - "SpaceID=" + PanelSecurity.PackageId)); + Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "rds_collections", "SpaceID=" + PanelSecurity.PackageId)); + } + catch (Exception ex) + { + messageBox.ShowErrorMessage("RDSCOLLECTION_NOT_CREATED", ex); } - catch { } } } } \ No newline at end of file From 5d37adf09bb56d8dcab04fd43b7d4a8197652f21 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Sat, 10 Jan 2015 06:00:59 -0800 Subject: [PATCH 10/23] web portal folder permission fix --- .../Controllers/AccountController.cs | 1 + .../WebsitePanel.WebDavPortal/Global.asax.cs | 2 ++ .../Models/AccountModel.cs | 2 ++ .../Models/WebDavManager.cs | 8 +++++++- .../WebsitePanel.WebDavPortal/Web.config | 19 +++++++++++++++++-- .../WebsitePanel.WebDavPortal.csproj | 3 +++ .../WebsitePanel.WebDavPortal/packages.config | 1 + 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs index 7c9f5602..a6d39fd8 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs @@ -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; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs index f62048b9..e56e596a 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs @@ -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) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs index 2ad1e6a8..b5b778d1 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/AccountModel.cs @@ -23,6 +23,8 @@ namespace WebsitePanel.WebDavPortal.Models } } + public string DisplayName { get; set; } + public IEnumerable Groups { get; set; } public string LdapError { get; set; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs index d4ba4fba..c021050b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs @@ -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 _rootFolders; private int _itemId; @@ -40,6 +43,7 @@ namespace WebsitePanel.WebDavPortal.Models public WebDavManager(NetworkCredential credential, int itemId) { _accountModel = DependencyResolver.Current.GetService(); + Log = LogManager.GetLogger(this.GetType()); _webDavSession.Credentials = credential; _itemId = itemId; @@ -132,13 +136,15 @@ namespace WebsitePanel.WebDavPortal.Models private IList ConnectToWebDavServer(AccountModel user) { var rootFolders = new List(); + 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); diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config index c45fcad6..3acfef9f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config @@ -1,12 +1,27 @@ - + -
+
+
+ + + + + + + + + + + + + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj index faebb242..369a9e7b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj @@ -48,6 +48,9 @@ False ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + + ..\packages\log4net.2.0.0\lib\net40-full\log4net.dll + ..\..\Lib\Microsoft.Web.Services3.dll diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config index 5c38485f..e9fed748 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config @@ -4,6 +4,7 @@ + From e00f5dacb8f103c22e22ce1cc5fe39681c88ee24 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Sat, 10 Jan 2015 10:46:22 -0500 Subject: [PATCH 11/23] Added tag build-2.1.0.526 for changeset cbe19b49996b From 165813d041287d18215ec97102e0dfc9b71b02b7 Mon Sep 17 00:00:00 2001 From: Olov Karlsson Date: Sun, 11 Jan 2015 08:43:56 +0100 Subject: [PATCH 12/23] Fix for statistics in IceWarp provider. Numbers given in kB instead of Bytes. --- .../Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs index a7ad0c97..5a2d979b 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs @@ -477,7 +477,7 @@ namespace WebsitePanel.Providers.Mail Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name)); // calculate disk space var accountObject = GetAccountObject(item.Name); - var size = Convert.ToInt64((object)accountObject.GetProperty("U_MailboxSize")); + var size = Convert.ToInt64((object)accountObject.GetProperty("U_MailboxSize")) * 1024; var diskspace = new ServiceProviderItemDiskSpace {ItemId = item.Id, DiskSpace = size}; itemsDiskspace.Add(diskspace); @@ -564,8 +564,8 @@ namespace WebsitePanel.Providers.Mail Year = date.Year, Month = date.Month, Day = date.Day, - BytesSent = line[mailSentField], - BytesReceived = line[mailReceivedField] + BytesSent = Convert.ToInt64(line[mailSentField])*1024, + BytesReceived = Convert.ToInt64(line[mailReceivedField])*1024 }; days.Add(dailyStats); continue; From 598986a7d03a1a1040aec30626251a789f135882 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Sun, 11 Jan 2015 10:38:22 -0500 Subject: [PATCH 13/23] Added tag build-2.1.0.527 for changeset 13846ad3b5d7 From d3ce5dc5fce685bc06336a7e9d67793ce30f7f75 Mon Sep 17 00:00:00 2001 From: Olov Karlsson Date: Sun, 11 Jan 2015 18:53:28 +0100 Subject: [PATCH 14/23] Corrected bandwidth statistics in IceWarp provider --- .../Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs index 5a2d979b..608b740a 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs @@ -564,8 +564,8 @@ namespace WebsitePanel.Providers.Mail Year = date.Year, Month = date.Month, Day = date.Day, - BytesSent = Convert.ToInt64(line[mailSentField])*1024, - BytesReceived = Convert.ToInt64(line[mailReceivedField])*1024 + BytesSent = Convert.ToInt64(fields[mailSentField])*1024, + BytesReceived = Convert.ToInt64(fields[mailReceivedField])*1024 }; days.Add(dailyStats); continue; From bbddfc82eaa74eafba83fc17acd529bac12315d4 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Sun, 11 Jan 2015 13:07:57 -0500 Subject: [PATCH 15/23] Added tag build-2.1.0.528 for changeset 7a190021bba7 From 05d9fddb5da6f1b9f6d0557a6043cd44f771c3ce Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Mon, 12 Jan 2015 01:28:59 -0800 Subject: [PATCH 16/23] webdav portal bugs fix --- .hgignore | 1 + .../Controllers/FileSystemController.cs | 1 + .../Views/Account/Login.cshtml | 14 ++- .../Views/FileSystem/ShowContent.cshtml | 4 +- .../Views/FileSystem/_ResoursePartial.cshtml | 3 +- .../WebsitePanel.WebDavPortal/Web.config | 98 +++++++++---------- 6 files changed, 62 insertions(+), 59 deletions(-) diff --git a/.hgignore b/.hgignore index 7a83c128..7c015892 100644 --- a/.hgignore +++ b/.hgignore @@ -30,3 +30,4 @@ WebsitePanel/Sources/UpgradeLog.XML WebsitePanel/Sources/UpgradeLog.htm WebsitePanel/Sources/_UpgradeReport_Files/UpgradeReport_Information.png WebsitePanel/Sources/_UpgradeReport_Files/UpgradeReport_Success.png +WebsitePanel/Sources/packages diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs index 81a54ce1..fd84fa8e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs @@ -19,6 +19,7 @@ using System.Net; namespace WebsitePanel.WebDavPortal.Controllers { + [ValidateInput(false)] [LdapAuthorization] public class FileSystemController : Controller { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml index 75e22523..c7c827b8 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml @@ -16,9 +16,9 @@ }
- +
- @Html.TextBoxFor(x => x.Login, new { @class = "form-control", id = "inputPassword", placeholder = "Login" }) + @Html.TextBoxFor(x => x.Login, new { @class = "form-control", id = "inputLogin", placeholder = "Login", autofocus = "autofocus" })
@@ -34,3 +34,13 @@
+ + +@section scripts +{ + +} diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml index 0d7d6f9f..019e829e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml @@ -1,9 +1,11 @@ @using WebsitePanel.WebDav.Core.Client @using Ninject +@using WebsitePanel.WebDavPortal.Config + @model WebsitePanel.WebDavPortal.Models.ModelForWebDav @{ var webDavManager = DependencyResolver.Current.GetService(); - ViewBag.Title = (string.IsNullOrEmpty(Model.UrlSuffix) ? webDavManager.OrganizationName : Model.UrlSuffix); + ViewBag.Title = WebDavAppConfigManager.Instance.ApplicationName; } @Scripts.Render("~/bundles/jquery") @Scripts.Render("~/bundles/appScripts") diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml index 1bd9cf33..b0009e5c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml @@ -6,7 +6,7 @@ @{ string actualPath = Model.ItemType == ItemType.Folder ? "~/Content/Images/folder_100x100.png" : WebDavAppConfigManager.Instance.FileIcons[Path.GetExtension(Model.DisplayName.Trim('/'))]; - string name = Model.ItemType == ItemType.Folder ? Model.DisplayName.Trim('/') : Path.GetFileNameWithoutExtension(Model.DisplayName); + string name = Model.ItemType == ItemType.Folder ? Model.DisplayName.Trim('/') : Model.DisplayName; var opener = new FileOpenerManager()[Path.GetExtension(Model.DisplayName)]; bool isTargetBlank; string href = "/"; @@ -18,7 +18,6 @@ break; default: isTargetBlank = false; - var webDavManager = DependencyResolver.Current.GetService(); href = Model.Href.AbsolutePath; break; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config index 3acfef9f..a15db69c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config @@ -23,47 +23,47 @@ - - - - + + + + - - + + - - + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - + - + + @@ -108,7 +98,7 @@ - + @@ -117,32 +107,32 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + From c26b7460669c100042e08c947cdcc84a96642e93 Mon Sep 17 00:00:00 2001 From: Olov Karlsson Date: Mon, 12 Jan 2015 14:45:16 +0100 Subject: [PATCH 17/23] Corrected importing of aliases in IceWarp provider --- .../Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs index 608b740a..f0538c23 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs @@ -1035,7 +1035,7 @@ namespace WebsitePanel.Providers.Mail { var forwardTo = GetForwardToAddressFromAccountObject(accountObject); var aliases = GetAliasListFromAccountObject(accountObject) as IEnumerable; - aliasList.AddRange(aliases.Where(a => a != forwardTo).Select(alias => new MailAlias {Name = alias + "@" + domainName, ForwardTo = forwardTo + "@" + domainName})); + aliasList.AddRange(aliases.Where(a => a + "@" + domainName != forwardTo).Select(alias => new MailAlias {Name = alias + "@" + domainName, ForwardTo = forwardTo})); } accountObject.FindDone(); From eebb2117cb37be93e5f1cefa5bf0a756acc04b16 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 12 Jan 2015 10:02:53 -0500 Subject: [PATCH 18/23] Added tag build-2.1.0.529 for changeset ca56dfcb1a78 From 7dd090820b26700cc98ed1adc80c11159fa61c38 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 13 Jan 2015 04:18:56 -0800 Subject: [PATCH 19/23] webdav portal auth via ad --- .../Entities/AbstractConfigCollection.cs | 2 +- .../Config/Entities/ElementsRendering.cs | 2 +- .../Config/Entities/FileIconsDictionary.cs | 4 +- .../Config/Entities/HttpErrorsCollection.cs | 7 +- .../Config/Entities/OfficeOnlineCollection.cs | 2 +- .../Config/Entities/SessionKeysCollection.cs | 7 +- .../WebsitePanelConstantUserParameters.cs | 2 +- .../Config/IWebDavAppConfig.cs | 4 +- .../ApplicationNameElement.cs | 2 +- .../AuthTimeoutCookieNameElement.cs | 21 ++ .../ElementsRenderingElement.cs | 2 +- .../WebConfigSections/FileIconsElement.cs | 2 +- .../FileIconsElementCollection.cs | 2 +- .../WebConfigSections/OfficeOnlineElement.cs | 0 .../OfficeOnlineElementCollection.cs | 0 .../WebConfigSections/SessionKeysElement.cs | 1 + .../SessionKeysElementCollection.cs | 3 +- .../WebConfigSections/UserDomainElement.cs | 2 +- ...DavExplorerConfigurationSettingsSection.cs | 9 + .../WebsitePanelConstantUserElement.cs | 2 +- .../Config/WebDavAppConfigManager.cs | 9 +- .../Security/IAuthenticationService.cs | 16 + .../Resources/HttpErrors.Designer.cs} | 34 +-- .../Resources/HttpErrors.resx} | 0 .../FormsAuthenticationService.cs | 74 +++++ .../Authentication/Principals/WspPrincipal.cs | 47 +++ .../Security}/Cryptography/CryptoUtils.cs | 9 +- .../Security}/Cryptography/ICryptography.cs | 2 +- .../WebsitePanel.WebDav.Core.csproj | 103 +++++++ .../Wsp/Framework/WSP.cs | 287 ++++++++++++++++++ .../WebsitePanel.WebDav.Core/WspContext.cs | 15 + .../WebsitePanel.WebDav.Core/packages.config | 7 + .../App_Start/BundleConfig.cs | 9 +- .../App_Start/RouteConfig.cs | 2 +- .../OrganizationRouteConstraint.cs | 27 +- .../Controllers/AccountController.cs | 94 ++---- .../Controllers/ErrorController.cs | 2 +- .../Controllers/FileSystemController.cs | 9 +- .../LdapAuthorizationAttribute.cs | 12 - .../DependencyInjection/PortalDependencies.cs | 15 +- .../Providers/AccountInfoProvider.cs | 25 -- .../Providers/WebDavManagerProvider.cs | 17 +- .../FileOperations/FileOpenerManager.cs | 2 +- .../WebsitePanel.WebDavPortal/Global.asax.cs | 46 +++ .../Models/AccountModel.cs | 12 - .../Models/IWebDavManager.cs | 1 - .../Models/WebDavManager.cs | 40 +-- .../Scripts/appScripts/authentication.js | 18 ++ .../Scripts/jquery.cookie.js | 117 +++++++ .../Views/Error/Index.cshtml | 2 + .../Views/FileSystem/ShowContent.cshtml | 7 +- .../Views/FileSystem/_ResoursePartial.cshtml | 6 +- .../Views/Shared/_Layout.cshtml | 23 +- .../WebsitePanel.WebDavPortal/Web.config | 1 + .../WebsitePanel.WebDavPortal.csproj | 41 +-- .../WebsitePanel.WebDavPortal/packages.config | 1 + 56 files changed, 927 insertions(+), 281 deletions(-) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/Entities/AbstractConfigCollection.cs (87%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/Entities/ElementsRendering.cs (89%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/Entities/FileIconsDictionary.cs (90%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/Entities/HttpErrorsCollection.cs (52%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/Entities/OfficeOnlineCollection.cs (92%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/Entities/SessionKeysCollection.cs (88%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/Entities/WebsitePanelConstantUserParameters.cs (85%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/IWebDavAppConfig.cs (81%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/ApplicationNameElement.cs (83%) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/AuthTimeoutCookieNameElement.cs rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/ElementsRenderingElement.cs (92%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/FileIconsElement.cs (88%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/FileIconsElementCollection.cs (90%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/OfficeOnlineElement.cs (100%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/OfficeOnlineElementCollection.cs (100%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/SessionKeysElement.cs (91%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/SessionKeysElementCollection.cs (78%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/UserDomainElement.cs (83%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs (84%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Config}/WebConfigSections/WebsitePanelConstantUserElement.cs (89%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core}/Config/WebDavAppConfigManager.cs (86%) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Security/IAuthenticationService.cs rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal/App_GlobalResources/Resource.errors.designer.cs => WebsitePanel.WebDav.Core/Resources/HttpErrors.Designer.cs} (82%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal/App_GlobalResources/Resource.errors.resx => WebsitePanel.WebDav.Core/Resources/HttpErrors.resx} (100%) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/Principals/WspPrincipal.cs rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Security}/Cryptography/CryptoUtils.cs (94%) rename WebsitePanel/Sources/{WebsitePanel.WebDavPortal => WebsitePanel.WebDav.Core/Security}/Cryptography/ICryptography.cs (67%) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDav.Core/Wsp/Framework/WSP.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDav.Core/WspContext.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDav.Core/packages.config delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/AccountInfoProvider.cs create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/authentication.js create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/jquery.cookie.js diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/AbstractConfigCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/AbstractConfigCollection.cs similarity index 87% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/AbstractConfigCollection.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/AbstractConfigCollection.cs index 3dca9866..fb49467c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/AbstractConfigCollection.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/AbstractConfigCollection.cs @@ -1,7 +1,7 @@ using System.Configuration; using WebsitePanel.WebDavPortal.WebConfigSections; -namespace WebsitePanel.WebDavPortal.Config.Entities +namespace WebsitePanel.WebDav.Core.Config.Entities { public abstract class AbstractConfigCollection { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/ElementsRendering.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/ElementsRendering.cs similarity index 89% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/ElementsRendering.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/ElementsRendering.cs index c5703a8a..f6f33649 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/ElementsRendering.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/ElementsRendering.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace WebsitePanel.WebDavPortal.Config.Entities +namespace WebsitePanel.WebDav.Core.Config.Entities { public class ElementsRendering : AbstractConfigCollection { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/FileIconsDictionary.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/FileIconsDictionary.cs similarity index 90% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/FileIconsDictionary.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/FileIconsDictionary.cs index 45568227..6bd7b26c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/FileIconsDictionary.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/FileIconsDictionary.cs @@ -1,9 +1,9 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using WebsitePanel.WebDavPortal.WebConfigSections; +using WebsitePanel.WebDav.Core.Config.WebConfigSections; -namespace WebsitePanel.WebDavPortal.Config.Entities +namespace WebsitePanel.WebDav.Core.Config.Entities { public class FileIconsDictionary : AbstractConfigCollection, IReadOnlyDictionary { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/HttpErrorsCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/HttpErrorsCollection.cs similarity index 52% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/HttpErrorsCollection.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/HttpErrorsCollection.cs index 2aab1acb..e2c6b920 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/HttpErrorsCollection.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/HttpErrorsCollection.cs @@ -1,7 +1,6 @@ using System.Globalization; -using Resources.Resource; -namespace WebsitePanel.WebDavPortal.Config.Entities +namespace WebsitePanel.WebDav.Core.Config.Entities { public class HttpErrorsCollection { @@ -9,14 +8,14 @@ namespace WebsitePanel.WebDavPortal.Config.Entities { get { - var message = errors.ResourceManager.GetString("_" + statusCode.ToString(CultureInfo.InvariantCulture)); + var message = Resources.HttpErrors.ResourceManager.GetString("_" + statusCode.ToString(CultureInfo.InvariantCulture)); return message ?? Default; } } public string Default { - get { return errors.Default; } + get { return Resources.HttpErrors.Default; } } } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/OfficeOnlineCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/OfficeOnlineCollection.cs similarity index 92% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/OfficeOnlineCollection.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/OfficeOnlineCollection.cs index c247020f..a28114b5 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/OfficeOnlineCollection.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/OfficeOnlineCollection.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using WebsitePanel.WebDavPortal.WebConfigSections; -namespace WebsitePanel.WebDavPortal.Config.Entities +namespace WebsitePanel.WebDav.Core.Config.Entities { public class OfficeOnlineCollection : AbstractConfigCollection, IReadOnlyCollection { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/SessionKeysCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/SessionKeysCollection.cs similarity index 88% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/SessionKeysCollection.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/SessionKeysCollection.cs index c733473d..057be2cf 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/SessionKeysCollection.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/SessionKeysCollection.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Configuration; using System.Linq; using WebsitePanel.WebDavPortal.WebConfigSections; -namespace WebsitePanel.WebDavPortal.Config.Entities +namespace WebsitePanel.WebDav.Core.Config.Entities { public class SessionKeysCollection : AbstractConfigCollection { @@ -14,12 +13,12 @@ namespace WebsitePanel.WebDavPortal.Config.Entities _sessionKeys = ConfigSection.SessionKeys.Cast(); } - public string AccountInfo + public string AuthTicket { get { SessionKeysElement sessionKey = - _sessionKeys.FirstOrDefault(x => x.Key == SessionKeysElement.AccountInfoKey); + _sessionKeys.FirstOrDefault(x => x.Key == SessionKeysElement.AuthTicketKey); return sessionKey != null ? sessionKey.Value : null; } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/WebsitePanelConstantUserParameters.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/WebsitePanelConstantUserParameters.cs similarity index 85% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/WebsitePanelConstantUserParameters.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/WebsitePanelConstantUserParameters.cs index 41336fcb..fdc6c99f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/WebsitePanelConstantUserParameters.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/WebsitePanelConstantUserParameters.cs @@ -1,4 +1,4 @@ -namespace WebsitePanel.WebDavPortal.Config.Entities +namespace WebsitePanel.WebDav.Core.Config.Entities { public class WebsitePanelConstantUserParameters : AbstractConfigCollection { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/IWebDavAppConfig.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/IWebDavAppConfig.cs similarity index 81% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/IWebDavAppConfig.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/IWebDavAppConfig.cs index efed85e9..9bb3b4d8 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/IWebDavAppConfig.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/IWebDavAppConfig.cs @@ -1,6 +1,6 @@ -using WebsitePanel.WebDavPortal.Config.Entities; +using WebsitePanel.WebDav.Core.Config.Entities; -namespace WebsitePanel.WebDavPortal.Config +namespace WebsitePanel.WebDav.Core.Config { public interface IWebDavAppConfig { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ApplicationNameElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/ApplicationNameElement.cs similarity index 83% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ApplicationNameElement.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/ApplicationNameElement.cs index 7ab267ea..149c4432 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ApplicationNameElement.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/ApplicationNameElement.cs @@ -1,6 +1,6 @@ using System.Configuration; -namespace WebsitePanel.WebDavPortal.WebConfigSections +namespace WebsitePanel.WebDav.Core.Config.WebConfigSections { public class ApplicationNameElement : ConfigurationElement { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/AuthTimeoutCookieNameElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/AuthTimeoutCookieNameElement.cs new file mode 100644 index 00000000..7585199a --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/AuthTimeoutCookieNameElement.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WebsitePanel.WebDav.Core.Config.WebConfigSections +{ + public class AuthTimeoutCookieNameElement : ConfigurationElement + { + private const string ValueKey = "value"; + + [ConfigurationProperty(ValueKey, IsKey = true, IsRequired = true)] + public string Value + { + get { return (string)this[ValueKey]; } + set { this[ValueKey] = value; } + } + } +} diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ElementsRenderingElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/ElementsRenderingElement.cs similarity index 92% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ElementsRenderingElement.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/ElementsRenderingElement.cs index a5a9a6ce..f25b2034 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/ElementsRenderingElement.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/ElementsRenderingElement.cs @@ -1,6 +1,6 @@ using System.Configuration; -namespace WebsitePanel.WebDavPortal.WebConfigSections +namespace WebsitePanel.WebDav.Core.Config.WebConfigSections { public class ElementsRenderingElement : ConfigurationElement { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/FileIconsElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/FileIconsElement.cs similarity index 88% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/FileIconsElement.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/FileIconsElement.cs index bd31e4e1..a55039c4 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/FileIconsElement.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/FileIconsElement.cs @@ -1,6 +1,6 @@ using System.Configuration; -namespace WebsitePanel.WebDavPortal.WebConfigSections +namespace WebsitePanel.WebDav.Core.Config.WebConfigSections { public class FileIconsElement : ConfigurationElement { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/FileIconsElementCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/FileIconsElementCollection.cs similarity index 90% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/FileIconsElementCollection.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/FileIconsElementCollection.cs index 90868515..fb3d5340 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/FileIconsElementCollection.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/FileIconsElementCollection.cs @@ -1,6 +1,6 @@ using System.Configuration; -namespace WebsitePanel.WebDavPortal.WebConfigSections +namespace WebsitePanel.WebDav.Core.Config.WebConfigSections { [ConfigurationCollection(typeof (FileIconsElement))] public class FileIconsElementCollection : ConfigurationElementCollection diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/OfficeOnlineElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElement.cs similarity index 100% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/OfficeOnlineElement.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElement.cs diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/OfficeOnlineElementCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElementCollection.cs similarity index 100% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/OfficeOnlineElementCollection.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElementCollection.cs diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/SessionKeysElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElement.cs similarity index 91% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/SessionKeysElement.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElement.cs index d082c528..cfe2e0b9 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/SessionKeysElement.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElement.cs @@ -8,6 +8,7 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections private const string ValueKey = "value"; public const string AccountInfoKey = "AccountInfoSessionKey"; + public const string AuthTicketKey = "AuthTicketKey"; public const string WebDavManagerKey = "WebDavManagerSessionKey"; public const string ResourseRenderCountKey = "ResourseRenderCountSessionKey"; public const string ItemIdSessionKey = "ItemId"; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/SessionKeysElementCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElementCollection.cs similarity index 78% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/SessionKeysElementCollection.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElementCollection.cs index 31abb74e..b1c67591 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/SessionKeysElementCollection.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElementCollection.cs @@ -1,6 +1,7 @@ using System.Configuration; +using WebsitePanel.WebDavPortal.WebConfigSections; -namespace WebsitePanel.WebDavPortal.WebConfigSections +namespace WebsitePanel.WebDav.Core.Config.WebConfigSections { [ConfigurationCollection(typeof (SessionKeysElement))] public class SessionKeysElementCollection : ConfigurationElementCollection diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/UserDomainElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/UserDomainElement.cs similarity index 83% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/UserDomainElement.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/UserDomainElement.cs index c8ce5ab9..68145beb 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/UserDomainElement.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/UserDomainElement.cs @@ -1,6 +1,6 @@ using System.Configuration; -namespace WebsitePanel.WebDavPortal.WebConfigSections +namespace WebsitePanel.WebDav.Core.Config.WebConfigSections { public class UserDomainElement : ConfigurationElement { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs similarity index 84% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs index e84491ab..af4e472e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs @@ -1,10 +1,12 @@ using System.Configuration; +using WebsitePanel.WebDav.Core.Config.WebConfigSections; namespace WebsitePanel.WebDavPortal.WebConfigSections { public class WebDavExplorerConfigurationSettingsSection : ConfigurationSection { private const string UserDomainKey = "userDomain"; + private const string AuthTimeoutCookieNameKey = "authTimeoutCookieName"; private const string AppName = "applicationName"; private const string WebsitePanelConstantUserKey = "websitePanelConstantUser"; private const string ElementsRenderingKey = "elementsRendering"; @@ -16,6 +18,13 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections public const string SectionName = "webDavExplorerConfigurationSettings"; + [ConfigurationProperty(AuthTimeoutCookieNameKey, IsRequired = true)] + public AuthTimeoutCookieNameElement AuthTimeoutCookieName + { + get { return (AuthTimeoutCookieNameElement)this[AuthTimeoutCookieNameKey]; } + set { this[AuthTimeoutCookieNameKey] = value; } + } + [ConfigurationProperty(UserDomainKey, IsRequired = true)] public UserDomainElement UserDomain { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/WebsitePanelConstantUserElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebsitePanelConstantUserElement.cs similarity index 89% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/WebsitePanelConstantUserElement.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebsitePanelConstantUserElement.cs index dfbb388e..abe87357 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/WebsitePanelConstantUserElement.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebsitePanelConstantUserElement.cs @@ -1,6 +1,6 @@ using System.Configuration; -namespace WebsitePanel.WebDavPortal.WebConfigSections +namespace WebsitePanel.WebDav.Core.Config.WebConfigSections { public class WebsitePanelConstantUserElement : ConfigurationElement { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/WebDavAppConfigManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebDavAppConfigManager.cs similarity index 86% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/WebDavAppConfigManager.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebDavAppConfigManager.cs index 31e9d2b9..cd28a090 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/WebDavAppConfigManager.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebDavAppConfigManager.cs @@ -1,8 +1,8 @@ using System.Configuration; -using WebsitePanel.WebDavPortal.Config.Entities; +using WebsitePanel.WebDav.Core.Config.Entities; using WebsitePanel.WebDavPortal.WebConfigSections; -namespace WebsitePanel.WebDavPortal.Config +namespace WebsitePanel.WebDav.Core.Config { public class WebDavAppConfigManager : IWebDavAppConfig { @@ -35,6 +35,11 @@ namespace WebsitePanel.WebDavPortal.Config get { return _configSection.ApplicationName.Value; } } + public string AuthTimeoutCookieName + { + get { return _configSection.AuthTimeoutCookieName.Value; } + } + public ElementsRendering ElementsRendering { get; private set; } public WebsitePanelConstantUserParameters WebsitePanelConstantUserParameters { get; private set; } public SessionKeysCollection SessionKeys { get; private set; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Security/IAuthenticationService.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Security/IAuthenticationService.cs new file mode 100644 index 00000000..6bd042a4 --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Security/IAuthenticationService.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WebsitePanel.WebDav.Core.Security.Authentication.Principals; + +namespace WebsitePanel.WebDav.Core.Interfaces.Security +{ + public interface IAuthenticationService + { + WspPrincipal LogIn(string login, string password); + void CreateAuthenticationTicket(WspPrincipal principal); + void LogOut(); + } +} diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_GlobalResources/Resource.errors.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Resources/HttpErrors.Designer.cs similarity index 82% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_GlobalResources/Resource.errors.designer.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Resources/HttpErrors.Designer.cs index f673f97d..33bd76c7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_GlobalResources/Resource.errors.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Resources/HttpErrors.Designer.cs @@ -1,14 +1,14 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18449 +// Runtime Version:4.0.30319.33440 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace Resources.Resource { +namespace WebsitePanel.WebDav.Core.Resources { using System; @@ -18,18 +18,18 @@ namespace Resources.Resource { // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option or rebuild the Visual Studio project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "12.0.0.0")] + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class errors { + internal class HttpErrors { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal errors() { + internal HttpErrors() { } /// @@ -39,7 +39,7 @@ namespace Resources.Resource { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Resources.Resource.errors", global::System.Reflection.Assembly.Load("App_GlobalResources")); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WebsitePanel.WebDav.Core.Resources.HttpErrors", typeof(HttpErrors).Assembly); resourceMan = temp; } return resourceMan; @@ -60,15 +60,6 @@ namespace Resources.Resource { } } - /// - /// Looks up a localized string similar to Fatal error. - /// - internal static string Default { - get { - return ResourceManager.GetString("Default", resourceCulture); - } - } - /// /// Looks up a localized string similar to The requested content was not found. /// @@ -86,5 +77,14 @@ namespace Resources.Resource { return ResourceManager.GetString("_500", resourceCulture); } } + + /// + /// Looks up a localized string similar to Fatal error. + /// + internal static string Default { + get { + return ResourceManager.GetString("Default", resourceCulture); + } + } } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_GlobalResources/Resource.errors.resx b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Resources/HttpErrors.resx similarity index 100% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_GlobalResources/Resource.errors.resx rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Resources/HttpErrors.resx diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs new file mode 100644 index 00000000..0c3208e8 --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs @@ -0,0 +1,74 @@ +using System; +using System.DirectoryServices.AccountManagement; +using System.Web; +using System.Web.Script.Serialization; +using System.Web.Security; +using WebsitePanel.WebDav.Core.Interfaces.Security; +using WebsitePanel.WebDav.Core.Security.Authentication.Principals; +using WebsitePanel.WebDav.Core.Security.Cryptography; +using WebsitePanel.WebDav.Core.Wsp.Framework; + +namespace WebsitePanel.WebDav.Core.Security.Authentication +{ + public class FormsAuthenticationService : IAuthenticationService + { + private readonly ICryptography _cryptography; + private readonly PrincipalContext _principalContext; + + public FormsAuthenticationService(ICryptography cryptography) + { + _cryptography = cryptography; + _principalContext = new PrincipalContext(ContextType.Domain); + } + + public WspPrincipal LogIn(string login, string password) + { + if (_principalContext.ValidateCredentials(login, password) == false) + { + return null; + } + + var principal = new WspPrincipal(login); + + var exchangeAccount = WSP.Services.ExchangeServer.GetAccountByAccountNameWithoutItemId(login); + var organization = WSP.Services.Organizations.GetOrganization(exchangeAccount.ItemId); + + principal.AccountId = exchangeAccount.AccountId; + principal.ItemId = exchangeAccount.ItemId; + principal.OrganizationId = organization.OrganizationId; + principal.DisplayName = exchangeAccount.DisplayName; + principal.EncryptedPassword = _cryptography.Encrypt(password); + + CreateAuthenticationTicket(principal); + + HttpContext.Current.User = principal; + + return principal; + } + + public void CreateAuthenticationTicket(WspPrincipal principal) + { + var serializer = new JavaScriptSerializer(); + string userData = serializer.Serialize(principal); + + var authTicket = new FormsAuthenticationTicket(1, principal.Identity.Name, DateTime.Now, DateTime.Now.Add(FormsAuthentication.Timeout), + FormsAuthentication.SlidingExpiration, userData); + + var encTicket = FormsAuthentication.Encrypt(authTicket); + + var cookie = new HttpCookie(FormsAuthentication.FormsCookieName, encTicket); + + if (FormsAuthentication.SlidingExpiration) + { + cookie.Expires = authTicket.Expiration; + } + + HttpContext.Current.Response.Cookies.Add(cookie); + } + + public void LogOut() + { + FormsAuthentication.SignOut(); + } + } +} diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/Principals/WspPrincipal.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/Principals/WspPrincipal.cs new file mode 100644 index 00000000..15401a14 --- /dev/null +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/Principals/WspPrincipal.cs @@ -0,0 +1,47 @@ +using System.Security.Principal; +using System.Web.Script.Serialization; +using System.Web.Security; +using System.Xml.Serialization; + +namespace WebsitePanel.WebDav.Core.Security.Authentication.Principals +{ + public class WspPrincipal : IPrincipal + { + public int AccountId { get; set; } + public string OrganizationId { get; set; } + public int ItemId { get; set; } + + public string Login { get; set; } + public string EncryptedPassword { get; set; } + + public string DisplayName { get; set; } + + public string UserName + { + get + { + return !string.IsNullOrEmpty(Login) ? Login.Split('@')[0] : string.Empty; + } + } + + [XmlIgnore, ScriptIgnore] + public IIdentity Identity { get; private set; } + + public WspPrincipal(string username) + { + Identity = new GenericIdentity(username); + Login = username; + } + + public WspPrincipal() + { + } + + public bool IsInRole(string role) + { + return Identity.IsAuthenticated + && !string.IsNullOrWhiteSpace(role) + && Roles.IsUserInRole(Identity.Name, role); + } + } +} diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Cryptography/CryptoUtils.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Cryptography/CryptoUtils.cs similarity index 94% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Cryptography/CryptoUtils.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Cryptography/CryptoUtils.cs index 5251babd..893ebfc1 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Cryptography/CryptoUtils.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Cryptography/CryptoUtils.cs @@ -1,14 +1,11 @@ -using Microsoft.Win32; -using System; -using System.Collections.Generic; +using System; using System.Configuration; using System.IO; -using System.Linq; using System.Security.Cryptography; using System.Text; -using System.Web; +using Microsoft.Win32; -namespace WebsitePanel.WebDavPortal.Cryptography +namespace WebsitePanel.WebDav.Core.Security.Cryptography { public class CryptoUtils : ICryptography { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Cryptography/ICryptography.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Cryptography/ICryptography.cs similarity index 67% rename from WebsitePanel/Sources/WebsitePanel.WebDavPortal/Cryptography/ICryptography.cs rename to WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Cryptography/ICryptography.cs index 09eb03a4..b3c8e6a1 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Cryptography/ICryptography.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Cryptography/ICryptography.cs @@ -1,4 +1,4 @@ -namespace WebsitePanel.WebDavPortal.Cryptography +namespace WebsitePanel.WebDav.Core.Security.Cryptography { public interface ICryptography { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj index 03eaee5a..cdd7e02b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj @@ -11,6 +11,8 @@ WebsitePanel.WebDav.Core v4.5 512 + ..\ + true true @@ -30,18 +32,82 @@ 4 + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + False + ..\..\..\..\Scheduler Domains\WebsitePanel\Bin\Microsoft.Web.Services3.dll + True + + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Web.dll + + + False + ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll + + + False + ..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll + + + False + ..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll + + + + False + ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll + + + False + ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll + + + False + ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll + + + ..\WebsitePanel.WebPortal\Bin\WebsitePanel.EnterpriseServer.Client.dll + + + ..\WebsitePanel.WebPortal\Bin\WebsitePanel.Providers.Base.dll + + + + + + + + + + + + + + + + + + + + + + @@ -49,6 +115,7 @@ + @@ -56,9 +123,45 @@ + + True + True + HttpErrors.resx + + + + + + + + + + + + + + + + + {C99EFB18-FFE7-45BB-8CA8-29336F3E8C68} + WebsitePanel.WebPortal + + + + + ResXFileCodeGenerator + HttpErrors.Designer.cs + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj index 369a9e7b..bd1bf241 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj @@ -137,31 +137,14 @@ - - True - True - Resource.errors.resx - - - - - - - - - - - - - @@ -186,17 +169,6 @@ - - - - - - - - - - - @@ -248,6 +220,7 @@ Designer + @@ -256,6 +229,7 @@ + @@ -292,22 +266,11 @@ - - - GlobalResourceProxyGenerator - Resource.errors.designer.cs - Designer - - {BA147805-9EF1-45F2-BF32-A5825D4E950D} WebsitePanel.WebDav.Core - - {12232731-5C45-4ED6-98F8-D47ABE728280} - WebsitePanel.Portal.Modules - 10.0 diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config index e9fed748..f297089d 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/packages.config @@ -3,6 +3,7 @@ + From 70daade557c5b37180782d4c8699b80a5d6dda62 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 13 Jan 2015 05:12:44 -0800 Subject: [PATCH 20/23] webdav portal bug fixes --- .../Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs | 3 +-- .../WebsitePanel.WebDavPortal/Controllers/AccountController.cs | 1 + WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs index bb502e15..d8b9682d 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs @@ -35,8 +35,7 @@ namespace WebsitePanel.WebDavPortal routes.MapRoute( name: FileSystemRouteNames.FilePath, url: "{org}/{*pathPart}", - defaults: new { controller = "FileSystem", action = "ShowContent", pathPart = UrlParameter.Optional }, - constraints: new { org = new Constraints.OrganizationRouteConstraint() } + defaults: new { controller = "FileSystem", action = "ShowContent", pathPart = UrlParameter.Optional } ); routes.MapRoute( diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs index 2ce7cb64..5c8e2ab7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs @@ -12,6 +12,7 @@ using WebsitePanel.WebDav.Core; namespace WebsitePanel.WebDavPortal.Controllers { + [AllowAnonymous] public class AccountController : Controller { private readonly ICryptography _cryptography; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config index ccb50c45..25d53401 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config @@ -90,7 +90,7 @@ - + From 412fe073dc27640ec01052fcdbd5fe556ccd27b4 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 13 Jan 2015 05:25:22 -0800 Subject: [PATCH 21/23] webdav portal bugs fix --- .../Security/Authentication/FormsAuthenticationService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs index 0c3208e8..b33ae4ac 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authentication/FormsAuthenticationService.cs @@ -3,6 +3,7 @@ using System.DirectoryServices.AccountManagement; using System.Web; using System.Web.Script.Serialization; using System.Web.Security; +using WebsitePanel.WebDav.Core.Config; using WebsitePanel.WebDav.Core.Interfaces.Security; using WebsitePanel.WebDav.Core.Security.Authentication.Principals; using WebsitePanel.WebDav.Core.Security.Cryptography; @@ -18,7 +19,7 @@ namespace WebsitePanel.WebDav.Core.Security.Authentication public FormsAuthenticationService(ICryptography cryptography) { _cryptography = cryptography; - _principalContext = new PrincipalContext(ContextType.Domain); + _principalContext = new PrincipalContext(ContextType.Domain, WebDavAppConfigManager.Instance.UserDomain); } public WspPrincipal LogIn(string login, string password) From 92befdea38e0375b2b25c429628399670b894ae1 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 13 Jan 2015 05:44:17 -0800 Subject: [PATCH 22/23] webdav portal bug fixes --- .../Controllers/AccountController.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs index 5c8e2ab7..f3b3e1b2 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs @@ -44,6 +44,8 @@ namespace WebsitePanel.WebDavPortal.Controllers if (user.Identity.IsAuthenticated) { + Session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] = null; + return RedirectToRoute(FileSystemRouteNames.FilePath, new { org = WspContext.User.OrganizationId }); } @@ -55,6 +57,8 @@ namespace WebsitePanel.WebDavPortal.Controllers { _authenticationService.LogOut(); + Session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] = null; + return RedirectToRoute(AccountRouteNames.Login); } } From 37310201ba318e10026f2601201ce904911d5c0f Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 13 Jan 2015 10:38:50 -0500 Subject: [PATCH 23/23] Added tag build-2.1.0.530 for changeset 41efb7375170