Refactor thumbnail handling in tests: replace IFileAttachmentStreamProvider with IFileContentProvider and update related methods

Author: mm-omdi

source/AAS.TwinEngine.DataEngine.ModuleTests/Api/Services/AasRepository/AasRepositoryControllerTests.cs

@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using System.Net.Http.Json;
 using System.Text;
 using System.Text.Json.Nodes;
@@ -27,14 +27,14 @@ public abstract class AasRepositoryControllerTests : IDisposable
 {
     private readonly ConfigTestFactory _factory;
     private readonly ITemplateProvider _mockTemplateProvider;
-    private readonly IFileAttachmentStreamProvider _fileAttachmentStreamProvider;
+    private readonly IFileContentProvider _fileContentProvider;
     private readonly HttpClient _client;
     private readonly ICreateClient _httpClientFactory;
 
     protected AasRepositoryControllerTests(string configDir)
     {
         _mockTemplateProvider = Substitute.For<ITemplateProvider>();
-        _fileAttachmentStreamProvider = Substitute.For<IFileAttachmentStreamProvider>();
+        _fileContentProvider = Substitute.For<IFileContentProvider>();
         var mockPluginManifestProvider = Substitute.For<IPluginManifestProvider>();
         var mockPluginManifestConflictHandler = Substitute.For<IPluginManifestConflictHandler>();
         _httpClientFactory = Substitute.For<ICreateClient>();
@@ -45,7 +45,7 @@ protected AasRepositoryControllerTests(string configDir)
             _ = services.AddSingleton(mockPluginManifestConflictHandler);
             _ = services.AddSingleton(_httpClientFactory);
             _ = services.AddSingleton(_mockTemplateProvider);
-            _ = services.AddSingleton(_fileAttachmentStreamProvider);
+            _ = services.AddSingleton(_fileContentProvider);
         });
 
         _client = _factory.CreateClient();
@@ -592,10 +592,7 @@ public async Task GetThumbnailAsync_ShouldReturn200OKWithStream_WhenThumbnailExi
         };
         httpResponseMessage.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("image/png");
 
-        _ = _fileAttachmentStreamProvider.GetResponseHeadersAsync("https://example.com/share/img/10080308_DE.jpg", Arg.Any<CancellationToken>())
-            .Returns(httpResponseMessage);
-        _ = _fileAttachmentStreamProvider.ReadStreamAsync(httpResponseMessage, Arg.Any<CancellationToken>())
-            .Returns(new MemoryStream("test-bytes"u8.ToArray()));
+        _ = _fileContentProvider.GetFileContentAsync("https://example.com/share/img/10080308_DE.jpg", Arg.Any<CancellationToken>());
 
         var response = await _client.GetAsync($"/shells/{AasIdentifier}/asset-information/thumbnail");
 

source/AAS.TwinEngine.DataEngine.UnitTests/Api/AasRepository/AasRepositoryControllerTests.cs

@@ -7,7 +7,9 @@
 using AAS.TwinEngine.DataEngine.Api.AasRepository.Requests;
 using AAS.TwinEngine.DataEngine.Api.AasRepository.Responses;
 using AAS.TwinEngine.DataEngine.Api.Shared;
+using AAS.TwinEngine.DataEngine.Api.Shared.Results;
 using AAS.TwinEngine.DataEngine.ApplicationLogic.Extensions;
+using AAS.TwinEngine.DataEngine.DomainModel.Shared;
 using AAS.TwinEngine.DataEngine.DomainModel.SubmodelRepository;
 
 using AasCore.Aas3_1;
@@ -276,18 +278,30 @@ private static SubmodelRefDto CreateSubmodelRefDto()
     }
 
     [Fact]
-    public async Task GetThumbnailAsync_ShouldReturnFileStreamResult()
+    public async Task GetThumbnailAsync_ShouldReturnFileContentStreamResult_WhenHandlerCompletes()
     {
         var expectedStream = new MemoryStream("test-image"u8.ToArray());
-        var attachmentResult = new FileAttachmentResult(expectedStream, "image/png", "thumbnail.png");
+        var attachmentResult = new FileAttachmentResult(expectedStream, "image/png", "thumbnail.png", 100 * 1024 * 1024);
         _handler.GetThumbnailAsync(Arg.Any<GetThumbnailRequest>(), Arg.Any<CancellationToken>())
             .Returns(attachmentResult);
 
         var response = await _sut.GetThumbnailAsync(AasIdentifier, CancellationToken.None);
 
-        var fileResult = Assert.IsType<FileStreamResult>(response);
-        Assert.Equal("image/png", fileResult.ContentType);
-        Assert.Equal("thumbnail.png", fileResult.FileDownloadName);
+        Assert.IsType<FileContentStreamResult>(response);
+    }
+
+    [Fact]
+    public async Task GetThumbnailAsync_PassesRouteValuesToHandler()
+    {
+        _handler.GetThumbnailAsync(Arg.Any<GetThumbnailRequest>(), Arg.Any<CancellationToken>())
+            .Returns(new FileAttachmentResult(Stream.Null, "image/png", "thumbnail.png", 100 * 1024 * 1024));
+
+        await _sut.GetThumbnailAsync(AasIdentifier, CancellationToken.None);
+
+        await _handler.Received(1)
+            .GetThumbnailAsync(
+                Arg.Is<GetThumbnailRequest>(r => r.AasIdentifier == AasIdentifier),
+                Arg.Any<CancellationToken>());
     }
 }
 

source/AAS.TwinEngine.DataEngine.UnitTests/Api/AasRepository/Handler/AasRepositoryHandlerTests.cs

@@ -260,7 +260,7 @@ public async Task GetSubmodelRefByIdAsync_InvalidBase64_ThrowsInvalidUserInputEx
     [Fact]
     public async Task GetThumbnailAsync_ShouldReturnFileAttachmentResult()
     {
-        var expectedResult = new FileAttachmentResult(new MemoryStream(), "image/png", "test.png");
+        var expectedResult = new FileAttachmentResult(new MemoryStream(), "image/png", "test.png", 100 * 1024 * 1024);
         _aasRepositoryService.GetThumbnailAsync("https://example.com/aas", Arg.Any<CancellationToken>())
             .Returns(expectedResult);
 
@@ -270,6 +270,59 @@ public async Task GetThumbnailAsync_ShouldReturnFileAttachmentResult()
         Assert.Equal(expectedResult, result);
     }
 
+    [Fact]
+    public async Task GetThumbnailAsync_CallsServiceWithDecodedAasIdentifier_WhenInputIsValid()
+    {
+        const string aasIdentifier = "https://example.com/aas";
+        var encodedId = aasIdentifier.EncodeBase64Url();
+        var request = new GetThumbnailRequest(encodedId);
+        var expectedResult = new FileAttachmentResult(Stream.Null, "image/png", "thumbnail.png", 100 * 1024 * 1024);
+
+        _aasRepositoryService
+            .GetThumbnailAsync(aasIdentifier, Arg.Any<CancellationToken>())
+            .Returns(expectedResult);
+
+        await _sut.GetThumbnailAsync(request, CancellationToken.None);
+
+        await _aasRepositoryService.Received(1)
+            .GetThumbnailAsync(aasIdentifier, Arg.Any<CancellationToken>());
+    }
+
+    [Fact]
+    public async Task GetThumbnailAsync_InvalidBase64AasIdentifier_ThrowsInvalidUserInputException()
+    {
+        const string invalidEncodedId = "!!invalid_base64@@";
+        var request = new GetThumbnailRequest(invalidEncodedId);
+
+        await Assert.ThrowsAsync<InvalidUserInputException>(() =>
+            _sut.GetThumbnailAsync(request, CancellationToken.None));
+    }
+
+    [Theory]
+    [InlineData("../../../etc/passwd")]
+    [InlineData("..\\..\\..\\windows\\system32")]
+    public async Task GetThumbnailAsync_MaliciousDecodedIdentifier_ThrowsInvalidUserInputException(string maliciousIdentifier)
+    {
+        var request = new GetThumbnailRequest(maliciousIdentifier.EncodeBase64Url());
+
+        await Assert.ThrowsAsync<InvalidUserInputException>(() =>
+            _sut.GetThumbnailAsync(request, CancellationToken.None));
+    }
+
+    [Fact]
+    public async Task GetThumbnailAsync_ServiceReturnsNull_ThrowsTemplateNotFoundException()
+    {
+        const string aasIdentifier = "https://example.com/aas";
+        var request = new GetThumbnailRequest(aasIdentifier.EncodeBase64Url());
+
+        _aasRepositoryService
+            .GetThumbnailAsync(aasIdentifier, Arg.Any<CancellationToken>())!
+            .Returns((FileAttachmentResult)null!);
+
+        await Assert.ThrowsAsync<TemplateNotFoundException>(() =>
+            _sut.GetThumbnailAsync(request, CancellationToken.None));
+    }
+
     private static AssetInformation CreateAssetInformation()
     {
         var thumbnail = Substitute.For<IResource>();