Add s3 #96
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| | ||
| <script src="~/lib/jquery/dist/jquery.min.js"></script> | ||
|
|
||
| <script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script> | ||
| <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,10 +1,16 @@ | ||||||||||||||||
| using Amazon.S3; | ||||||||||||||||
| using Microsoft.AspNetCore.Authorization; | ||||||||||||||||
| using Microsoft.AspNetCore.Mvc; | ||||||||||||||||
| using Microsoft.AspNetCore.StaticFiles; | ||||||||||||||||
| using Refhub.Models.Enums; | ||||||||||||||||
| using Refhub.Service.Implement; | ||||||||||||||||
| using Refhub.Service.Interface; | ||||||||||||||||
| using Refhub.Tools.Exceptions; | ||||||||||||||||
| using Refhub.Tools.Static; | ||||||||||||||||
|
|
||||||||||||||||
| namespace Refhub.Controllers; | ||||||||||||||||
|
|
||||||||||||||||
| public class BookController(IBookService bookService, IFileUploaderService s3FileUploaderService, ILogger<BookController> logger, IMessageService messageService) : Controller | ||||||||||||||||
| { | ||||||||||||||||
| [HttpGet("BookDetails/{slug}")] | ||||||||||||||||
| public async Task<IActionResult> BookDetails(string slug, CancellationToken ct) | ||||||||||||||||
|
|
@@ -19,18 +25,49 @@ public async Task<IActionResult> BookDetails(string slug, CancellationToken ct) | |||||||||||||||
|
|
||||||||||||||||
| return bookDetails == null ? NotFound() : View(bookDetails); | ||||||||||||||||
| } | ||||||||||||||||
| private bool IsValidFileUrl(string fileUrl) | ||||||||||||||||
| { | ||||||||||||||||
| return !string.IsNullOrWhiteSpace(fileUrl) && Uri.TryCreate(fileUrl, UriKind.Absolute, out _); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| [Authorize] | ||||||||||||||||
| [HttpGet("download")] | ||||||||||||||||
| public async Task<IActionResult> DownloadFile([FromQuery] string fileUrl, CancellationToken ct) | ||||||||||||||||
| { | ||||||||||||||||
| try | ||||||||||||||||
| { | ||||||||||||||||
| if (!IsValidFileUrl(fileUrl)) | ||||||||||||||||
| { | ||||||||||||||||
| return NotFound(messageService.Get("InvalidFileName")); | ||||||||||||||||
| } | ||||||||||||||||
|
Comment on lines
+39
to
+42
There was a problem hiding this comment. Returning return NotFound(messageService.Get("InvalidFileName")); |
||||||||||||||||
|
|
||||||||||||||||
|
|
||||||||||||||||
| // دریافت فایل از S3 | ||||||||||||||||
| var stream = await s3FileUploaderService.DownloadFileAsync(fileUrl, ct, BucketNameStatic.GetName(BucketNames.BookPdf)); | ||||||||||||||||
|
|
||||||||||||||||
| // The file name for the user should be extracted from the URL | ||||||||||||||||
| var fileName = Path.GetFileName(new Uri(fileUrl).AbsolutePath); | ||||||||||||||||
|
|
||||||||||||||||
| // تعیین نوع فایل با توجه به پسوند | ||||||||||||||||
| var contentTypeProvider = new FileExtensionContentTypeProvider(); | ||||||||||||||||
| if (!contentTypeProvider.TryGetContentType(fileName, out string contentType)) | ||||||||||||||||
| { | ||||||||||||||||
| contentType = "application/octet-stream"; // پیشفرض اگر پسوند ناشناس باشد | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| return File(stream, contentType, fileName); | ||||||||||||||||
|
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainVerify stream disposal behavior with File() method. The 🏁 Script executed: #!/bin/bash
# Description: Check if the S3FileUploaderService properly handles stream disposal
# Expected: The service should return a stream that can be safely disposed by the File() method
# Search for the S3FileUploaderService implementation
ast-grep --pattern 'class S3FileUploaderService {
$$$
DownloadFileAsync($$$) {
$$$
}
$$$
}'Length of output: 105 🏁 Script executed: #!/bin/bash
# Locate the S3FileUploaderService class and its DownloadFileAsync method
rg -n "class S3FileUploaderService"
rg -n "DownloadFileAsync" -C3Length of output: 2664 🏁 Script executed: #!/bin/bash
# Show the DownloadFileAsync method implementation for inspection
rg -n "public async Task<Stream> DownloadFileAsync" -C20 Refhub/Service/Implement/S3FileUploaderService.csLength of output: 1456 Ensure S3 response stream isn’t disposed before use The current code wraps the • Location: Refhub/Service/Implement/S3FileUploaderService.cs, DownloadFileAsync (lines 96–114) using var response = await _s3Client.GetObjectAsync(request, ct);
return response.ResponseStream;• Suggested fix: - using var response = await _s3Client.GetObjectAsync(request, ct);
- return response.ResponseStream;
+ var response = await _s3Client.GetObjectAsync(request, ct);
+ var ms = new MemoryStream();
+ await response.ResponseStream.CopyToAsync(ms, ct);
+ ms.Position = 0;
+ return ms;This ensures the returned stream remains valid when 🤖 Prompt for AI Agents |
||||||||||||||||
| } | ||||||||||||||||
|
There was a problem hiding this comment. The S3 service wraps exceptions in
Suggested change
|
||||||||||||||||
| catch (FileDownloadException s3Ex) | ||||||||||||||||
| { | ||||||||||||||||
| logger.LogError(s3Ex, "Error downloading file from S3: {Message}", s3Ex.Message); | ||||||||||||||||
|
|
||||||||||||||||
| return NotFound(messageService.Get("FileNotFound")); | ||||||||||||||||
| } | ||||||||||||||||
| catch (Exception ex) | ||||||||||||||||
| { | ||||||||||||||||
| logger.LogError(ex, "Unexpected error occurred while downloading the file."); | ||||||||||||||||
| return StatusCode(500,messageService.Get("DownloadError")); | ||||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| private readonly int _pageSize = 3; | ||||||||||||||||
|
|
@@ -41,4 +78,6 @@ public async Task<IActionResult> List(string searchText, string authorFilter, st | |||||||||||||||
|
|
||||||||||||||||
| return View(viewModel); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
|
|
||||||||||||||||
| } | ||||||||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Validate or sanitize the 'fileName' input to prevent path traversal or unauthorized access when fetching files from S3.