diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0474640
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+**/.vs/
+.git/
+**/bin/
+**/obj
\ No newline at end of file
diff --git a/README.md b/README.md
index cb9e05f..0e13fda 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@ This document explorer demo application showcases several Syncfusion Blazor UI c
The samples requires the below requirements to run.
-* [Visual Studio 2019](https://visualstudio.microsoft.com/vs/)
-* [.NET Core SDK 3.1.2](https://dotnet.microsoft.com/download/dotnet-core/3.1)
+* [Visual Studio 2022](https://visualstudio.microsoft.com/vs/)
+* [.NET 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
### Run
@@ -21,4 +21,4 @@ The samples requires the below requirements to run.
### https://blazor.syncfusion.com/showcase/documentexplorer
-Check all the showcase samples from here.
\ No newline at end of file
+Check all the showcase samples from here.
diff --git a/server-side/App.razor b/server-side/App.razor
deleted file mode 100644
index 6f67a6e..0000000
--- a/server-side/App.razor
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
+
+ An error has occurred. This application may no longer respond until reloaded.
+
+
+ An unhandled exception has occurred. See browser dev tools for details.
+
+ Reload
+ 🗙
+
+
+
+
+
diff --git a/server-side/Components/Routes.razor b/server-side/Components/Routes.razor
new file mode 100644
index 0000000..4d9c4db
--- /dev/null
+++ b/server-side/Components/Routes.razor
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/server-side/Components/_Imports.razor b/server-side/Components/_Imports.razor
new file mode 100644
index 0000000..0b67cc5
--- /dev/null
+++ b/server-side/Components/_Imports.razor
@@ -0,0 +1,20 @@
+@using System.Net.Http
+@using Microsoft.AspNetCore.Authorization
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.JSInterop
+@using DocumentExplorer
+@using DocumentExplorer.Models
+@using DocumentExplorer.Shared
+@using Newtonsoft.Json
+@using Newtonsoft.Json.Linq
+@using Syncfusion.Blazor
+@using Syncfusion.Blazor.Navigations
+@using Microsoft.AspNetCore.WebUtilities
+@using System.Text
+@using IO = System.IO
+@inject IJSRuntime JSRuntime
+@inject HttpClient Http
+@inject NavigationManager NavigationManager;
diff --git a/server-side/Controllers/DocumentEditorController.cs b/server-side/Controllers/DocumentEditorController.cs
index 79f85cd..c1333dc 100644
--- a/server-side/Controllers/DocumentEditorController.cs
+++ b/server-side/Controllers/DocumentEditorController.cs
@@ -12,13 +12,15 @@ using Syncfusion.DocIORenderer;
using Syncfusion.Pdf;
using Syncfusion.Blazor.PdfViewer;
using DocumentExplorer.Models;
+using SkiaSharp;
+using System.Text.Json;
namespace DocumentExplorer.Controllers
{
[Route("api/[controller]")]
[ApiController]
public class DocumentEditorController : ControllerBase
- {
+ {
private string basePath;
private string baseLocation;
IWebHostEnvironment _hostingEnvironment;
@@ -30,19 +32,16 @@ namespace DocumentExplorer.Controllers
}
[Route("Import")]
- public string[] Import([FromBody] FileManagerDirectoryContent args)
+ public string Import([FromBody] FileManagerDirectoryContent args)
{
string fileLocation = this.baseLocation + args.Path.Replace("/", "\\");
- List returnArray = new List();
using (FileStream fs = new FileStream(fileLocation, FileMode.Open, FileAccess.Read))
{
WordDocument document = WordDocument.Load(fs, GetImportFormatType(Path.GetExtension(fileLocation).ToLower()));
- string json = Newtonsoft.Json.JsonConvert.SerializeObject(document);
+ string json = JsonSerializer.Serialize(document);
document.Dispose();
- returnArray.Add(json);
- return ConvertToImages(fs, returnArray, GetDocIOFormatType(Path.GetExtension(args.Path).ToLower())).ToArray();
- }
-
+ return json;
+ }
}
private List ConvertToImages(FileStream fs, List returnStrings, Syncfusion.DocIO.FormatType type)
{
@@ -66,8 +65,20 @@ namespace DocumentExplorer.Controllers
pdfExportImage.Load(outputStream);
//Exports the PDF document pages into images
- Bitmap[] bitmapimage = pdfExportImage.ExportAsImage(0, pdfExportImage.PageCount-1);
- foreach (Bitmap bitmap in bitmapimage)
+ SKBitmap[] bitmapimage = pdfExportImage.ExportAsImage(0, pdfExportImage.PageCount - 1);
+ Bitmap[] bitmapImages = new Bitmap[bitmapimage.Length];
+
+ for (int i = 0; i < bitmapimage.Length; i++)
+ {
+ using (SKImage skImage = SKImage.FromBitmap(bitmapimage[i]))
+ using (SKData skData = skImage.Encode(SKEncodedImageFormat.Png, 100))
+ using (System.IO.MemoryStream stream = new System.IO.MemoryStream(skData.ToArray()))
+ {
+ bitmapImages[i] = new Bitmap(stream);
+ }
+ }
+
+ foreach (Bitmap bitmap in bitmapImages)
{
using (MemoryStream ms = new MemoryStream())
{
@@ -91,7 +102,7 @@ namespace DocumentExplorer.Controllers
}
}
-
+
private ImportFormatType GetImportFormatType(string format)
{
if (string.IsNullOrEmpty(format))
diff --git a/server-side/Controllers/FileManagerController.cs b/server-side/Controllers/FileManagerController.cs
index 85df4e9..94ab4bd 100644
--- a/server-side/Controllers/FileManagerController.cs
+++ b/server-side/Controllers/FileManagerController.cs
@@ -22,50 +22,114 @@ namespace DocumentExplorer.Controllers
{
private PhysicalFileProvider operation;
private string basePath;
+ string root = "wwwroot\\Files";
+ string rootPath;
+ string virtualConnection;
public FileManagerController(IWebHostEnvironment hostingEnvironment)
{
this.basePath = hostingEnvironment.ContentRootPath;
this.operation = new PhysicalFileProvider();
- this.operation.RootFolder(this.basePath + "\\wwwroot\\Files"); // Data\\Files denotes in which files and folders are available.
+ if (basePath.EndsWith("\\"))
+ this.rootPath = this.basePath + this.root;
+ else
+ this.rootPath = this.basePath + "\\" + this.root;
+ this.operation.RootFolder(rootPath);
}
// Processing the File Manager operations
[Route("FileOperations")]
public object FileOperations([FromBody] FileManagerCustomContent args)
{
+
+ args.RootType = HttpContext.Request.Headers["RootType"];
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+ if (args.Path == "/Files/")
+ {
+ args.Path = "/";
+ }
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
+
+ if (basePath.EndsWith("\\"))
+ {
+ virtualConnection = this.basePath + "wwwroot\\VirtualConnections";
+ }
+ else
+ {
+ virtualConnection = this.basePath + "\\wwwroot\\VirtualConnections";
+ }
+ DateTime currentTime = DateTime.Now;
+ DateTime deletionThreshold = currentTime.AddHours(-24);
+ DirectoryInfo virtualDirectoryInfo = new DirectoryInfo(virtualConnection);
+
+ if (Directory.Exists(virtualConnection) && virtualDirectoryInfo.LastWriteTime <= deletionThreshold)
+ {
+ Directory.Delete(virtualConnection, true);
+ }
+ if (!Directory.Exists(virtualConnection))
+ {
+ //Create virtual root directory
+ Directory.CreateDirectory(virtualConnection);
+ }
+ string userID = virtualConnection + "\\" + connectionId + "\\Files";
+ string virtualUser = virtualConnection + "\\" + connectionId + "\\User";
+ string virtualTrash = virtualConnection + "\\" + connectionId + "\\Trash";
+ if (!Directory.Exists(userID))
+ {
+ Directory.CreateDirectory(userID);
+ Directory.CreateDirectory(virtualUser);
+ Directory.CreateDirectory(virtualTrash);
+ CopyFolder(rootPath, userID);
+ CopyFolder(this.basePath + "\\wwwroot\\User", virtualUser);
+ CopyFolder(this.basePath + "\\wwwroot\\Trash", virtualTrash);
+ }
+
+ //Set user directory as root
+ this.operation.RootFolder(userID);
+
+ if (args.Action == "delete" || args.Action == "rename")
+ {
+ if ((args.TargetPath == null) && (args.Path == ""))
+ {
+ FileManagerResponse response = new FileManagerResponse();
+ response.Error = new ErrorDetails { Code = "401", Message = "Restricted to modify the root folder." };
+ return this.operation.ToCamelCase(response);
+ }
+ }
+
switch (args.Action)
{
// Add your custom action here
case "read":
- if ((args.RootType != null) && ((args.RootType == "Recent") /*|| (args.RootType == "Starred")*/))
+ if ((args.RootType != null) && ((args.RootType == "Recent")))
{
FileManagerResponse result1 = this.operation.Search(args.Path, "*", args.ShowHiddenItems, false);
- result1 = FilterRecentFiles(result1);
- return AddStarDetails(result1);
- }
- else if ((args.RootType != null) && (args.RootType == "Starred"))
- {
- return FilterStarred(this.operation.Search(args.Path, "*", args.ShowHiddenItems, false));
+ return FilterRecentFiles(result1);
}
else
{
- return AddStarDetails(this.operation.GetFiles(args.Path, args.ShowHiddenItems));
+ return this.operation.ToCamelCase(this.operation.GetFiles(args.Path, args.ShowHiddenItems));
}
case "delete":
+
+#if Publish
+ FileManagerResponse deleteResponse = new FileManagerResponse();
+ deleteResponse.Error = new ErrorDetails() { Code = "401", Message = "Restricted to perform this action" };
+ return this.operation.ToCamelCase(deleteResponse);
+#else
FileManagerDirectoryContent[] items1 = args.Data;
string[] names1 = args.Names;
- for (var i = 0; i < items1.Length; i++)
- {
- names1[i] = ((items1[i].FilterPath + items1[i].Name).Substring(1));
- RemoveStarred(names1[i]);
- }
- return this.operation.ToCamelCase(MoveToTrash(args.Data));
+ return this.operation.ToCamelCase(MoveToTrash(args.Data, connectionId, virtualConnection, virtualUser));
+#endif
case "copy":
case "move":
FileManagerResponse response = new FileManagerResponse();
response.Error = new ErrorDetails() { Code = "401", Message = "Restricted to perform this action" };
return this.operation.ToCamelCase(response);
case "details":
- if ((args.RootType != null) && ((args.RootType == "Recent") || (args.RootType == "Starred")))
+ if ((args.RootType != null) && ((args.RootType == "Recent")))
{
FileManagerDirectoryContent[] items = args.Data;
string[] names = args.Names;
@@ -87,16 +151,11 @@ namespace DocumentExplorer.Controllers
if ((args.RootType != null) && ((args.RootType == "Recent")))
{
FileManagerResponse result1 = this.operation.Search(args.Path, args.SearchString, args.ShowHiddenItems, args.CaseSensitive);
- result1 = FilterRecentFiles(result1);
- return AddStarDetails(result1);
- }
- else if ((args.RootType != null) && (args.RootType == "Starred"))
- {
- return FilterStarred(this.operation.Search(args.Path, args.SearchString, args.ShowHiddenItems, args.CaseSensitive));
+ return FilterRecentFiles(result1);
}
else
{
- return AddStarDetails(this.operation.Search(args.Path, args.SearchString, args.ShowHiddenItems, args.CaseSensitive));
+ return this.operation.ToCamelCase(this.operation.Search(args.Path, args.SearchString, args.ShowHiddenItems, args.CaseSensitive));
}
case "rename":
// Path - Current path of the renamed file; Name - Old file name; NewName - New file name
@@ -121,13 +180,13 @@ namespace DocumentExplorer.Controllers
result.Files = allFiles;
return result;
}
- public FileManagerResponse MoveToTrash(FileManagerDirectoryContent[] dataArray)
+ public FileManagerResponse MoveToTrash(FileManagerDirectoryContent[] dataArray, string userId, String virtualConnection, string virtualUser)
{
- string jsonPath = this.basePath + "\\wwwroot\\User\\trash.json";
+ string jsonPath = virtualUser + "\\trash.json";
string jsonData = System.IO.File.ReadAllText(jsonPath);
List DeletedFiles = JsonConvert.DeserializeObject>(jsonData) ?? new List();
PhysicalFileProvider trashOperation = new PhysicalFileProvider();
- string root = this.basePath + "\\wwwroot";
+ string root = virtualConnection + "\\" + userId;
trashOperation.RootFolder(root);
List deletedFiles = new List();
foreach (FileManagerDirectoryContent data in dataArray)
@@ -158,59 +217,6 @@ namespace DocumentExplorer.Controllers
System.IO.File.WriteAllText(jsonPath, jsonData);
return new FileManagerResponse() { Files = deletedFiles };
}
- public string AddStarDetails(FileManagerResponse value)
- {
- string jsonPath = this.basePath + "\\wwwroot\\User\\star.json";
- string jsonData = System.IO.File.ReadAllText(jsonPath);
- List starredFiles = JsonConvert.DeserializeObject>(jsonData) ?? new List();
- FileResponse readResponse = new FileResponse();
- readResponse.CWD = value.CWD;
- readResponse.Files = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(value.Files));
- foreach (FileManagerCustomContent file in readResponse.Files)
- {
- file.FilterPath = file.FilterPath.Replace(Path.DirectorySeparatorChar, '/');
- file.Starred = starredFiles.Contains(file.FilterPath + file.Name);
- }
- readResponse.Details = value.Details;
- readResponse.Error = value.Error;
- return JsonConvert.SerializeObject(readResponse, new JsonSerializerSettings { ContractResolver = new DefaultContractResolver { NamingStrategy = new CamelCaseNamingStrategy() } });
- }
- public string FilterStarred(FileManagerResponse value)
- {
- string jsonPath = this.basePath + "\\wwwroot\\User\\star.json";
- string jsonData = System.IO.File.ReadAllText(jsonPath);
- List starredFiles = JsonConvert.DeserializeObject>(jsonData) ?? new List();
- FileResponse readResponse = new FileResponse();
- readResponse.CWD = value.CWD;
- List files = new List();
- List allFiles = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(value.Files));
- foreach (FileManagerCustomContent file in allFiles)
- {
- file.FilterPath = file.FilterPath.Replace(Path.DirectorySeparatorChar, '/');
- if (starredFiles.Contains(file.FilterPath + file.Name))
- {
- file.Starred = true;
- files.Add(file);
- }
- }
- readResponse.Files = files;
- readResponse.Details = value.Details;
- readResponse.Error = value.Error;
- return JsonConvert.SerializeObject(readResponse, new JsonSerializerSettings { ContractResolver = new DefaultContractResolver { NamingStrategy = new CamelCaseNamingStrategy() } });
- }
- public void RemoveStarred(string filePath)
- {
- string jsonPath = this.basePath + "\\wwwroot\\User\\star.json";
- string jsonData = System.IO.File.ReadAllText(jsonPath);
- List starredFiles = JsonConvert.DeserializeObject>(jsonData) ?? new List();
- string path = filePath.Replace(Path.DirectorySeparatorChar, '/');
- if (starredFiles.Contains(path))
- {
- starredFiles.Remove(path);
- }
- jsonData = JsonConvert.SerializeObject(starredFiles);
- System.IO.File.WriteAllText(jsonPath, jsonData);
- }
[Route("Upload")]
public IActionResult Upload(string path, IList uploadFiles, string action)
{
@@ -220,9 +226,21 @@ namespace DocumentExplorer.Controllers
Response.ContentType = "application/json; charset=utf-8";
Response.StatusCode = 403;
Response.HttpContext.Features.Get().ReasonPhrase = "The upload functionality is restricted in this online demo. To test this demo application with upload functionality, please download the source code from the GitHub location (https://github.com/syncfusion/blazor-showcase-document-explorer) and run it.";
+ return Content("The upload functionality is restricted in this online demo. To test this demo application with upload functionality, please download the source code from the GitHub location (https://github.com/syncfusion/blazor-showcase-document-explorer) and run it.");
#else
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
FileManagerResponse uploadResponse;
- uploadResponse = operation.Upload(path, uploadFiles, action, null);
+ PhysicalFileProvider uploadOperation = new PhysicalFileProvider();
+ string basePath = this.basePath + "\\wwwroot\\VirtualConnections\\" + connectionId;
+ string userID = this.basePath + "wwwroot\\VirtualConnections\\" + connectionId + "\\Files";
+ uploadOperation.RootFolder(userID);
+ uploadResponse = operation.Upload(path, uploadFiles, action, basePath, null);
if (uploadResponse.Error != null)
{
Response.Clear();
@@ -230,8 +248,8 @@ namespace DocumentExplorer.Controllers
Response.StatusCode = Convert.ToInt32(uploadResponse.Error.Code);
Response.HttpContext.Features.Get().ReasonPhrase = uploadResponse.Error.Message;
}
-#endif
return Content("");
+#endif
}
[Route("Download")]
@@ -250,7 +268,15 @@ namespace DocumentExplorer.Controllers
[Route("ToggleStarred")]
public IActionResult ToggleStarred([FromBody] FileManagerCustomContent args)
{
- string jsonPath = this.basePath + "\\wwwroot\\User\\star.json";
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
+ string basePath = this.basePath + "\\wwwroot\\VirtualConnections\\" + connectionId +"\\User";
+ string jsonPath = basePath + "\\star.json";
StreamReader reader = new StreamReader(jsonPath);
string jsonData = reader.ReadToEnd();
reader.Dispose();
@@ -275,6 +301,26 @@ namespace DocumentExplorer.Controllers
return this.operation.GetImage(args.Path, args.Id, false, null, null);
}
+ private void CopyFolder(string source, string destination)
+ {
+ if (!Directory.Exists(destination))
+ {
+ Directory.CreateDirectory(destination);
+ }
+
+ foreach (var file in Directory.EnumerateFiles(source))
+ {
+ var dest = Path.Combine(destination, Path.GetFileName(file));
+ System.IO.File.Copy(file, dest);
+ }
+
+ foreach (var folder in Directory.EnumerateDirectories(source))
+ {
+ var dest = Path.Combine(destination, Path.GetFileName(folder));
+ CopyFolder(folder, dest);
+ }
+ }
+
public class FileManagerCustomContent : FileManagerDirectoryContent
{
public string RootType { get; set; }
diff --git a/server-side/Controllers/PresentationController.cs b/server-side/Controllers/PresentationController.cs
index 15d2601..4692c86 100644
--- a/server-side/Controllers/PresentationController.cs
+++ b/server-side/Controllers/PresentationController.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc;
using DocumentExplorer.Models.FileManager;
using Syncfusion.Pdf;
using Syncfusion.Presentation;
-using Syncfusion.PresentationToPdfConverter;
+using Syncfusion.PresentationRenderer;
namespace DocumentExplorer.Controllers
{
diff --git a/server-side/Controllers/PreviewController.cs b/server-side/Controllers/PreviewController.cs
index ca705b9..a02365f 100644
--- a/server-side/Controllers/PreviewController.cs
+++ b/server-side/Controllers/PreviewController.cs
@@ -15,6 +15,8 @@ using Syncfusion.Blazor.PdfViewer;
using Syncfusion.Presentation;
using Syncfusion.PresentationRenderer;
using DocumentExplorer.Models;
+using SkiaSharp;
+using Microsoft.AspNetCore.Http;
namespace DocumentExplorer.Controllers
{
@@ -28,13 +30,21 @@ namespace DocumentExplorer.Controllers
{
basePath = hostingEnvironment.ContentRootPath;
operation = new PhysicalFileProvider();
- operation.RootFolder(this.basePath + "\\wwwroot\\Files"); // Data\\Files denotes in which files and folders are available.
+ operation.RootFolder(this.basePath + "\\wwwroot\\VirtualConnections\\"); // Data\\Files denotes in which files and folders are available.
}
[Route("GetPreview")]
public string GetPreview([FromBody] FileManagerDirectoryContent args)
{
- string baseFolder = this.basePath + "\\wwwroot\\Files";
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
+ string baseFolder = this.basePath + "\\wwwroot\\VirtualConnections\\" + connectionId + "\\Files";
+ this.operation.RootFolder(baseFolder);
try
{
String fullPath = baseFolder + args.Path;
@@ -49,9 +59,20 @@ namespace DocumentExplorer.Controllers
//Loads the PDF document
pdfExportImage.Load(fileStream);
//Exports the PDF document pages into images
- Bitmap[] bitmapimage = pdfExportImage.ExportAsImage(0, 0);
- imageStream = new MemoryStream();
- bitmapimage[0].Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
+ SkiaSharp.SKBitmap[] skBitmaps = pdfExportImage.ExportAsImage(0, 0);
+ System.Drawing.Bitmap[] bitmapImages = new System.Drawing.Bitmap[skBitmaps.Length];
+
+ for (int i = 0; i < skBitmaps.Length; i++)
+ {
+ using (SKImage skImage = SKImage.FromBitmap(skBitmaps[i]))
+ using (SKData skData = skImage.Encode(SKEncodedImageFormat.Png, 100))
+ using (System.IO.MemoryStream stream = new System.IO.MemoryStream(skData.ToArray()))
+ {
+ bitmapImages[i] = new System.Drawing.Bitmap(stream);
+ }
+ }
+ imageStream = new MemoryStream();
+ bitmapImages[0].Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
imageStream.Position = 0;
pdfExportImage.Dispose();
fileStream.Close();
@@ -87,9 +108,21 @@ namespace DocumentExplorer.Controllers
//Loads the PDF document
pdfExportImage.Load(outputStream);
//Exports the PDF document pages into images
- Bitmap[] bitmapimage = pdfExportImage.ExportAsImage(0, 0);
+ SKBitmap[] bitmapimage = pdfExportImage.ExportAsImage(0, 0);
+ Bitmap[] bitmapImages = new Bitmap[bitmapimage.Length];
+
+ for (int i = 0; i < bitmapimage.Length; i++)
+ {
+ using (SKImage skImage = SKImage.FromBitmap(bitmapimage[i]))
+ using (SKData skData = skImage.Encode(SKEncodedImageFormat.Png, 100))
+ using (System.IO.MemoryStream stream = new System.IO.MemoryStream(skData.ToArray()))
+ {
+ bitmapImages[i] = new Bitmap(stream);
+ }
+ }
+
imageStream = new MemoryStream();
- bitmapimage[0].Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
+ bitmapImages[0].Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
imageStream.Position = 0;
fileStream.Close();
diff --git a/server-side/Controllers/SharedFilesController.cs b/server-side/Controllers/SharedFilesController.cs
index d3f1b95..687499a 100644
--- a/server-side/Controllers/SharedFilesController.cs
+++ b/server-side/Controllers/SharedFilesController.cs
@@ -22,6 +22,7 @@ using Syncfusion.PresentationRenderer;
using System.Drawing;
using Microsoft.AspNetCore.Cors;
using DocumentExplorer.Models;
+using SkiaSharp;
namespace DocumentExplorer.Controllers
{
@@ -42,6 +43,10 @@ namespace DocumentExplorer.Controllers
[Route("FileOperations")]
public object FileOperations([FromBody] FileManagerFilterContent args)
{
+ if (args.Path == "/Files/")
+ {
+ args.Path = "/";
+ }
switch (args.Action)
{
// Add your custom action here
@@ -106,9 +111,20 @@ namespace DocumentExplorer.Controllers
//Loads the PDF document
pdfExportImage.Load(fileStream);
//Exports the PDF document pages into images
- Bitmap[] bitmapimage = pdfExportImage.ExportAsImage(0, 0);
+ SkiaSharp.SKBitmap[] skBitmaps = pdfExportImage.ExportAsImage(0, 0);
+ System.Drawing.Bitmap[] bitmapImages = new System.Drawing.Bitmap[skBitmaps.Length];
+
+ for (int i = 0; i < skBitmaps.Length; i++)
+ {
+ using (SKImage skImage = SKImage.FromBitmap(skBitmaps[i]))
+ using (SKData skData = skImage.Encode(SKEncodedImageFormat.Png, 100))
+ using (System.IO.MemoryStream stream = new System.IO.MemoryStream(skData.ToArray()))
+ {
+ bitmapImages[i] = new System.Drawing.Bitmap(stream);
+ }
+ }
imageStream = new MemoryStream();
- bitmapimage[0].Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
+ bitmapImages[0].Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
imageStream.Position = 0;
pdfExportImage.Dispose();
fileStream.Close();
@@ -137,9 +153,20 @@ namespace DocumentExplorer.Controllers
//Loads the PDF document
pdfExportImage.Load(outputStream);
//Exports the PDF document pages into images
- Bitmap[] bitmapimage = pdfExportImage.ExportAsImage(0, 0);
+ SkiaSharp.SKBitmap[] skBitmaps = pdfExportImage.ExportAsImage(0, 0);
+ System.Drawing.Bitmap[] bitmapImages = new System.Drawing.Bitmap[skBitmaps.Length];
+
+ for (int i = 0; i < skBitmaps.Length; i++)
+ {
+ using (SKImage skImage = SKImage.FromBitmap(skBitmaps[i]))
+ using (SKData skData = skImage.Encode(SKEncodedImageFormat.Png, 100))
+ using (System.IO.MemoryStream stream = new System.IO.MemoryStream(skData.ToArray()))
+ {
+ bitmapImages[i] = new System.Drawing.Bitmap(stream);
+ }
+ }
imageStream = new MemoryStream();
- bitmapimage[0].Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
+ bitmapImages[0].Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
imageStream.Position = 0;
fileStream.Close();
diff --git a/server-side/Controllers/TrashController.cs b/server-side/Controllers/TrashController.cs
index fd32eb3..642294a 100644
--- a/server-side/Controllers/TrashController.cs
+++ b/server-side/Controllers/TrashController.cs
@@ -22,11 +22,10 @@ namespace DocumentExplorer.Controllers
private string basePath;
private string baseLocation;
-
public TrashController(IWebHostEnvironment hostingEnvironment)
{
this.basePath = hostingEnvironment.ContentRootPath;
- this.baseLocation = this.basePath + "\\wwwroot";
+ this.baseLocation = this.basePath + "\\wwwroot\\VirtualConnections\\";
this.operation = new PhysicalFileProvider();
}
@@ -34,6 +33,10 @@ namespace DocumentExplorer.Controllers
[Route("FileOperations")]
public object FileOperations([FromBody] ReadArgs args)
{
+ if (args.Path == "/Files/")
+ {
+ args.Path = "/";
+ }
try
{
switch (args.Action)
@@ -72,9 +75,16 @@ namespace DocumentExplorer.Controllers
public FileManagerResponse GetFiles()
{
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
FileManagerResponse readResponse = new FileManagerResponse();
FileManagerDirectoryContent cwd = new FileManagerDirectoryContent();
- String fullPath = (this.baseLocation + "/Trash");
+ String fullPath = (this.baseLocation + connectionId + "/Trash");
DirectoryInfo directory = new DirectoryInfo(fullPath);
cwd.Name = "Trash";
cwd.Size = 0;
@@ -86,7 +96,7 @@ namespace DocumentExplorer.Controllers
cwd.FilterPath = "/";
cwd.Permission = null;
readResponse.CWD = cwd;
- string jsonPath = this.basePath + "\\wwwroot\\User\\trash.json";
+ string jsonPath = this.basePath + "\\wwwroot\\VirtualConnections\\" + connectionId +"\\User\\trash.json";
string jsonData = System.IO.File.ReadAllText(jsonPath);
List DeletedFiles = JsonConvert.DeserializeObject>(jsonData) ?? new List();
List files = new List();
@@ -99,7 +109,14 @@ namespace DocumentExplorer.Controllers
}
public FileManagerResponse GetDetails(FileManagerDirectoryContent[] files)
{
- this.operation.RootFolder(this.baseLocation + "\\Trash");
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
+ this.operation.RootFolder(this.baseLocation + connectionId + "\\Trash");
FileManagerResponse response;
string[] names = new string[files.Length];
string responseName = "";
@@ -117,8 +134,15 @@ namespace DocumentExplorer.Controllers
}
public FileManagerResponse DeleteFiles(FileManagerDirectoryContent[] files)
{
- this.operation.RootFolder(this.baseLocation);
- string jsonPath = this.basePath + "\\wwwroot\\User\\trash.json";
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
+ this.operation.RootFolder(this.baseLocation + connectionId);
+ string jsonPath = this.basePath + "\\wwwroot\\VirtualConnections\\" + connectionId + "\\User\\trash.json";
string jsonData = System.IO.File.ReadAllText(jsonPath);
List responseFiles =new List();
List DeletedFiles = JsonConvert.DeserializeObject>(jsonData) ?? new List();
@@ -126,7 +150,7 @@ namespace DocumentExplorer.Controllers
{
TrashContents trashFile = DeletedFiles.Find(x => (x.Container.Equals(file.Id)));
string trashPath = "/Trash/" + trashFile.Container;
- DeleteDirectory(this.baseLocation + trashPath);
+ DeleteDirectory(this.baseLocation + connectionId + trashPath);
responseFiles.Add(trashFile.Data);
DeletedFiles.Remove(trashFile);
}
@@ -137,9 +161,16 @@ namespace DocumentExplorer.Controllers
[Route("EmptyTrash")]
public IActionResult EmptyTrash()
{
- string jsonPath = this.basePath + "\\wwwroot\\User\\trash.json";
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
+ string jsonPath = this.basePath + "\\wwwroot\\VirtualConnections\\" + connectionId + "\\User\\trash.json";
string jsonData ="";
- string[] dirs = Directory.GetDirectories(this.baseLocation);
+ string[] dirs = Directory.GetDirectories(this.baseLocation + connectionId);
foreach (string dir in dirs)
{
DeleteDirectory(dir);
@@ -151,8 +182,15 @@ namespace DocumentExplorer.Controllers
[Route("Restore")]
public IActionResult Restore([FromBody] FileManagerDirectoryContent[] files)
{
- this.operation.RootFolder(this.baseLocation);
- string jsonPath = this.basePath + "\\wwwroot\\User\\trash.json";
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
+ this.operation.RootFolder(this.baseLocation + connectionId);
+ string jsonPath = this.basePath + "\\wwwroot\\VirtualConnections\\" + connectionId + "\\User\\trash.json";
string jsonData = System.IO.File.ReadAllText(jsonPath);
string responseString = "";
List DeletedFiles = JsonConvert.DeserializeObject>(jsonData) ?? new List();
@@ -164,7 +202,7 @@ namespace DocumentExplorer.Controllers
FileManagerResponse response = this.operation.Move(trashPath, fileLocation, new string[] { trashFile.Name }, new string[] { trashFile.Name }, null, null);
if ((response.Error == null))
{
- DeleteDirectory(this.baseLocation + trashPath);
+ DeleteDirectory(this.baseLocation + connectionId + trashPath);
DeletedFiles.Remove(trashFile);
responseString = "Restored";
}
@@ -180,8 +218,15 @@ namespace DocumentExplorer.Controllers
public FileManagerResponse SearchFiles(string value, bool caseSensitive)
{
- this.operation.RootFolder(this.baseLocation);
- string jsonPath = this.basePath + "\\wwwroot\\User\\trash.json";
+ string connectionId = HttpContext.Session.GetString("ConnectionId");
+
+ if (string.IsNullOrEmpty(connectionId))
+ {
+ connectionId = Guid.NewGuid().ToString(); // Generate a new unique identifier
+ HttpContext.Session.SetString("ConnectionId", connectionId); // Store it in session
+ }
+ this.operation.RootFolder(this.baseLocation + connectionId);
+ string jsonPath = this.basePath + "\\wwwroot\\VirtualConnections\\" + connectionId + "\\User\\trash.json";
string jsonData = System.IO.File.ReadAllText(jsonPath);
List DeletedFiles = JsonConvert.DeserializeObject>(jsonData) ?? new List();
List searchFiles = DeletedFiles.FindAll(x => new Regex(WildcardToRegex(value), (caseSensitive ? RegexOptions.None : RegexOptions.IgnoreCase)).IsMatch(x.Name));
diff --git a/server-side/Data/PhysicalFileProvider.cs b/server-side/Data/PhysicalFileProvider.cs
index b40e9af..2f5e72d 100644
--- a/server-side/Data/PhysicalFileProvider.cs
+++ b/server-side/Data/PhysicalFileProvider.cs
@@ -617,13 +617,21 @@ namespace DocumentExplorer.Data
// Moves file(s) or folder(s).
public virtual FileManagerResponse Move(string path, string targetPath, string[] names, string[] renameFiles, FileManagerDirectoryContent targetData, params FileManagerDirectoryContent[] data)
- {
+ {
FileManagerResponse moveResponse = new FileManagerResponse();
try
{
+ string validatePath;
+ validatePath = Path.Combine(contentRootPath + path);
+ if (Path.GetFullPath(validatePath) != GetFilePath(validatePath))
+ {
+ throw new UnauthorizedAccessException("Access denied for Directory-traversal");
+ }
string result = String.Empty;
if (renameFiles == null)
+ {
renameFiles = new string[0];
+ }
string physicalPath = GetPath(path);
for (int i = 0; i < names.Length; i++)
{
@@ -641,6 +649,7 @@ namespace DocumentExplorer.Data
accessMessage = PathPermission.Message;
throw new UnauthorizedAccessException("'" + this.getFileNameFromPath(this.rootName + targetPath) + "' is not accessible. You need permission to perform the writeContents action.");
}
+
List existFiles = new List();
List missingFiles = new List();
List movedFiles = new List();
@@ -654,20 +663,38 @@ namespace DocumentExplorer.Data
path = tempPath + names[i].Substring(0, name + 1);
names[i] = names[i].Substring(name + 1);
}
- else path = tempPath;
+ else
+ {
+ path = tempPath;
+ }
string itemPath = Path.Combine(contentRootPath + path, names[i]);
+ if (Path.GetFullPath(itemPath) != GetFilePath(itemPath) + names[i])
+ {
+ throw new UnauthorizedAccessException("Access denied for Directory-traversal");
+ }
if (Directory.Exists(itemPath) || File.Exists(itemPath))
{
if ((File.GetAttributes(itemPath) & FileAttributes.Directory) == FileAttributes.Directory)
{
string directoryName = names[i];
string oldPath = Path.Combine(contentRootPath + path, directoryName);
+ if (Path.GetFullPath(oldPath) != GetFilePath(oldPath) + directoryName)
+ {
+ throw new UnauthorizedAccessException("Access denied for Directory-traversal");
+ }
string newPath = Path.Combine(contentRootPath + targetPath, directoryName);
+ if (Path.GetFullPath(newPath) != GetFilePath(newPath) + directoryName)
+ {
+ throw new UnauthorizedAccessException("Access denied for Directory-traversal");
+ }
bool exist = Directory.Exists(newPath);
if (exist)
{
int index = -1;
- if (renameFiles.Length > 0) index = Array.FindIndex(renameFiles, row => row.Contains(directoryName));
+ if (renameFiles.Length > 0)
+ {
+ index = Array.FindIndex(renameFiles, row => row.Contains(directoryName));
+ }
if ((newPath == oldPath) || (index != -1))
{
newPath = DirectoryRename(newPath);
@@ -683,7 +710,10 @@ namespace DocumentExplorer.Data
detail.PreviousName = names[i];
movedFiles.Add(detail);
}
- else existFiles.Add(fullName);
+ else
+ {
+ existFiles.Add(fullName);
+ }
}
else
{
@@ -694,7 +724,6 @@ namespace DocumentExplorer.Data
{
result = DeleteDirectory(oldPath);
if (result != String.Empty) { break; }
-
}
FileManagerDirectoryContent detail = GetFileDetails(newPath);
detail.PreviousName = names[i];
@@ -705,7 +734,15 @@ namespace DocumentExplorer.Data
{
string fileName = names[i];
string oldPath = Path.Combine(contentRootPath + path, fileName);
+ if (Path.GetFullPath(oldPath) != GetFilePath(oldPath) + fileName)
+ {
+ throw new UnauthorizedAccessException("Access denied for Directory-traversal");
+ }
string newPath = Path.Combine(contentRootPath + targetPath, fileName);
+ if (Path.GetFullPath(newPath) != GetFilePath(newPath) + fileName)
+ {
+ throw new UnauthorizedAccessException("Access denied for Directory-traversal");
+ }
bool fileExist = File.Exists(newPath);
try
{
@@ -714,24 +751,35 @@ namespace DocumentExplorer.Data
{
int index = -1;
if (renameFiles.Length > 0)
+ {
index = Array.FindIndex(renameFiles, row => row.Contains(fileName));
+ }
if ((newPath == oldPath) || (index != -1))
{
newPath = FileRename(newPath, fileName);
File.Copy(oldPath, newPath);
bool isExist = File.Exists(oldPath);
- if (isExist) File.Delete(oldPath);
+ if (isExist)
+ {
+ File.Delete(oldPath);
+ }
FileManagerDirectoryContent detail = GetFileDetails(newPath);
detail.PreviousName = names[i];
movedFiles.Add(detail);
}
- else existFiles.Add(fullName);
+ else
+ {
+ existFiles.Add(fullName);
+ }
}
else
{
File.Copy(oldPath, newPath);
bool isExist = File.Exists(oldPath);
- if (isExist) File.Delete(oldPath);
+ if (isExist)
+ {
+ File.Delete(oldPath);
+ }
FileManagerDirectoryContent detail = GetFileDetails(newPath);
detail.PreviousName = names[i];
movedFiles.Add(detail);
@@ -742,13 +790,20 @@ namespace DocumentExplorer.Data
{
if (e.GetType().Name == "UnauthorizedAccessException")
{
- result = newPath; break;
+ result = newPath;
+ break;
+ }
+ else
+ {
+ throw e;
}
- else throw e;
}
}
}
- else missingFiles.Add(names[i]);
+ else
+ {
+ missingFiles.Add(names[i]);
+ }
}
moveResponse.Files = movedFiles;
if (result != String.Empty)
@@ -768,11 +823,17 @@ namespace DocumentExplorer.Data
er.Message = "File Already Exists";
moveResponse.Error = er;
}
- if (missingFiles.Count == 0) return moveResponse;
+ if (missingFiles.Count == 0)
+ {
+ return moveResponse;
+ }
else
{
string namelist = missingFiles[0];
- for (int k = 1; k < missingFiles.Count; k++) { namelist = namelist + ", " + missingFiles[k]; }
+ for (int k = 1; k < missingFiles.Count; k++)
+ {
+ namelist = namelist + ", " + missingFiles[k];
+ }
throw new FileNotFoundException(namelist + " not found in given location.");
}
}
@@ -783,7 +844,7 @@ namespace DocumentExplorer.Data
Message = e.Message.ToString(),
Code = e.Message.ToString().Contains("is not accessible. You need permission") ? "401" : "417",
FileExists = moveResponse.Error?.FileExists
- };
+ };
if ((er.Code == "401") && !string.IsNullOrEmpty(accessMessage)) { er.Message = accessMessage; }
moveResponse.Error = er;
return moveResponse;
@@ -908,7 +969,7 @@ namespace DocumentExplorer.Data
}
// Uploads the file(s) to the files system.
- public virtual FileManagerResponse Upload(string path, IList uploadFiles, string action, params FileManagerDirectoryContent[] data)
+ public virtual FileManagerResponse Upload(string path, IList uploadFiles, string action,string basePath, params FileManagerDirectoryContent[] data)
{
FileManagerResponse uploadResponse = new FileManagerResponse();
try
@@ -925,7 +986,7 @@ namespace DocumentExplorer.Data
if (uploadFiles != null)
{
string name = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"');
- string fullName = Path.Combine((this.contentRootPath + path), name);
+ string fullName = Path.Combine((basePath + "\\Files\\"), name);
if (action == "save")
{
if (!System.IO.File.Exists(fullName))
diff --git a/server-side/DocumentExplorer.csproj b/server-side/DocumentExplorer.csproj
index a48e744..679dd06 100644
--- a/server-side/DocumentExplorer.csproj
+++ b/server-side/DocumentExplorer.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.1
+ net8.0DocumentExplorerDebug;Release;Publish
@@ -10,14 +10,41 @@
TRACE;Publish
+
+ False
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server-side/DocumentExplorer.sln b/server-side/DocumentExplorer.sln
deleted file mode 100644
index 047c082..0000000
--- a/server-side/DocumentExplorer.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29521.150
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentExplorer", "DocumentExplorer.csproj", "{097B67E7-41B9-479E-B1D3-8B8939534FCF}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Publish|Any CPU = Publish|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {097B67E7-41B9-479E-B1D3-8B8939534FCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {097B67E7-41B9-479E-B1D3-8B8939534FCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {097B67E7-41B9-479E-B1D3-8B8939534FCF}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
- {097B67E7-41B9-479E-B1D3-8B8939534FCF}.Publish|Any CPU.Build.0 = Publish|Any CPU
- {097B67E7-41B9-479E-B1D3-8B8939534FCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {097B67E7-41B9-479E-B1D3-8B8939534FCF}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {EB60F3A9-EB50-4F29-8AEF-414D8B206DC7}
- EndGlobalSection
-EndGlobal
diff --git a/server-side/Models/FileManager/IFileProvider.cs b/server-side/Models/FileManager/IFileProvider.cs
index cc60e7f..7abb7f3 100644
--- a/server-side/Models/FileManager/IFileProvider.cs
+++ b/server-side/Models/FileManager/IFileProvider.cs
@@ -34,7 +34,7 @@ namespace DocumentExplorer.Models.FileManager
#if EJ2_DNX
FileManagerResponse Upload(string path, IList uploadFiles, string action, params FileManagerDirectoryContent[] data);
#else
- FileManagerResponse Upload(string path, IList uploadFiles, string action, params FileManagerDirectoryContent[] data);
+ FileManagerResponse Upload(string path, IList uploadFiles, string action, string basePath, params FileManagerDirectoryContent[] data);
#endif
FileStreamResult GetImage(string path, string id, bool allowCompress, ImageSize size, params FileManagerDirectoryContent[] data);
diff --git a/server-side/NuGet.config b/server-side/NuGet.config
new file mode 100644
index 0000000..6ccf965
--- /dev/null
+++ b/server-side/NuGet.config
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server-side/Pages/BottomToolbar.razor b/server-side/Pages/BottomToolbar.razor
deleted file mode 100644
index cf3aec3..0000000
--- a/server-side/Pages/BottomToolbar.razor
+++ /dev/null
@@ -1,154 +0,0 @@
-@*@page "/bottomToolbar"*@
-
-@using Syncfusion.Blazor.Navigations
-@using Syncfusion.Blazor.Inputs
-
-