kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #387 from SPSeanLong/master

Browse Source 
OS independent file paths
This commit is contained in:
Shaun Walker 2020-04-26 13:27:26 -04:00 committed by GitHub
commit c7b3aaf32f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ Oqtane.Server/appsettings.json
Oqtane.Server/Data/*.mdf Oqtane.Server/Data/*.mdf
Oqtane.Server/Data/*.ldf Oqtane.Server/Data/*.ldf
/Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml

4
Oqtane.Client/Services/FileService.cs
View File

@ -42,9 +42,9 @@ namespace Oqtane.Services
public async Task<List<File>> GetFilesAsync(int siteId, string folderPath) public async Task<List<File>> GetFilesAsync(int siteId, string folderPath)
{ {
if (!folderPath.EndsWith("\\")) if (!(folderPath.EndsWith(System.IO.Path.DirectorySeparatorChar) || folderPath.EndsWith(System.IO.Path.AltDirectorySeparatorChar)))
{ {
folderPath += "\\"; folderPath = Utilities.PathCombine(folderPath,"\\");
} }
var path = WebUtility.UrlEncode(folderPath); var path = WebUtility.UrlEncode(folderPath);

4
Oqtane.Client/Services/FolderService.cs
View File

@ -38,9 +38,9 @@ namespace Oqtane.Services
public async Task<Folder> GetFolderAsync(int siteId, [NotNull] string folderPath) public async Task<Folder> GetFolderAsync(int siteId, [NotNull] string folderPath)
{ {
if (!folderPath.EndsWith("\\")) if (!(folderPath.EndsWith(System.IO.Path.DirectorySeparatorChar) || folderPath.EndsWith(System.IO.Path.AltDirectorySeparatorChar)))
{ {
folderPath += "\\"; folderPath = Utilities.PathCombine(folderPath, "\\");
} }
var path = WebUtility.UrlEncode(folderPath); var path = WebUtility.UrlEncode(folderPath);

24
Oqtane.Server/Controllers/FileController.cs
View File

@ -161,7 +161,7 @@ namespace Oqtane.Controllers
{ {
_files.DeleteFile(id); _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)) if (System.IO.File.Exists(filepath))
{ {
System.IO.File.Delete(filepath); System.IO.File.Delete(filepath);
@ -199,14 +199,15 @@ namespace Oqtane.Controllers
try try
{ {
var client = new WebClient(); var client = new WebClient();
string targetPath = Path.Combine(folderPath, filename);
// remove file if it already exists // 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); client.DownloadFile(url, targetPath);
_files.AddFile(CreateFile(filename, folder.FolderId, folderPath + filename)); _files.AddFile(CreateFile(filename, folder.FolderId, targetPath));
} }
catch catch
{ {
@ -262,7 +263,7 @@ namespace Oqtane.Controllers
string upload = await MergeFile(folderPath, file.FileName); string upload = await MergeFile(folderPath, file.FileName);
if (upload != "" && folderId != -1) if (upload != "" && folderId != -1)
{ {
_files.AddFile(CreateFile(upload, folderId, folderPath + upload)); _files.AddFile(CreateFile(upload, folderId, Path.Combine(folderPath, upload)));
} }
} }
else else
@ -400,7 +401,7 @@ namespace Oqtane.Controllers
{ {
if (_userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions)) 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)) if (System.IO.File.Exists(filepath))
{ {
byte[] filebytes = System.IO.File.ReadAllBytes(filepath); byte[] filebytes = System.IO.File.ReadAllBytes(filepath);
@ -430,12 +431,12 @@ namespace Oqtane.Controllers
private string GetFolderPath(Folder folder) private string GetFolderPath(Folder folder)
{ {
return _environment.ContentRootPath + "\\Content\\Tenants\\" + _tenants.GetTenant().TenantId.ToString() + "\\Sites\\" + folder.SiteId.ToString() + "\\" + folder.Path; return Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path);
} }
private string GetFolderPath(string folder) private string GetFolderPath(string folder)
{ {
return Path.Combine(_environment.WebRootPath, folder); return Utilities.PathCombine(_environment.WebRootPath, folder);
} }
private void CreateDirectory(string folderpath) private void CreateDirectory(string folderpath)
@ -443,10 +444,11 @@ namespace Oqtane.Controllers
if (!Directory.Exists(folderpath)) if (!Directory.Exists(folderpath))
{ {
string path = ""; 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) foreach (string folder in folders)
{ {
path += folder + "\\"; path = Utilities.PathCombine(path, folder,"\\");
if (!Directory.Exists(path)) if (!Directory.Exists(path))
{ {
Directory.CreateDirectory(path); Directory.CreateDirectory(path);

5
Oqtane.Server/Controllers/FolderController.cs
View File

@ -10,6 +10,7 @@ using Oqtane.Extensions;
using Oqtane.Infrastructure; using Oqtane.Infrastructure;
using Oqtane.Repository; using Oqtane.Repository;
using Oqtane.Security; using Oqtane.Security;
using System.IO;
namespace Oqtane.Controllers namespace Oqtane.Controllers
{ {
@ -108,7 +109,7 @@ namespace Oqtane.Controllers
if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null)
{ {
Folder parent = _folders.GetFolder(folder.ParentId.Value); Folder parent = _folders.GetFolder(folder.ParentId.Value);
folder.Path = parent.Path + folder.Name + "\\"; folder.Path = Utilities.PathCombine(parent.Path, folder.Name,"\\");
} }
folder = _folders.AddFolder(folder); folder = _folders.AddFolder(folder);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder);
@ -133,7 +134,7 @@ namespace Oqtane.Controllers
if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null) if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null)
{ {
Folder parent = _folders.GetFolder(folder.ParentId.Value); Folder parent = _folders.GetFolder(folder.ParentId.Value);
folder.Path = parent.Path + folder.Name + "\\"; folder.Path = Utilities.PathCombine(parent.Path, folder.Name,"\\");
} }
folder = _folders.UpdateFolder(folder); folder = _folders.UpdateFolder(folder);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", folder); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", folder);

14
Oqtane.Server/Controllers/ModuleDefinitionController.cs
View File

@ -116,7 +116,7 @@ namespace Oqtane.Controllers
assemblyname = assemblyname.Replace(".Client", ""); assemblyname = assemblyname.Replace(".Client", "");
// clean up module static resource folder // 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)) if (Directory.Exists(folder))
{ {
Directory.Delete(folder, true); Directory.Delete(folder, true);
@ -130,6 +130,10 @@ namespace Oqtane.Controllers
System.IO.File.Delete(file); System.IO.File.Delete(file);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Assembly Removed {Filename}", file); _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Assembly Removed {Filename}", file);
} }
// clean up module schema versions
_sql.ExecuteNonQuery(tenant, "DELETE FROM [dbo].[SchemaVersions] WHERE ScriptName LIKE '" + assemblyname + "%'");
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Schema Versions Removed For {AssemblyName}", assemblyname);
} }
// remove module definition // remove module definition
@ -168,17 +172,17 @@ namespace Oqtane.Controllers
{ {
string rootPath; string rootPath;
DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath); DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath);
string templatePath = Path.Combine(rootFolder.FullName, "Oqtane.Client\\Modules\\Admin\\ModuleCreator\\Templates\\" + moduleDefinition.Template + "\\"); string templatePath = Utilities.PathCombine(rootFolder.FullName, "Oqtane.Client", "Modules", "Admin", "ModuleCreator", "Templates",moduleDefinition.Template,"\\");
if (moduleDefinition.Template == "internal") if (moduleDefinition.Template == "internal")
{ {
rootPath = rootFolder.FullName + "\\"; rootPath = Utilities.PathCombine(rootFolder.FullName,"\\");
moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, Oqtane.Client"; moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, Oqtane.Client";
moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, Oqtane.Server"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, Oqtane.Server";
} }
else else
{ {
rootPath = 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.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"; moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Server";
} }
@ -197,7 +201,7 @@ namespace Oqtane.Controllers
private void ProcessTemplatesRecursively(DirectoryInfo current, string rootPath, string rootFolder, string templatePath, ModuleDefinition moduleDefinition) private void ProcessTemplatesRecursively(DirectoryInfo current, string rootPath, string rootFolder, string templatePath, ModuleDefinition moduleDefinition)
{ {
// process folder // process folder
string folderPath = rootPath + current.FullName.Replace(templatePath, ""); string folderPath = Utilities.PathCombine(rootPath, current.FullName.Replace(templatePath, ""));
folderPath = folderPath.Replace("[Owner]", moduleDefinition.Owner); folderPath = folderPath.Replace("[Owner]", moduleDefinition.Owner);
folderPath = folderPath.Replace("[Module]", moduleDefinition.Name); folderPath = folderPath.Replace("[Module]", moduleDefinition.Name);
if (!Directory.Exists(folderPath)) if (!Directory.Exists(folderPath))

2
Oqtane.Server/Controllers/ThemeController.cs
View File

@ -58,7 +58,7 @@ namespace Oqtane.Controllers
{ {
themename = theme.ThemeName.Substring(0, theme.ThemeName.IndexOf(",")); 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)) if (Directory.Exists(folder))
{ {
Directory.Delete(folder, true); Directory.Delete(folder, true);

4
Oqtane.Server/Controllers/UserController.cs
View File

@ -150,7 +150,7 @@ namespace Oqtane.Controllers
} }
// add folder for user // add folder for user
Folder folder = _folders.GetFolder(user.SiteId, "Users\\"); Folder folder = _folders.GetFolder(user.SiteId, Utilities.PathCombine("Users","\\"));
if (folder != null) if (folder != null)
{ {
_folders.AddFolder(new Folder _folders.AddFolder(new Folder
@ -158,7 +158,7 @@ namespace Oqtane.Controllers
SiteId = folder.SiteId, SiteId = folder.SiteId,
ParentId = folder.FolderId, ParentId = folder.FolderId,
Name = "My Folder", Name = "My Folder",
Path = folder.Path + newUser.UserId.ToString() + "\\", Path = Utilities.PathCombine(folder.Path, newUser.UserId.ToString(),"\\"),
Order = 1, Order = 1,
IsSystem = true, IsSystem = true,
Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + newUser.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" + Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + newUser.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" +

4
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -388,14 +388,14 @@ namespace Oqtane.Infrastructure
} }
// add folder for user // add folder for user
var folder = folderRepository.GetFolder(user.SiteId, "Users\\"); var folder = folderRepository.GetFolder(user.SiteId, Utilities.PathCombine("Users","\\"));
if (folder != null) if (folder != null)
folderRepository.AddFolder(new Folder folderRepository.AddFolder(new Folder
{ {
SiteId = folder.SiteId, SiteId = folder.SiteId,
ParentId = folder.FolderId, ParentId = folder.FolderId,
Name = "My Folder", Name = "My Folder",
Path = folder.Path + newUser.UserId + "\\", Path = Utilities.PathCombine(folder.Path, newUser.UserId.ToString(),"\\"),
Order = 1, Order = 1,
IsSystem = true, IsSystem = true,
Permissions = new List<Permission> Permissions = new List<Permission>

3
Oqtane.Server/Infrastructure/InstallationManager.cs
View File

@ -103,7 +103,8 @@ namespace Oqtane.Infrastructure
case ".svg": case ".svg":
case ".js": case ".js":
case ".css": case ".css":
filename = sourceFolder + "\\" + entry.FullName.Replace("wwwroot", name).Replace("/", "\\"); string entryPath = Utilities.PathCombine(entry.FullName.Replace("wwwroot", name).Split('/'));
filename = Path.Combine(sourceFolder, entryPath);
if (!Directory.Exists(Path.GetDirectoryName(filename))) if (!Directory.Exists(Path.GetDirectoryName(filename)))
{ {
Directory.CreateDirectory(Path.GetDirectoryName(filename)); Directory.CreateDirectory(Path.GetDirectoryName(filename));

11
Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
View File

@ -5,6 +5,7 @@ using Oqtane.Repository;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Oqtane.Extensions; using Oqtane.Extensions;
using Oqtane.Shared; using Oqtane.Shared;
using System.IO;
namespace Oqtane.SiteTemplates 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 = Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString(),"\\");
System.IO.Directory.CreateDirectory(folderpath); 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, ""); 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; site.LogoFileId = file.FileId;
_siteRepository.UpdateSite(site); _siteRepository.UpdateSite(site);
} }

3
Oqtane.Server/Repository/SiteRepository.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@ -691,7 +692,7 @@ namespace Oqtane.Repository
}); });
_folderRepository.AddFolder(new Folder _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\"}]" Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]"
}); });

17
Oqtane.Shared/Shared/Utilities.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.IO;
using System.Text; using System.Text;
using System.Text.RegularExpressions; 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]))$", @"(?(\[)(\[(\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)); 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();
}
} }
} }

4
Oqtane.Upgrade/Program.cs
View File

@ -13,11 +13,11 @@ namespace Oqtane.Upgrade
string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
// assumes that the application executable must be deployed to the /bin of the Oqtane.Server project // 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\ // ie. binfolder = Oqtane.Server\bin\Debug\netcoreapp3.0\
string rootfolder = Directory.GetParent(binfolder).Parent.Parent.FullName; 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)) if (Directory.Exists(deployfolder))
{ {