Merge branch 'develop'

.github/actions/docker-build-and-push/action.yml

@@ -19,14 +19,11 @@ runs:
   using: "composite"
   steps:
     - id: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v6
     - id: docker-setup-buildx
-      uses: docker/setup-buildx-action@v2
-      with:
-        driver-opts: |
-          image=moby/buildkit:v0.10.6
+      uses: docker/setup-buildx-action@v3
     - id: docker-meta
-      uses: docker/metadata-action@v3
+      uses: docker/metadata-action@v5
       with:
         images: ghcr.io/dlcs/${{ inputs.image-name }}
         tags: |
@@ -37,7 +34,7 @@ runs:
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{major}}
     - id: docker-login
-      uses: docker/login-action@v1
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.actor }}

.github/workflows/run_build.yml

@@ -21,9 +21,9 @@ jobs:
       SOLUTION: "protagonist.sln"
     steps:   
       - id: checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - id: setup-dotnet
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: "8.0.x"
       - id: restore-dotnet-dependencies
@@ -56,7 +56,7 @@ jobs:
           - image: "migrator"
             dockerfile: "Dockerfile.Migrator"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/docker-build-and-push
         with:
           image-name: ${{ matrix.image }}

.github/workflows/run_sonar.yml

@@ -13,18 +13,18 @@ jobs:
       SOLUTION: "protagonist.sln"
     steps:   
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'zulu' # Alternative distribution options are available.
       - id: checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - id: setup-dotnet
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: "8.0.x"
       - name: Cache SonarCloud packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/sonar/cache
           key: ${{ runner.os }}-sonar

compose/.env.dist

@@ -32,7 +32,7 @@ Thumbs__UpscaleThreshold=40
 
 # Appetiser
 # ------------------------------------------------------------------------------
-KAKADU_APPS_LOCATION=s3://bucket/kakadu/kdu.tar.gz
+KDU_BINARIES=s3://bucket/kakadu/kdu.tar.gz
 
 # Special Server
 # ------------------------------------------------------------------------------

compose/docker-compose.local.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 volumes:
   dlcs_postgres_data: {}
   dlcs_postgres_data_backups: {}
@@ -50,7 +48,7 @@ services:
       - .env
 
   appetiser:
-    image: ghcr.io/dlcs/appetiser:pr-25 # TODO - temp use PR until release cut
+    image: ghcr.io/dlcs/appetiser:2.1.0
     ports:
       - "5031:8000"
     volumes:

docs/adr/readme.md

@@ -9,4 +9,5 @@
 7. [Engine ImageServer](0006-engine-imageserver.md)
 8. [In-house Image Server](0007-inhouse-image-server.md)
 9. [ElasticTranscoder Replacement](0008-et-replacement.md)
-10. [Engine Use Appetiser for Thumbs](0009-engine-appetiser-thumbs.md)
+10. [Engine Use Appetiser for Thumbs](0009-engine-appetiser-thumbs.md)
+11. [Replace `maxUnauthorised`](0010-replace-maxunauthorised.md)

src/protagonist/API.Tests/Features/Adjuncts/Validation/HydraAdjunctValidatorTests.cs

@@ -0,0 +1,187 @@
+using API.Features.Adjuncts.Validation;
+using API.Settings;
+using DLCS.HydraModel;
+using FluentValidation.TestHelper;
+using Microsoft.Extensions.Options;
+
+namespace API.Tests.Features.Adjuncts.Validation;
+
+public class HydraAdjunctValidatorTests
+{
+    private readonly HydraAdjunctValidator sut = new(Options.Create(
+        new ApiSettings
+        {
+            RestrictedResourceIdCharacterString = "\\ /"
+        }));
+
+    [Fact]
+    public void Valid_WhenAllValidatorsUsed()
+    {
+        var adjunct = new Adjunct("https://localhost", 1, 1, "assetId", "adjunctId")
+        {
+            ExternalId = "https://localhost:2000/some-id",
+            MediaType = "mediaType",
+            IIIFLink = "seeAlso",
+            Type = "Image",
+            Language = ["fra", "en"]
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldNotHaveAnyValidationErrors();
+    }
+
+    [Fact]
+    public void ExternalId_NotValidUri()
+    {
+        var adjunct = new Adjunct("https://localhost", 1, 1, "assetId", "adjunctId")
+        {
+            ExternalId = "not-uri",
+            MediaType = "mediaType",
+            IIIFLink = "seeAlso",
+            Type = "Image"
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.ExternalId)
+            .WithErrorMessage("'externalId' is required and must be a well formed URI");
+    }
+
+    [Fact]
+    public void ExternalId_Null()
+    {
+        var adjunct = new Adjunct
+        {
+            ExternalId = null,
+            MediaType = "mediaType",
+            IIIFLink = "seeAlso",
+            Type = "Image"
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.ExternalId)
+            .WithErrorMessage("'externalId' is required and must be a well formed URI");
+    }
+
+    [Theory]
+    [InlineData("SeeAlso")]
+    [InlineData("Invalid")]
+    public void IIIFLink_NotValid(string iiifLink)
+    {
+        var adjunct = new Adjunct
+        {
+            MediaType = "mediaType",
+            IIIFLink = iiifLink,
+            Type = "Image",
+            ExternalId = "https://localhost/customers/1/spaces/1/images/assetId/valid"
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.IIIFLink)
+            .WithErrorMessage("Valid values for 'iiifLink' are 'seeAlso', 'annotations', 'rendering'");
+    }
+
+    [Fact]
+    public void IIIFLink_Null()
+    {
+        var adjunct = new Adjunct
+        {
+            MediaType = "mediaType",
+            Type = "Image",
+            ExternalId = "https://localhost/customers/1/spaces/1/images/assetId/valid"
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.IIIFLink)
+            .WithErrorMessage("'iiifLink' is required");
+    }
+
+    [Fact]
+    public void MediaType_Null()
+    {
+        var adjunct = new Adjunct
+        {
+            IIIFLink = "seeAlso",
+            Type = "Image",
+            ExternalId = "https://localhost/customers/1/spaces/1/images/assetId/valid"
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.MediaType)
+            .WithErrorMessage("'mediaType' is required");
+    }
+
+    [Fact]
+    public void ModelId_Null()
+    {
+        var adjunct = new Adjunct
+        {
+            MediaType = "mediaType",
+            IIIFLink = "seeAlso",
+            Type = "Image",
+            ExternalId = "https://localhost/customers/1/spaces/1/images/assetId/valid"
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.ModelId)
+            .WithErrorMessage("Adjunct identifier could not be found");
+    }
+
+    [Theory]
+    [InlineData(" space")]
+    [InlineData("slash\\")]
+    [InlineData("other/slash")]
+    public void ModelId_InvalidCharacters(string modelId)
+    {
+        var adjunct = new Adjunct
+        {
+            MediaType = "mediaType",
+            IIIFLink = "seeAlso",
+            Type = "Image",
+            ExternalId = "https://localhost/customers/1/spaces/1/images/assetId/valid",
+            ModelId = modelId
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.ModelId)
+            .WithErrorMessage("Adjunct id contains at least one of the following restricted characters. Invalid values are: \\ /");
+    }
+
+    [Fact]
+    public void ModelId_TooLong()
+    {
+        var adjunct = new Adjunct
+        {
+            MediaType = "mediaType",
+            IIIFLink = "seeAlso",
+            Type = "Image",
+            ExternalId = "https://localhost/customers/1/spaces/1/images/assetId/valid",
+            ModelId = new string('a', 201),
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.ModelId)
+            .WithErrorMessage("Adjunct id must be 200 characters or less");
+    }
+
+    [Fact]
+    public void Type_Error_WhenNotSet()
+    {
+        var adjunct = new Adjunct
+        {
+            MediaType = "mediaType",
+            IIIFLink = "seeAlso",
+            Type = null,
+            ExternalId = "https://localhost/customers/1/spaces/1/images/assetId"
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.Type)
+            .WithErrorMessage("'@type' is required");
+    }
+
+    [Fact]
+    public void Language_Error_TooLong()
+    {
+        var adjunct = new Adjunct
+        {
+            MediaType = "mediaType",
+            IIIFLink = "seeAlso",
+            Type = "AnnotationPage",
+            Language = ["en", "an overly long language string"],
+            ExternalId = "https://localhost/customers/1/spaces/1/images/assetId"
+        };
+        var result = sut.TestValidate(adjunct);
+        result.ShouldHaveValidationErrorFor(r => r.Language)
+            .WithErrorMessage("All 'language' values must be 10 characters or less. e.g. ISO language codes, sub-codes or 'none'");
+    }
+}

src/protagonist/API.Tests/Features/Assets/ApiAssetRepositoryTests.cs

@@ -304,7 +304,7 @@ public void AssetRepository_FailsToSaveAsset_WhichHasRestrictedCharacters()
 
         var result = AssetPreparer.PrepareAssetForUpsert(null, newAsset, false, false, new []{' '});
         result.Success.Should().BeFalse();
-        result.ErrorMessage.Should().Be("Asset id contains at least one of the following restricted characters. Valid values are:  ");
+        result.ErrorMessage.Should().Be("Asset id contains at least one of the following restricted characters. Invalid values are:  ");
     }
 
     [Fact]