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

refactored upload so that it is not dependent on Folder Browse permission

Browse Source
This commit is contained in:
sbwalker 2023-07-10 11:44:05 -04:00
parent 2ccb814223
commit 16d0d11e0b
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -329,27 +329,29 @@
var folder = (Folder == Constants.PackagesFolder) ? Folder : FolderId.ToString(); var folder = (Folder == Constants.PackagesFolder) ? Folder : FolderId.ToString();
await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken); await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken);
// uploading is asynchronous so we need to wait for the uploads to complete // uploading is asynchronous so we need to poll to determine if uploads are completed
// note that this will only wait a maximum of 15 seconds which may not be long enough for very large file uploads var success = true;
bool success = false; int upload = 0;
int attempts = 0; while (upload < uploads.Length && success)
while (attempts < 5 && !success)
{ {
attempts += 1; success = false;
Thread.Sleep(1000 * attempts); // progressive retry // note that progressive retry will only wait a maximum of 15 seconds which may not be long enough for very large file uploads
int attempts = 0;
success = true; while (attempts < 5 && !success)
List<File> files = await FileService.GetFilesAsync(folder);
if (files.Count > 0)
{ {
foreach (string upload in uploads) attempts += 1;
Thread.Sleep(1000 * attempts); // progressive retry
var file = await FileService.GetFileAsync(int.Parse(folder), uploads[upload]);
if (file != null)
{ {
if (!files.Exists(item => item.Name == upload)) success = true;
{
success = false;
}
} }
} }
if (success)
{
upload++;
}
} }
// reset progress indicators // reset progress indicators
@ -379,14 +381,14 @@
else else
{ {
// set FileId to first file in upload collection // set FileId to first file in upload collection
await GetFiles(); var file = await FileService.GetFileAsync(int.Parse(folder), uploads[0]);
var file = _files.Where(item => item.Name == uploads[0]).FirstOrDefault();
if (file != null) if (file != null)
{ {
FileId = file.FileId; FileId = file.FileId;
await SetImage(); await SetImage();
await OnUpload.InvokeAsync(FileId); await OnUpload.InvokeAsync(FileId);
} }
await GetFiles();
StateHasChanged(); StateHasChanged();
} }
} }

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

@ -139,9 +139,13 @@ namespace Oqtane.Controllers
} }
else else
{ {
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {Name} For Folder {FolderId}", name, folderId); if (file != null)
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; {
return null; _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {Name} For Folder {FolderId}", name, folderId);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
file = null;
}
return file;
} }
} }