From 70502cd8815410b310359e475e61ac77b9821396 Mon Sep 17 00:00:00 2001 From: Sean Long Date: Fri, 17 Apr 2020 16:25:00 -0400 Subject: [PATCH 1/8] OS independent file paths --- .gitignore | 1 + Oqtane.Client/Services/FileService.cs | 4 ++-- Oqtane.Client/Services/FolderService.cs | 4 ++-- Oqtane.Server/Controllers/FileController.cs | 24 ++++++++++--------- Oqtane.Server/Controllers/FolderController.cs | 5 ++-- .../Controllers/ModuleDefinitionController.cs | 10 ++++---- Oqtane.Server/Controllers/ThemeController.cs | 2 +- Oqtane.Server/Controllers/UserController.cs | 4 ++-- .../Infrastructure/DatabaseManager.cs | 4 ++-- .../Infrastructure/InstallationManager.cs | 2 +- .../SiteTemplates/DefaultSiteTemplate.cs | 11 +++++---- Oqtane.Server/Repository/SiteRepository.cs | 2 +- Oqtane.Upgrade/Program.cs | 4 ++-- 13 files changed, 41 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 33c751ad..8f8f91ba 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ Oqtane.Server/appsettings.json Oqtane.Server/Data/*.mdf Oqtane.Server/Data/*.ldf +/Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs index 09389f1e..c073a460 100644 --- a/Oqtane.Client/Services/FileService.cs +++ b/Oqtane.Client/Services/FileService.cs @@ -42,9 +42,9 @@ namespace Oqtane.Services public async Task> GetFilesAsync(int siteId, string folderPath) { - if (!folderPath.EndsWith("\\")) + if (!(folderPath.EndsWith(System.IO.Path.DirectorySeparatorChar) || folderPath.EndsWith(System.IO.Path.AltDirectorySeparatorChar))) { - folderPath += "\\"; + folderPath = System.IO.Path.Combine(folderPath, " ").TrimEnd(' '); } var path = WebUtility.UrlEncode(folderPath); diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs index 9d63ae8d..6c3fd69d 100644 --- a/Oqtane.Client/Services/FolderService.cs +++ b/Oqtane.Client/Services/FolderService.cs @@ -38,9 +38,9 @@ namespace Oqtane.Services public async Task GetFolderAsync(int siteId, [NotNull] string folderPath) { - if (!folderPath.EndsWith("\\")) + if (!(folderPath.EndsWith(System.IO.Path.DirectorySeparatorChar) || folderPath.EndsWith(System.IO.Path.AltDirectorySeparatorChar))) { - folderPath += "\\"; + folderPath = System.IO.Path.Combine(folderPath, " ").TrimEnd(' '); } var path = WebUtility.UrlEncode(folderPath); diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 71095f2d..5b22b062 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -161,7 +161,7 @@ namespace Oqtane.Controllers { _files.DeleteFile(id); - string filepath = Path.Combine(GetFolderPath(file.Folder) + file.Name); + string filepath = Path.Combine(GetFolderPath(file.Folder), file.Name); if (System.IO.File.Exists(filepath)) { System.IO.File.Delete(filepath); @@ -199,14 +199,15 @@ namespace Oqtane.Controllers try { var client = new WebClient(); + string targetPath = Path.Combine(folderPath, filename); // remove file if it already exists - if (System.IO.File.Exists(folderPath + filename)) + if (System.IO.File.Exists(targetPath)) { - System.IO.File.Delete(folderPath + filename); + System.IO.File.Delete(targetPath); } - client.DownloadFile(url, folderPath + filename); - _files.AddFile(CreateFile(filename, folder.FolderId, folderPath + filename)); + client.DownloadFile(url, targetPath); + _files.AddFile(CreateFile(filename, folder.FolderId, targetPath)); } catch { @@ -262,7 +263,7 @@ namespace Oqtane.Controllers string upload = await MergeFile(folderPath, file.FileName); if (upload != "" && folderId != -1) { - _files.AddFile(CreateFile(upload, folderId, folderPath + upload)); + _files.AddFile(CreateFile(upload, folderId, Path.Combine(folderPath, upload))); } } else @@ -400,7 +401,7 @@ namespace Oqtane.Controllers { if (_userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions)) { - string filepath = GetFolderPath(file.Folder) + file.Name; + string filepath = Path.Combine(GetFolderPath(file.Folder) , file.Name); if (System.IO.File.Exists(filepath)) { byte[] filebytes = System.IO.File.ReadAllBytes(filepath); @@ -430,12 +431,12 @@ namespace Oqtane.Controllers private string GetFolderPath(Folder folder) { - return _environment.ContentRootPath + "\\Content\\Tenants\\" + _tenants.GetTenant().TenantId.ToString() + "\\Sites\\" + folder.SiteId.ToString() + "\\" + folder.Path; + return Path.Combine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path, " ").TrimEnd(' '); } private string GetFolderPath(string folder) { - return Path.Combine(_environment.WebRootPath, folder); + return Path.Combine(_environment.WebRootPath, folder, " ").TrimEnd(' '); } private void CreateDirectory(string folderpath) @@ -443,10 +444,11 @@ namespace Oqtane.Controllers if (!Directory.Exists(folderpath)) { string path = ""; - string[] folders = folderpath.Split(new[] {'\\'}, StringSplitOptions.RemoveEmptyEntries); + var separators = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }; + string[] folders = folderpath.Split(separators, StringSplitOptions.RemoveEmptyEntries); foreach (string folder in folders) { - path += folder + "\\"; + path = Path.Combine(path, folder); if (!Directory.Exists(path)) { Directory.CreateDirectory(path); diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index ee75a536..a1e48fc1 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -9,6 +9,7 @@ using Oqtane.Enums; using Oqtane.Infrastructure; using Oqtane.Repository; using Oqtane.Security; +using System.IO; namespace Oqtane.Controllers { @@ -109,7 +110,7 @@ namespace Oqtane.Controllers if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) { Folder parent = _folders.GetFolder(folder.ParentId.Value); - folder.Path = parent.Path + folder.Name + "\\"; + folder.Path = Path.Combine(parent.Path, folder.Name); } folder = _folders.AddFolder(folder); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder); @@ -134,7 +135,7 @@ namespace Oqtane.Controllers if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) { Folder parent = _folders.GetFolder(folder.ParentId.Value); - folder.Path = parent.Path + folder.Name + "\\"; + folder.Path = Path.Combine(parent.Path, folder.Name); } folder = _folders.UpdateFolder(folder); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", folder); diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index b197e62d..03e1937f 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -138,7 +138,7 @@ namespace Oqtane.Controllers assemblyname = assemblyname.Replace(".Server", ""); // clean up module static resource folder - string folder = Path.Combine(_environment.WebRootPath, "Modules\\" + assemblyname); + string folder = Path.Combine(_environment.WebRootPath, Path.Combine("Modules",assemblyname)); if (Directory.Exists(folder)) { Directory.Delete(folder, true); @@ -189,17 +189,17 @@ namespace Oqtane.Controllers { string rootPath; DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath); - string templatePath = Path.Combine(rootFolder.FullName, "Oqtane.Client\\Modules\\Admin\\ModuleCreator\\Templates\\" + moduleDefinition.Template + "\\"); + string templatePath = Path.Combine(rootFolder.FullName, "Oqtane.Client", "Modules", "Admin", "ModuleCreator", "Templates",moduleDefinition.Template," ").TrimEnd(' '); if (moduleDefinition.Template == "internal") { - rootPath = rootFolder.FullName + "\\"; + rootPath = rootFolder.FullName; moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, Oqtane.Client"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, Oqtane.Server"; } else { - rootPath = rootFolder.Parent.FullName + "\\" + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module\\"; + rootPath = Path.Combine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module"); moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Client"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Server"; } @@ -218,7 +218,7 @@ namespace Oqtane.Controllers private void ProcessTemplatesRecursively(DirectoryInfo current, string rootPath, string rootFolder, string templatePath, ModuleDefinition moduleDefinition) { // process folder - string folderPath = rootPath + current.FullName.Replace(templatePath, ""); + string folderPath = Path.Combine(rootPath, current.FullName.Replace(templatePath, "")); folderPath = folderPath.Replace("[Owner]", moduleDefinition.Owner); folderPath = folderPath.Replace("[Module]", moduleDefinition.Name); if (!Directory.Exists(folderPath)) diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index af7af8e1..5f516851 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -58,7 +58,7 @@ namespace Oqtane.Controllers { themename = theme.ThemeName.Substring(0, theme.ThemeName.IndexOf(",")); - string folder = Path.Combine(_environment.WebRootPath, "Themes\\" + themename); + string folder = Path.Combine(_environment.WebRootPath, "Themes" , themename); if (Directory.Exists(folder)) { Directory.Delete(folder, true); diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index c0cec6a8..dfcb5b48 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -150,7 +150,7 @@ namespace Oqtane.Controllers } // add folder for user - Folder folder = _folders.GetFolder(user.SiteId, "Users\\"); + Folder folder = _folders.GetFolder(user.SiteId, "Users"); if (folder != null) { _folders.AddFolder(new Folder @@ -158,7 +158,7 @@ namespace Oqtane.Controllers SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", - Path = folder.Path + newUser.UserId.ToString() + "\\", + Path = System.IO.Path.Combine(folder.Path, newUser.UserId.ToString()), Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + newUser.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" + diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index dabe8c78..40f30092 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -387,14 +387,14 @@ namespace Oqtane.Infrastructure } // add folder for user - var folder = folderRepository.GetFolder(user.SiteId, "Users\\"); + var folder = folderRepository.GetFolder(user.SiteId, "Users"); if (folder != null) folderRepository.AddFolder(new Folder { SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", - Path = folder.Path + newUser.UserId + "\\", + Path = Path.Combine(folder.Path, newUser.UserId.ToString()), Order = 1, IsSystem = true, Permissions = new List diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index a85fdcc7..f37d719e 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -103,7 +103,7 @@ namespace Oqtane.Infrastructure case ".svg": case ".js": case ".css": - filename = sourceFolder + "\\" + entry.FullName.Replace("wwwroot", name).Replace("/", "\\"); + filename = Path.Combine(sourceFolder, entry.FullName.Replace("wwwroot", name)); if (!Directory.Exists(Path.GetDirectoryName(filename))) { Directory.CreateDirectory(Path.GetDirectoryName(filename)); diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index daab95f1..150373a2 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Oqtane.Repository; using Microsoft.AspNetCore.Hosting; using Oqtane.Shared; +using System.IO; namespace Oqtane.SiteTemplates { @@ -131,16 +132,16 @@ namespace Oqtane.SiteTemplates } }); - if (System.IO.File.Exists(_environment.WebRootPath + "\\images\\logo.png")) + if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo.png"))) { - string folderpath = _environment.ContentRootPath + "\\Content\\Tenants\\" + site.TenantId.ToString() + "\\Sites\\" + site.SiteId.ToString() + "\\"; + string folderpath = Path.Combine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString()); System.IO.Directory.CreateDirectory(folderpath); - if (!System.IO.File.Exists(folderpath + "logo.png")) + if (!System.IO.File.Exists(Path.Combine(folderpath, "logo.png"))) { - System.IO.File.Copy(_environment.WebRootPath + "\\images\\logo.png", folderpath + "logo.png"); + System.IO.File.Copy(Path.Combine(_environment.WebRootPath, "images", "logo.png"), Path.Combine(folderpath, "logo.png")); } Folder folder = _folderRepository.GetFolder(site.SiteId, ""); - File file = _fileRepository.AddFile(new File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 }); + Oqtane.Models.File file = _fileRepository.AddFile(new Oqtane.Models.File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 }); site.LogoFileId = file.FileId; _siteRepository.UpdateSite(site); } diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 4cba5e20..2d5db9e7 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -583,7 +583,7 @@ namespace Oqtane.Repository }); _folderRepository.AddFolder(new Folder { - SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = "Users\\", Order = 1, IsSystem = true, + SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = "Users", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" }); diff --git a/Oqtane.Upgrade/Program.cs b/Oqtane.Upgrade/Program.cs index 8aa70d3b..f1f0f9b4 100644 --- a/Oqtane.Upgrade/Program.cs +++ b/Oqtane.Upgrade/Program.cs @@ -13,11 +13,11 @@ namespace Oqtane.Upgrade string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); // assumes that the application executable must be deployed to the /bin of the Oqtane.Server project - if (binfolder.Contains("Oqtane.Server\\bin")) + if (binfolder.Contains(Path.Combine("Oqtane.Server", "bin"))) { // ie. binfolder = Oqtane.Server\bin\Debug\netcoreapp3.0\ string rootfolder = Directory.GetParent(binfolder).Parent.Parent.FullName; - string deployfolder = Path.Combine(rootfolder, "wwwroot\\Framework"); + string deployfolder = Path.Combine(rootfolder, Path.Combine("wwwroot","Framework")); if (Directory.Exists(deployfolder)) { From ce118096b7df9e133b9011a411e86eba21502be6 Mon Sep 17 00:00:00 2001 From: Sean Long Date: Sat, 18 Apr 2020 12:53:41 -0400 Subject: [PATCH 2/8] Updated for consistant delimiter presence with source --- Oqtane.Server/Controllers/FileController.cs | 6 +++--- Oqtane.Server/Controllers/FolderController.cs | 4 ++-- Oqtane.Server/Controllers/ModuleDefinitionController.cs | 4 ++-- Oqtane.Server/Controllers/UserController.cs | 6 ++++-- Oqtane.Server/Infrastructure/DatabaseManager.cs | 5 +++-- Oqtane.Server/Infrastructure/InstallationManager.cs | 3 ++- .../Infrastructure/SiteTemplates/DefaultSiteTemplate.cs | 2 +- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 5b22b062..5e57e3e5 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -431,12 +431,12 @@ namespace Oqtane.Controllers private string GetFolderPath(Folder folder) { - return Path.Combine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path, " ").TrimEnd(' '); + return Path.Combine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path); } private string GetFolderPath(string folder) { - return Path.Combine(_environment.WebRootPath, folder, " ").TrimEnd(' '); + return Path.Combine(_environment.WebRootPath, folder); } private void CreateDirectory(string folderpath) @@ -448,7 +448,7 @@ namespace Oqtane.Controllers string[] folders = folderpath.Split(separators, StringSplitOptions.RemoveEmptyEntries); foreach (string folder in folders) { - path = Path.Combine(path, folder); + path = Path.Combine(path, folder," ").TrimEnd(' '); if (!Directory.Exists(path)) { Directory.CreateDirectory(path); diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index a1e48fc1..b74fcdde 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -110,7 +110,7 @@ namespace Oqtane.Controllers if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) { Folder parent = _folders.GetFolder(folder.ParentId.Value); - folder.Path = Path.Combine(parent.Path, folder.Name); + folder.Path = Path.Combine(parent.Path, folder.Name," ").TrimEnd(' '); } folder = _folders.AddFolder(folder); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder); @@ -135,7 +135,7 @@ namespace Oqtane.Controllers if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) { Folder parent = _folders.GetFolder(folder.ParentId.Value); - folder.Path = Path.Combine(parent.Path, folder.Name); + folder.Path = Path.Combine(parent.Path, folder.Name, " ").TrimEnd(' '); } folder = _folders.UpdateFolder(folder); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", folder); diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 03e1937f..ce6a7001 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -193,13 +193,13 @@ namespace Oqtane.Controllers if (moduleDefinition.Template == "internal") { - rootPath = rootFolder.FullName; + rootPath = Path.Combine(rootFolder.FullName," ").TrimEnd(' '); moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, Oqtane.Client"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, Oqtane.Server"; } else { - rootPath = Path.Combine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module"); + rootPath = Path.Combine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module", " ").TrimEnd(' '); moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Client"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Server"; } diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index dfcb5b48..fe1da778 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -13,6 +13,7 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure; using Oqtane.Repository; +using System.IO; namespace Oqtane.Controllers { @@ -150,7 +151,8 @@ namespace Oqtane.Controllers } // add folder for user - Folder folder = _folders.GetFolder(user.SiteId, "Users"); + string usersPath = Path.Combine("Users"," ").TrimEnd(' '); + Folder folder = _folders.GetFolder(user.SiteId, usersPath); if (folder != null) { _folders.AddFolder(new Folder @@ -158,7 +160,7 @@ namespace Oqtane.Controllers SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", - Path = System.IO.Path.Combine(folder.Path, newUser.UserId.ToString()), + Path = Path.Combine(folder.Path, newUser.UserId.ToString(), " ").TrimEnd(' '), Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + newUser.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" + diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 40f30092..a51c0238 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -387,14 +387,15 @@ namespace Oqtane.Infrastructure } // add folder for user - var folder = folderRepository.GetFolder(user.SiteId, "Users"); + string usersPath = Path.Combine("Users", " ").TrimEnd(' '); + var folder = folderRepository.GetFolder(user.SiteId, usersPath); if (folder != null) folderRepository.AddFolder(new Folder { SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", - Path = Path.Combine(folder.Path, newUser.UserId.ToString()), + Path = Path.Combine(folder.Path, newUser.UserId.ToString(), " ").TrimEnd(' '), Order = 1, IsSystem = true, Permissions = new List diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index f37d719e..21121689 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -103,7 +103,8 @@ namespace Oqtane.Infrastructure case ".svg": case ".js": case ".css": - filename = Path.Combine(sourceFolder, entry.FullName.Replace("wwwroot", name)); + string entryPath = Path.Combine(entry.FullName.Replace("wwwroot", name).Split("/")); + filename = Path.Combine(sourceFolder, entryPath); if (!Directory.Exists(Path.GetDirectoryName(filename))) { Directory.CreateDirectory(Path.GetDirectoryName(filename)); diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 150373a2..26dfaed0 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -134,7 +134,7 @@ namespace Oqtane.SiteTemplates if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo.png"))) { - string folderpath = Path.Combine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString()); + string folderpath = Path.Combine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString()," ").TrimEnd(); System.IO.Directory.CreateDirectory(folderpath); if (!System.IO.File.Exists(Path.Combine(folderpath, "logo.png"))) { From c07ebdd41b691afd942bb5c731147394412653e3 Mon Sep 17 00:00:00 2001 From: Sean Long Date: Sat, 18 Apr 2020 12:54:12 -0400 Subject: [PATCH 3/8] Revert "Updated for consistant delimiter presence with source" This reverts commit ce118096b7df9e133b9011a411e86eba21502be6. --- Oqtane.Server/Controllers/FileController.cs | 6 +++--- Oqtane.Server/Controllers/FolderController.cs | 4 ++-- Oqtane.Server/Controllers/ModuleDefinitionController.cs | 4 ++-- Oqtane.Server/Controllers/UserController.cs | 6 ++---- Oqtane.Server/Infrastructure/DatabaseManager.cs | 5 ++--- Oqtane.Server/Infrastructure/InstallationManager.cs | 3 +-- .../Infrastructure/SiteTemplates/DefaultSiteTemplate.cs | 2 +- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 5e57e3e5..5b22b062 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -431,12 +431,12 @@ namespace Oqtane.Controllers private string GetFolderPath(Folder folder) { - return Path.Combine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path); + return Path.Combine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path, " ").TrimEnd(' '); } private string GetFolderPath(string folder) { - return Path.Combine(_environment.WebRootPath, folder); + return Path.Combine(_environment.WebRootPath, folder, " ").TrimEnd(' '); } private void CreateDirectory(string folderpath) @@ -448,7 +448,7 @@ namespace Oqtane.Controllers string[] folders = folderpath.Split(separators, StringSplitOptions.RemoveEmptyEntries); foreach (string folder in folders) { - path = Path.Combine(path, folder," ").TrimEnd(' '); + path = Path.Combine(path, folder); if (!Directory.Exists(path)) { Directory.CreateDirectory(path); diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index b74fcdde..a1e48fc1 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -110,7 +110,7 @@ namespace Oqtane.Controllers if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) { Folder parent = _folders.GetFolder(folder.ParentId.Value); - folder.Path = Path.Combine(parent.Path, folder.Name," ").TrimEnd(' '); + folder.Path = Path.Combine(parent.Path, folder.Name); } folder = _folders.AddFolder(folder); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder); @@ -135,7 +135,7 @@ namespace Oqtane.Controllers if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) { Folder parent = _folders.GetFolder(folder.ParentId.Value); - folder.Path = Path.Combine(parent.Path, folder.Name, " ").TrimEnd(' '); + folder.Path = Path.Combine(parent.Path, folder.Name); } folder = _folders.UpdateFolder(folder); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", folder); diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index ce6a7001..03e1937f 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -193,13 +193,13 @@ namespace Oqtane.Controllers if (moduleDefinition.Template == "internal") { - rootPath = Path.Combine(rootFolder.FullName," ").TrimEnd(' '); + rootPath = rootFolder.FullName; moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, Oqtane.Client"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, Oqtane.Server"; } else { - rootPath = Path.Combine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module", " ").TrimEnd(' '); + rootPath = Path.Combine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module"); moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Client"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Server"; } diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index fe1da778..dfcb5b48 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -13,7 +13,6 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure; using Oqtane.Repository; -using System.IO; namespace Oqtane.Controllers { @@ -151,8 +150,7 @@ namespace Oqtane.Controllers } // add folder for user - string usersPath = Path.Combine("Users"," ").TrimEnd(' '); - Folder folder = _folders.GetFolder(user.SiteId, usersPath); + Folder folder = _folders.GetFolder(user.SiteId, "Users"); if (folder != null) { _folders.AddFolder(new Folder @@ -160,7 +158,7 @@ namespace Oqtane.Controllers SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", - Path = Path.Combine(folder.Path, newUser.UserId.ToString(), " ").TrimEnd(' '), + Path = System.IO.Path.Combine(folder.Path, newUser.UserId.ToString()), Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + newUser.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" + diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index a51c0238..40f30092 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -387,15 +387,14 @@ namespace Oqtane.Infrastructure } // add folder for user - string usersPath = Path.Combine("Users", " ").TrimEnd(' '); - var folder = folderRepository.GetFolder(user.SiteId, usersPath); + var folder = folderRepository.GetFolder(user.SiteId, "Users"); if (folder != null) folderRepository.AddFolder(new Folder { SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", - Path = Path.Combine(folder.Path, newUser.UserId.ToString(), " ").TrimEnd(' '), + Path = Path.Combine(folder.Path, newUser.UserId.ToString()), Order = 1, IsSystem = true, Permissions = new List diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index 21121689..f37d719e 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -103,8 +103,7 @@ namespace Oqtane.Infrastructure case ".svg": case ".js": case ".css": - string entryPath = Path.Combine(entry.FullName.Replace("wwwroot", name).Split("/")); - filename = Path.Combine(sourceFolder, entryPath); + filename = Path.Combine(sourceFolder, entry.FullName.Replace("wwwroot", name)); if (!Directory.Exists(Path.GetDirectoryName(filename))) { Directory.CreateDirectory(Path.GetDirectoryName(filename)); diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 26dfaed0..150373a2 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -134,7 +134,7 @@ namespace Oqtane.SiteTemplates if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo.png"))) { - string folderpath = Path.Combine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString()," ").TrimEnd(); + string folderpath = Path.Combine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString()); System.IO.Directory.CreateDirectory(folderpath); if (!System.IO.File.Exists(Path.Combine(folderpath, "logo.png"))) { From f0043f53eefac457f15c5b7a2d7622d993a2bae5 Mon Sep 17 00:00:00 2001 From: Sean Long Date: Sat, 18 Apr 2020 14:57:31 -0400 Subject: [PATCH 4/8] OS independent file paths & Utility.PathCombine added System.IO.Path.Combine provides cross-platform support for system paths, however rooted paths discarding of earlier segments Utilities.PathCombine ensures if any parameters start with root chacters does not discard previous Utilities.PathCombine allows appending of "\\" to translate to the correct cross-platform result --- Oqtane.Client/Services/FileService.cs | 2 +- Oqtane.Client/Services/FolderService.cs | 2 +- Oqtane.Server/Controllers/FileController.cs | 6 +++--- Oqtane.Server/Controllers/FolderController.cs | 4 ++-- .../Controllers/ModuleDefinitionController.cs | 8 ++++---- Oqtane.Server/Controllers/UserController.cs | 4 ++-- Oqtane.Server/Infrastructure/DatabaseManager.cs | 4 ++-- .../Infrastructure/InstallationManager.cs | 3 ++- .../SiteTemplates/DefaultSiteTemplate.cs | 2 +- Oqtane.Server/Repository/SiteRepository.cs | 3 ++- Oqtane.Shared/Shared/Utilities.cs | 17 +++++++++++++++++ 11 files changed, 37 insertions(+), 18 deletions(-) diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs index c073a460..871a123f 100644 --- a/Oqtane.Client/Services/FileService.cs +++ b/Oqtane.Client/Services/FileService.cs @@ -44,7 +44,7 @@ namespace Oqtane.Services { if (!(folderPath.EndsWith(System.IO.Path.DirectorySeparatorChar) || folderPath.EndsWith(System.IO.Path.AltDirectorySeparatorChar))) { - folderPath = System.IO.Path.Combine(folderPath, " ").TrimEnd(' '); + folderPath = Utilities.PathCombine(folderPath,"\\"); } var path = WebUtility.UrlEncode(folderPath); diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs index 6c3fd69d..0446b285 100644 --- a/Oqtane.Client/Services/FolderService.cs +++ b/Oqtane.Client/Services/FolderService.cs @@ -40,7 +40,7 @@ namespace Oqtane.Services { if (!(folderPath.EndsWith(System.IO.Path.DirectorySeparatorChar) || folderPath.EndsWith(System.IO.Path.AltDirectorySeparatorChar))) { - folderPath = System.IO.Path.Combine(folderPath, " ").TrimEnd(' '); + folderPath = Utilities.PathCombine(folderPath, "\\"); } var path = WebUtility.UrlEncode(folderPath); diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 5b22b062..d6e94644 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -431,12 +431,12 @@ namespace Oqtane.Controllers private string GetFolderPath(Folder folder) { - return Path.Combine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path, " ").TrimEnd(' '); + return Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path); } private string GetFolderPath(string folder) { - return Path.Combine(_environment.WebRootPath, folder, " ").TrimEnd(' '); + return Utilities.PathCombine(_environment.WebRootPath, folder); } private void CreateDirectory(string folderpath) @@ -448,7 +448,7 @@ namespace Oqtane.Controllers string[] folders = folderpath.Split(separators, StringSplitOptions.RemoveEmptyEntries); foreach (string folder in folders) { - path = Path.Combine(path, folder); + path = Utilities.PathCombine(path, folder,"\\"); if (!Directory.Exists(path)) { Directory.CreateDirectory(path); diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index a1e48fc1..55c19039 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -110,7 +110,7 @@ namespace Oqtane.Controllers if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) { Folder parent = _folders.GetFolder(folder.ParentId.Value); - folder.Path = Path.Combine(parent.Path, folder.Name); + folder.Path = Utilities.PathCombine(parent.Path, folder.Name,"\\"); } folder = _folders.AddFolder(folder); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder); @@ -135,7 +135,7 @@ namespace Oqtane.Controllers if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) { Folder parent = _folders.GetFolder(folder.ParentId.Value); - folder.Path = Path.Combine(parent.Path, folder.Name); + folder.Path = Utilities.PathCombine(parent.Path, folder.Name,"\\"); } folder = _folders.UpdateFolder(folder); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", folder); diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 03e1937f..4535b6f7 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -189,17 +189,17 @@ namespace Oqtane.Controllers { string rootPath; DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath); - string templatePath = Path.Combine(rootFolder.FullName, "Oqtane.Client", "Modules", "Admin", "ModuleCreator", "Templates",moduleDefinition.Template," ").TrimEnd(' '); + string templatePath = Utilities.PathCombine(rootFolder.FullName, "Oqtane.Client", "Modules", "Admin", "ModuleCreator", "Templates",moduleDefinition.Template,"\\"); if (moduleDefinition.Template == "internal") { - rootPath = rootFolder.FullName; + rootPath = Utilities.PathCombine(rootFolder.FullName,"\\"); moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, Oqtane.Client"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, Oqtane.Server"; } else { - rootPath = Path.Combine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module"); + rootPath = Utilities.PathCombine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module","\\"); moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Client"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Server"; } @@ -218,7 +218,7 @@ namespace Oqtane.Controllers private void ProcessTemplatesRecursively(DirectoryInfo current, string rootPath, string rootFolder, string templatePath, ModuleDefinition moduleDefinition) { // process folder - string folderPath = Path.Combine(rootPath, current.FullName.Replace(templatePath, "")); + string folderPath = Utilities.PathCombine(rootPath, current.FullName.Replace(templatePath, "")); folderPath = folderPath.Replace("[Owner]", moduleDefinition.Owner); folderPath = folderPath.Replace("[Module]", moduleDefinition.Name); if (!Directory.Exists(folderPath)) diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index dfcb5b48..bfba1459 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -150,7 +150,7 @@ namespace Oqtane.Controllers } // add folder for user - Folder folder = _folders.GetFolder(user.SiteId, "Users"); + Folder folder = _folders.GetFolder(user.SiteId, Utilities.PathCombine("Users","\\")); if (folder != null) { _folders.AddFolder(new Folder @@ -158,7 +158,7 @@ namespace Oqtane.Controllers SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", - Path = System.IO.Path.Combine(folder.Path, newUser.UserId.ToString()), + Path = Utilities.PathCombine(folder.Path, newUser.UserId.ToString(),"\\"), Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + newUser.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" + diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 838dd582..5ca2eaa2 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -387,14 +387,14 @@ namespace Oqtane.Infrastructure } // add folder for user - var folder = folderRepository.GetFolder(user.SiteId, "Users"); + var folder = folderRepository.GetFolder(user.SiteId, Utilities.PathCombine("Users","\\")); if (folder != null) folderRepository.AddFolder(new Folder { SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", - Path = Path.Combine(folder.Path, newUser.UserId.ToString()), + Path = Utilities.PathCombine(folder.Path, newUser.UserId.ToString(),"\\"), Order = 1, IsSystem = true, Permissions = new List diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index f37d719e..4cfbaa6b 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -103,7 +103,8 @@ namespace Oqtane.Infrastructure case ".svg": case ".js": case ".css": - filename = Path.Combine(sourceFolder, entry.FullName.Replace("wwwroot", name)); + string entryPath = Utilities.PathCombine(entry.FullName.Replace("wwwroot", name).Split('/')); + filename = Path.Combine(sourceFolder, entryPath); if (!Directory.Exists(Path.GetDirectoryName(filename))) { Directory.CreateDirectory(Path.GetDirectoryName(filename)); diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 150373a2..91f4bc39 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -134,7 +134,7 @@ namespace Oqtane.SiteTemplates if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo.png"))) { - string folderpath = Path.Combine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString()); + string folderpath = Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString(),"\\"); System.IO.Directory.CreateDirectory(folderpath); if (!System.IO.File.Exists(Path.Combine(folderpath, "logo.png"))) { diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 2d5db9e7..4405536a 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Reflection; using Microsoft.EntityFrameworkCore; @@ -583,7 +584,7 @@ namespace Oqtane.Repository }); _folderRepository.AddFolder(new Folder { - SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = "Users", Order = 1, IsSystem = true, + SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = Utilities.PathCombine("Users","\\"), Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" }); diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs index 662d524d..0f7d603d 100644 --- a/Oqtane.Shared/Shared/Utilities.cs +++ b/Oqtane.Shared/Shared/Utilities.cs @@ -1,5 +1,6 @@ using System; using System.Globalization; +using System.IO; using System.Text; using System.Text.RegularExpressions; @@ -236,5 +237,21 @@ namespace Oqtane.Shared @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-0-9a-z]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$", RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250)); } + + public static string PathCombine(params string[] segments) + { + var separators = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }; + + for (int i =1;i < segments.Length; i++){ + if(Path.IsPathRooted(segments[i])){ + segments[i] = segments[i].TrimStart(separators); + if(String.IsNullOrEmpty(segments[i])){ + segments[i]=" "; + } + } + } + + return Path.Combine(segments).TrimEnd(); + } } } From a09be84824cd9abb8ce43369199a4c262b12c7ff Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Sat, 25 Apr 2020 10:58:38 +0200 Subject: [PATCH 5/8] Create Data directoty if does not exists --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 76e91390..e4743800 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -38,6 +38,10 @@ namespace Oqtane.Infrastructure { var defaultConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey); var defaultAlias = GetInstallationConfig(SettingKeys.DefaultAliasKey, string.Empty); + var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString(); + + //create data directory if does not exists + if (!Directory.Exists(dataDirectory)) Directory.CreateDirectory(dataDirectory); // if no values specified, fallback to IDE installer if (string.IsNullOrEmpty(defaultConnectionString)) @@ -61,7 +65,6 @@ namespace Oqtane.Infrastructure if (result.Success) { - var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString(); WriteVersionInfo(defaultConnectionString); TenantMigration(defaultConnectionString, dataDirectory); } @@ -69,7 +72,6 @@ namespace Oqtane.Infrastructure if (_isInstalled && !IsDefaultSiteInstalled(defaultConnectionString)) { BuildDefaultSite(password,email); - } } @@ -210,7 +212,6 @@ namespace Oqtane.Infrastructure private static void ModuleMigration(Assembly assembly, string connectionString) { - Console.WriteLine($"Migrating assembly {assembly.FullName}"); var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString) .WithScriptsEmbeddedInAssembly(assembly, s => !s.ToLower().Contains("uninstall.sql")); // scripts must be included as Embedded Resources From 91d1e7c684367a370dc273448a23b0f94ac9da65 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 25 Apr 2020 17:25:20 +0300 Subject: [PATCH 6/8] Updated to Blazor WebAssembly 3.2 preview 5 --- Oqtane.Client/Oqtane.Client.csproj | 4 ++-- Oqtane.Server/Oqtane.Server.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index acc4da87..fbae9656 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index fd6d457d..0813064d 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -26,7 +26,7 @@ - + From 967f92c1aa8a814d6dd55a5e09101ca289958653 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 25 Apr 2020 17:35:50 +0300 Subject: [PATCH 7/8] Render line break conditionally in HtmlText module --- Oqtane.Client/Modules/HtmlText/Index.razor | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor index 47bf0b61..abb59c7c 100644 --- a/Oqtane.Client/Modules/HtmlText/Index.razor +++ b/Oqtane.Client/Modules/HtmlText/Index.razor @@ -8,9 +8,15 @@ @((MarkupString)content) -
+@if (PageState.EditMode) +{ +
+} -

+@if (PageState.EditMode) +{ +

+} @code { private string content = ""; From 7606e7b488fe6f6c9607a5c90f55a8ee24482802 Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Sun, 26 Apr 2020 16:19:20 +0200 Subject: [PATCH 8/8] Permission Optimalization --- Oqtane.Server/Controllers/FolderController.cs | 11 +++--- Oqtane.Server/Controllers/PageController.cs | 17 ++++----- .../SiteTemplates/DefaultSiteTemplate.cs | 38 +++++++++---------- .../SiteTemplates/EmptySiteTemplate.cs | 10 ++--- Oqtane.Server/Repository/FileRepository.cs | 5 ++- Oqtane.Server/Repository/FolderRepository.cs | 11 +++--- .../Interfaces/IPermissionRepository.cs | 7 +++- .../Repository/ModuleDefinitionRepository.cs | 10 ++--- Oqtane.Server/Repository/ModuleRepository.cs | 17 +++++---- .../Repository/PageModuleRepository.cs | 17 ++++----- Oqtane.Server/Repository/PageRepository.cs | 19 ++++------ .../Repository/PermissionRepository.cs | 17 +++++++++ Oqtane.Server/Security/UserPermissions.cs | 2 +- 13 files changed, 97 insertions(+), 84 deletions(-) diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index ee75a536..ea0b9e1f 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -6,6 +6,7 @@ using Oqtane.Shared; using System.Linq; using System.Net; using Oqtane.Enums; +using Oqtane.Extensions; using Oqtane.Infrastructure; using Oqtane.Repository; using Oqtane.Security; @@ -17,14 +18,12 @@ namespace Oqtane.Controllers { private readonly IFolderRepository _folders; private readonly IUserPermissions _userPermissions; - private readonly IPermissionRepository _permissionRepository; private readonly ILogManager _logger; - public FolderController(IFolderRepository folders, IUserPermissions userPermissions, IPermissionRepository permissionRepository, ILogManager logger) + public FolderController(IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger) { _folders = folders; _userPermissions = userPermissions; - _permissionRepository = permissionRepository; _logger = logger; } @@ -100,9 +99,9 @@ namespace Oqtane.Controllers } else { - permissions = _permissionRepository.EncodePermissions(new List { - new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }); + permissions = new List { + new Permission(PermissionNames.Edit, Constants.AdminRole, true), + }.EncodePermissions(); } if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions)) { diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 2b87c7e4..e65eee0d 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -7,6 +7,7 @@ using System.Linq; using Oqtane.Security; using System.Net; using Oqtane.Enums; +using Oqtane.Extensions; using Oqtane.Infrastructure; using Oqtane.Repository; @@ -19,17 +20,15 @@ namespace Oqtane.Controllers private readonly IModuleRepository _modules; private readonly IPageModuleRepository _pageModules; private readonly IUserPermissions _userPermissions; - private readonly IPermissionRepository _permissionRepository; private readonly ISyncManager _syncManager; private readonly ILogManager _logger; - public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, IPermissionRepository permissionRepository, ISyncManager syncManager, ILogManager logger) + public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger) { _pages = pages; _modules = modules; _pageModules = pageModules; _userPermissions = userPermissions; - _permissionRepository = permissionRepository; _syncManager = syncManager; _logger = logger; } @@ -113,9 +112,9 @@ namespace Oqtane.Controllers } else { - permissions = _permissionRepository.EncodePermissions(new List { + permissions = new List { new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }); + }.EncodePermissions(); } if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions)) @@ -156,10 +155,10 @@ namespace Oqtane.Controllers page.ThemeType = parent.ThemeType; page.LayoutType = parent.LayoutType; page.Icon = parent.Icon; - page.Permissions = _permissionRepository.EncodePermissions(new List { + page.Permissions = new List { new Permission(PermissionNames.View, userid, true), new Permission(PermissionNames.Edit, userid, true) - }); + }.EncodePermissions(); page.IsPersonalizable = false; page.UserId = int.Parse(userid); page = _pages.AddPage(page); @@ -173,10 +172,10 @@ namespace Oqtane.Controllers module.SiteId = page.SiteId; module.PageId = page.PageId; module.ModuleDefinitionName = pm.Module.ModuleDefinitionName; - module.Permissions = _permissionRepository.EncodePermissions(new List { + module.Permissions = new List { new Permission(PermissionNames.View, userid, true), new Permission(PermissionNames.Edit, userid, true) - }); + }.EncodePermissions(); module = _modules.AddModule(module); string content = _modules.ExportModule(pm.ModuleId); diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index daab95f1..bdd46680 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -3,21 +3,21 @@ using Oqtane.Infrastructure; using System.Collections.Generic; using Oqtane.Repository; using Microsoft.AspNetCore.Hosting; +using Oqtane.Extensions; using Oqtane.Shared; namespace Oqtane.SiteTemplates { public class DefaultSiteTemplate : ISiteTemplate { - private readonly IPermissionRepository _permissionRepository; + private readonly IWebHostEnvironment _environment; private readonly ISiteRepository _siteRepository; private readonly IFolderRepository _folderRepository; private readonly IFileRepository _fileRepository; - public DefaultSiteTemplate(IPermissionRepository permissionRepository, IWebHostEnvironment environment, ISiteRepository siteRepository, IFolderRepository folderRepository, IFileRepository fileRepository) + public DefaultSiteTemplate(IWebHostEnvironment environment, ISiteRepository siteRepository, IFolderRepository folderRepository, IFileRepository fileRepository) { - _permissionRepository = permissionRepository; _environment = environment; _siteRepository = siteRepository; _folderRepository = folderRepository; @@ -42,40 +42,40 @@ namespace Oqtane.SiteTemplates IsNavigation = true, IsPersonalizable = false, EditMode = false, - PagePermissions = _permissionRepository.EncodePermissions( new List { + PagePermissions = new List { new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }) , + }.EncodePermissions() , PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", - ModulePermissions = _permissionRepository.EncodePermissions( new List { + ModulePermissions = new List { new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }), + }.EncodePermissions(), Content = "

Oqtane is an open source modular application framework built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a fully dynamic web development experience which can be executed on a client or server. Whether you are looking for a platform to accelerate your web development efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.

" + "

Join Our Community  Clone Our Repo

" + "

Blazor is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.

" + "

Blazor is a feature of ASP.NET Core 3, the popular cross platform web development framework from Microsoft that extends the .NET developer platform with tools and libraries for building web apps.

" }, new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content", - ModulePermissions = _permissionRepository.EncodePermissions( new List { + ModulePermissions = new List { new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }), + }.EncodePermissions(), Content = "

Copyright (c) 2019-2020 .NET Foundation

" + "

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

" + "

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

" + "

THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

" }, new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", - ModulePermissions = _permissionRepository.EncodePermissions( new List { + ModulePermissions = new List { new Permission(PermissionNames.View, Constants.RegisteredRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }), + }.EncodePermissions(), Content = "

Oqtane allows you to control access to your content using security roles. This module is only visible to Registered Users of the site.

" } } @@ -89,18 +89,18 @@ namespace Oqtane.SiteTemplates IsNavigation = true, IsPersonalizable = false, EditMode = false, - PagePermissions = _permissionRepository.EncodePermissions(new List { + PagePermissions = new List { new Permission(PermissionNames.View, Constants.RegisteredRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }), + }.EncodePermissions(), PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", - ModulePermissions = _permissionRepository.EncodePermissions( new List { + ModulePermissions = new List { new Permission(PermissionNames.View, Constants.RegisteredRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }), + }.EncodePermissions(), Content = "

Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.

" } } @@ -114,18 +114,18 @@ namespace Oqtane.SiteTemplates IsNavigation = true, IsPersonalizable = true, EditMode = false, - PagePermissions = _permissionRepository.EncodePermissions(new List { + PagePermissions = new List { new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }), + }.EncodePermissions(), PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content", - ModulePermissions = _permissionRepository.EncodePermissions( new List { + ModulePermissions = new List { new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }), + }.EncodePermissions(), Content = "

Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.

" } } diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs index 51c4a29b..1dfefdf0 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs @@ -1,6 +1,7 @@ using Oqtane.Models; using Oqtane.Infrastructure; using System.Collections.Generic; +using Oqtane.Extensions; using Oqtane.Repository; using Oqtane.Shared; @@ -8,11 +9,8 @@ namespace Oqtane.SiteTemplates { public class EmptySiteTemplate : ISiteTemplate { - private readonly IPermissionRepository _permissionRepository; - - public EmptySiteTemplate(IPermissionRepository permissionRepository) + public EmptySiteTemplate() { - _permissionRepository = permissionRepository; } public string Name @@ -33,11 +31,11 @@ namespace Oqtane.SiteTemplates IsNavigation = true, IsPersonalizable = false, EditMode = false, - PagePermissions = _permissionRepository.EncodePermissions( new List { + PagePermissions = new List { new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.Edit, Constants.AdminRole, true) - }), + }.EncodePermissions(), PageTemplateModules = new List() }); diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs index a74f2ce9..f532bb6e 100644 --- a/Oqtane.Server/Repository/FileRepository.cs +++ b/Oqtane.Server/Repository/FileRepository.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; +using Oqtane.Extensions; using Oqtane.Models; using Oqtane.Shared; @@ -23,7 +24,7 @@ namespace Oqtane.Repository IEnumerable files = _db.File.Where(item => item.FolderId == folderId).Include(item => item.Folder); foreach (File file in files) { - file.Folder.Permissions = _permissions.EncodePermissions(permissions); + file.Folder.Permissions = permissions.EncodePermissions(); } return files; } @@ -48,7 +49,7 @@ namespace Oqtane.Repository if (file != null) { IEnumerable permissions = _permissions.GetPermissions(EntityNames.Folder, file.FolderId).ToList(); - file.Folder.Permissions = _permissions.EncodePermissions(permissions); + file.Folder.Permissions = permissions.EncodePermissions(); } return file; } diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs index c83fa215..56b42c7b 100644 --- a/Oqtane.Server/Repository/FolderRepository.cs +++ b/Oqtane.Server/Repository/FolderRepository.cs @@ -1,6 +1,7 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; +using Oqtane.Extensions; using Oqtane.Models; using Oqtane.Shared; @@ -23,7 +24,7 @@ namespace Oqtane.Repository IEnumerable folders = _db.Folder.Where(item => item.SiteId == siteId); foreach(Folder folder in folders) { - folder.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == folder.FolderId)); + folder.Permissions = permissions.Where(item => item.EntityId == folder.FolderId).EncodePermissions(); } return folders; } @@ -49,8 +50,7 @@ namespace Oqtane.Repository Folder folder = _db.Folder.Find(folderId); if (folder != null) { - IEnumerable permissions = _permissions.GetPermissions(EntityNames.Folder, folder.FolderId).ToList(); - folder.Permissions = _permissions.EncodePermissions(permissions); + folder.Permissions = _permissions.GetPermissionString(EntityNames.Folder, folder.FolderId); } return folder; } @@ -60,8 +60,7 @@ namespace Oqtane.Repository Folder folder = _db.Folder.Where(item => item.SiteId == siteId && item.Path == path).FirstOrDefault(); if (folder != null) { - IEnumerable permissions = _permissions.GetPermissions(EntityNames.Folder, folder.FolderId).ToList(); - folder.Permissions = _permissions.EncodePermissions(permissions); + folder.Permissions = _permissions.GetPermissionString(EntityNames.Folder, folder.FolderId); } return folder; } diff --git a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs index 5be9bb50..21c349e4 100644 --- a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; +// ReSharper disable once CheckNamespace namespace Oqtane.Repository { public interface IPermissionRepository @@ -8,13 +9,17 @@ namespace Oqtane.Repository IEnumerable GetPermissions(int siteId, string entityName); IEnumerable GetPermissions(string entityName, int entityId); IEnumerable GetPermissions(string entityName, int entityId, string permissionName); + + string GetPermissionString(int siteId, string entityName); + string GetPermissionString(string entityName, int entityId); + string GetPermissionString(string entityName, int entityId, string permissionName); + Permission AddPermission(Permission permission); Permission UpdatePermission(Permission permission); void UpdatePermissions(int siteId, string entityName, int entityId, string permissionStrings); Permission GetPermission(int permissionId); void DeletePermission(int permissionId); void DeletePermissions(int siteId, string entityName, int entityId); - string EncodePermissions(IEnumerable permissionList); IEnumerable DecodePermissions(string permissions, int siteId, string entityName, int entityId); } } diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index 4803ba9e..b687ace3 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -115,7 +115,7 @@ namespace Oqtane.Repository } else { - moduledefinition.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId)); + moduledefinition.Permissions = permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId).EncodePermissions(); } // remove module definition from list as it is already synced moduledefs.Remove(moduledef); @@ -160,7 +160,7 @@ namespace Oqtane.Repository { if (modulecontroltype.Name != "ModuleBase" && !modulecontroltype.Namespace.EndsWith(".Controls")) { - string[] typename = modulecontroltype.AssemblyQualifiedName.Split(',').Select(item => item.Trim()).ToList().ToArray(); + string[] typename = modulecontroltype.AssemblyQualifiedName?.Split(',').Select(item => item.Trim()).ToArray(); string[] segments = typename[0].Split('.'); Array.Resize(ref segments, segments.Length - 1); string moduleType = string.Join(".", segments); @@ -195,7 +195,7 @@ namespace Oqtane.Repository // set internal properties moduledefinition.ModuleDefinitionName = qualifiedModuleType; moduledefinition.ControlTypeTemplate = moduleType + "." + Constants.ActionToken + ", " + typename[1]; - moduledefinition.AssemblyName = assembly.FullName.Split(",")[0]; + moduledefinition.AssemblyName = assembly.GetName().Name; if (assembly.FullName.StartsWith("Oqtane.Client")) { moduledefinition.Version = Constants.Version; @@ -225,8 +225,8 @@ namespace Oqtane.Repository moduledefinition = moduledefinitions[index]; // actions var modulecontrolobject = Activator.CreateInstance(modulecontroltype); - string actions = (string)modulecontroltype.GetProperty("Actions").GetValue(modulecontrolobject); - if (actions != "") + string actions = (string)modulecontroltype.GetProperty("Actions")?.GetValue(modulecontrolobject); + if (!string.IsNullOrEmpty(actions)) { foreach (string action in actions.Split(',')) { diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index 7d88f0a1..7f38a1bf 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; using System.Text.Json; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; @@ -52,9 +51,9 @@ namespace Oqtane.Repository Module module = _db.Module.Find(moduleId); if (module != null) { - List permissions = _permissions.GetPermissions("Module", module.ModuleId).ToList(); - module.Permissions = _permissions.EncodePermissions(permissions); + module.Permissions = _permissions.GetPermissionString("Module", module.ModuleId); } + return module; } @@ -75,7 +74,7 @@ namespace Oqtane.Repository if (module != null) { List moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList(); - ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault(); + ModuleDefinition moduledefinition = moduledefinitions.FirstOrDefault(item => item.ModuleDefinitionName == module.ModuleDefinitionName); if (moduledefinition != null) { ModuleContent modulecontent = new ModuleContent(); @@ -89,9 +88,10 @@ namespace Oqtane.Repository if (moduletype != null && moduletype.GetInterface("IPortable") != null) { var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype); - modulecontent.Content = ((IPortable)moduleobject).ExportModule(module); + modulecontent.Content = ((IPortable) moduleobject).ExportModule(module); } } + content = JsonSerializer.Serialize(modulecontent); } } @@ -100,6 +100,7 @@ namespace Oqtane.Repository { // error occurred during export } + return content; } @@ -124,8 +125,8 @@ namespace Oqtane.Repository if (moduletype != null && moduletype.GetInterface("IPortable") != null) { var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype); - ((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version); - success = true; + ((IPortable) moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version); + success = true; } } } @@ -136,8 +137,8 @@ namespace Oqtane.Repository { // error occurred during import } + return success; } - } } diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index ee85270d..e78abb07 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; +using Oqtane.Extensions; using Oqtane.Models; namespace Oqtane.Repository @@ -21,12 +22,12 @@ namespace Oqtane.Repository IEnumerable pagemodules = _db.PageModule .Include(item => item.Module) // eager load modules .Where(item => item.Module.SiteId == siteId); - if (pagemodules != null && pagemodules.Any()) + if (pagemodules.Any()) { IEnumerable permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); foreach (PageModule pagemodule in pagemodules) { - pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == pagemodule.ModuleId)); + pagemodule.Module.Permissions = permissions.Where(item => item.EntityId == pagemodule.ModuleId).EncodePermissions(); } } return pagemodules; @@ -37,16 +38,16 @@ namespace Oqtane.Repository IEnumerable pagemodules = _db.PageModule .Include(item => item.Module) // eager load modules .Where(item => item.PageId == pageId); - if (pane != "" && pagemodules != null && pagemodules.Any()) + if (pane != "" && pagemodules.Any()) { pagemodules = pagemodules.Where(item => item.Pane == pane); } - if (pagemodules != null && pagemodules.Any()) + if (pagemodules.Any()) { IEnumerable permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); foreach (PageModule pagemodule in pagemodules) { - pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == pagemodule.ModuleId)); + pagemodule.Module.Permissions = permissions.Where(item => item.EntityId == pagemodule.ModuleId).EncodePermissions(); } } return pagemodules; @@ -72,8 +73,7 @@ namespace Oqtane.Repository .SingleOrDefault(item => item.PageModuleId == pageModuleId); if (pagemodule != null) { - IEnumerable permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); - pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions); + pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId); } return pagemodule; } @@ -84,8 +84,7 @@ namespace Oqtane.Repository .SingleOrDefault(item => item.PageId == pageId && item.ModuleId == moduleId); if (pagemodule != null) { - IEnumerable permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); - pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions); + pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId); } return pagemodule; } diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index 9e106e74..9db59dc2 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; +using Oqtane.Extensions; using Oqtane.Models; using Oqtane.Shared; @@ -25,7 +26,7 @@ namespace Oqtane.Repository IEnumerable pages = _db.Page.Where(item => item.SiteId == siteId && item.UserId == null); foreach(Page page in pages) { - page.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == page.PageId)); + page.Permissions = permissions.Where(item => item.EntityId == page.PageId).EncodePermissions(); } return pages; } @@ -51,8 +52,7 @@ namespace Oqtane.Repository Page page = _db.Page.Find(pageId); if (page != null) { - IEnumerable permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList(); - page.Permissions = _permissions.EncodePermissions(permissions); + page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId); } return page; } @@ -62,27 +62,22 @@ namespace Oqtane.Repository Page page = _db.Page.Find(pageId); if (page != null) { - Page personalized = _db.Page.Where(item => item.SiteId == page.SiteId && item.Path == page.Path && item.UserId == userId).FirstOrDefault(); + Page personalized = _db.Page.FirstOrDefault(item => item.SiteId == page.SiteId && item.Path == page.Path && item.UserId == userId); if (personalized != null) { page = personalized; } - if (page != null) - { - IEnumerable permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList(); - page.Permissions = _permissions.EncodePermissions(permissions); - } + page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId); } return page; } public Page GetPage(string path, int siteId) { - Page page = _db.Page.Where(item => item.Path == path && item.SiteId == siteId).FirstOrDefault(); + Page page = _db.Page.FirstOrDefault(item => item.Path == path && item.SiteId == siteId); if (page != null) { - IEnumerable permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList(); - page.Permissions = _permissions.EncodePermissions(permissions); + page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId); } return page; } diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index fd9670d3..7a66b3bf 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Text.Json; using Microsoft.EntityFrameworkCore; +using Oqtane.Extensions; using Oqtane.Models; namespace Oqtane.Repository @@ -41,6 +42,22 @@ namespace Oqtane.Repository .Include(item => item.Role); // eager load roles } + public string GetPermissionString(int siteId, string entityName) + { + return GetPermissions(siteId, entityName)?.EncodePermissions(); + } + + public string GetPermissionString(string entityName, int entityId) + { + return GetPermissions(entityName, entityId)?.EncodePermissions(); + } + + public string GetPermissionString(string entityName, int entityId, string permissionName) + { + return GetPermissions(entityName, entityId, permissionName)?.EncodePermissions(); + } + + public Permission AddPermission(Permission permission) { _db.Permission.Add(permission); diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index 72108b5d..14a13199 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -19,7 +19,7 @@ namespace Oqtane.Security public bool IsAuthorized(ClaimsPrincipal user, string entityName, int entityId, string permissionName) { - return IsAuthorized(user, permissionName, _permissions.EncodePermissions(_permissions.GetPermissions(entityName, entityId, permissionName).ToList())); + return IsAuthorized(user, permissionName, _permissions.GetPermissionString(entityName, entityId, permissionName)); } public bool IsAuthorized(ClaimsPrincipal user, string permissionName, string permissions)