merge net8

.github/workflows/integrate.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     - name: Restore dependencies
       run: dotnet restore -s ${MYGET_FEED} -s https://api.nuget.org/v3/index.json
       env:

.github/workflows/pull_request.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     - name: Restore dependencies
       run: dotnet restore -s ${MYGET_FEED} -s https://api.nuget.org/v3/index.json
       env:

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     - name: Extract version from tag
       id: get_version
       uses: battila7/get-version-action@v2

src/WopiHost.Abstractions/WopiAuthorizationRequirement.cs

@@ -5,19 +5,14 @@ namespace WopiHost.Abstractions;
 /// <summary>
 /// Represents an authorization requirement for a given combination of resource, user, and action.
 /// </summary>
-public class WopiAuthorizationRequirement : IAuthorizationRequirement
+/// <remarks>
+/// Creates an instance of <see cref="WopiAuthorizationRequirement"/> initialized with <paramref name="permission"/>.
+/// </remarks>
+/// <param name="permission">Permissions required for a given combination of resource, user, and action.</param>
+public class WopiAuthorizationRequirement(Permission permission) : IAuthorizationRequirement
 {
     /// <summary>
     /// Gets a permissions required for a given combination of resource, user, and action.
     /// </summary>
-    public Permission Permission { get; }
-
-    /// <summary>
-    /// Creates an instance of <see cref="WopiAuthorizationRequirement"/> initialized with <paramref name="permission"/>.
-    /// </summary>
-    /// <param name="permission">Permissions required for a given combination of resource, user, and action.</param>
-    public WopiAuthorizationRequirement(Permission permission)
-    {
-        Permission = permission;
-    }
+    public Permission Permission { get; } = permission;
 }

src/WopiHost.Abstractions/WopiHost.Abstractions.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.Abstractions Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WopiHost.Abstractions</AssemblyName>
     <PackageId>WopiHost.Abstractions</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -33,13 +33,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
   </ItemGroup>
 
 </Project>

src/WopiHost.Cobalt/CobaltHostLockingStore.cs

@@ -3,14 +3,9 @@
 
 namespace WopiHost.Cobalt;
 
-public class CobaltHostLockingStore : HostLockingStore
+public class CobaltHostLockingStore(ClaimsPrincipal principal) : HostLockingStore
 {
-    private readonly ClaimsPrincipal _principal;
-
-    public CobaltHostLockingStore(ClaimsPrincipal principal)
-    {
-        _principal = principal;
-    }
+    private readonly ClaimsPrincipal _principal = principal;
 
     public override WhoAmIRequest.OutputType HandleWhoAmI(WhoAmIRequest.InputType input)
     {
@@ -180,10 +175,7 @@ public override GetCoauthoringStatusRequest.OutputType HandleGetCoauthoringStatu
         return result;
     }
 
-    public override Dictionary<string, EditorsTableEntry> QueryEditorsTable()
-    {
-        return new Dictionary<string, EditorsTableEntry>();
-    }
+    public override Dictionary<string, EditorsTableEntry> QueryEditorsTable() => new Dictionary<string, EditorsTableEntry>();
 
     public override JoinEditingSessionRequest.OutputType HandleJoinEditingSession(JoinEditingSessionRequest.InputType input)
     {
@@ -220,10 +212,7 @@ public override RemoveEditorMetadataRequest.OutputType HandleRemoveEditorMetadat
         return result;
     }
 
-    public override ulong GetEditorsTableWaterline()
-    {
-        return 0;
-    }
+    public override ulong GetEditorsTableWaterline() => 0;
 
     public override AmIAloneRequest.OutputType HandleAmIAlone(AmIAloneRequest.InputType input)
     {

src/WopiHost.Cobalt/WopiHost.Cobalt.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.Cobalt Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WopiHost.Cobalt</AssemblyName>
     <PackageId>WopiHost.Cobalt</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

src/WopiHost.Core/Controllers/ContainersController.cs

@@ -10,18 +10,15 @@ namespace WopiHost.Core.Controllers;
 /// <summary>
 /// Implementation of WOPI server protocol https://msdn.microsoft.com/en-us/library/hh659001.aspx
 /// </summary>
+/// <remarks>
+/// Creates an instance of <see cref="ContainersController"/>.
+/// </remarks>
+/// <param name="storageProvider">Storage provider instance for retrieving files and folders.</param>
+/// <param name="securityHandler">Security handler instance for performing security-related operations.</param>
+/// <param name="wopiHostOptions">WOPI Host configuration</param>
 [Route("wopi/[controller]")]
-public class ContainersController : WopiControllerBase
+public class ContainersController(IOptionsSnapshot<WopiHostOptions> wopiHostOptions, IWopiStorageProvider storageProvider, IWopiSecurityHandler securityHandler) : WopiControllerBase(storageProvider, securityHandler, wopiHostOptions)
 {
-    /// <summary>
-    /// Creates an instance of <see cref="ContainersController"/>.
-    /// </summary>
-    /// <param name="storageProvider">Storage provider instance for retrieving files and folders.</param>
-    /// <param name="securityHandler">Security handler instance for performing security-related operations.</param>
-    /// <param name="wopiHostOptions">WOPI Host configuration</param>
-    public ContainersController(IOptionsSnapshot<WopiHostOptions> wopiHostOptions, IWopiStorageProvider storageProvider, IWopiSecurityHandler securityHandler) : base(storageProvider, securityHandler, wopiHostOptions)
-    {
-    }
 
     /// <summary>
     /// Returns the metadata about a container specified by an identifier.

src/WopiHost.Core/Controllers/EcosystemController.cs

@@ -9,19 +9,15 @@ namespace WopiHost.Core.Controllers;
 /// <summary>
 /// Implementation of WOPI server protocol https://learn.microsoft.com/en-us/microsoft-365/cloud-storage-partner-program/rest/ecosystem/checkecosystem
 /// </summary>
+/// <remarks>
+/// Creates an instance of <see cref="EcosystemController"/>.
+/// </remarks>
+/// <param name="storageProvider">Storage provider instance for retrieving files and folders.</param>
+/// <param name="securityHandler">Security handler instance for performing security-related operations.</param>
+/// <param name="wopiHostOptions">WOPI Host configuration</param>
 [Route("wopi/[controller]")]
-	public class EcosystemController : WopiControllerBase
+	public class EcosystemController(IWopiStorageProvider storageProvider, IWopiSecurityHandler securityHandler, IOptionsSnapshot<WopiHostOptions> wopiHostOptions) : WopiControllerBase(storageProvider, securityHandler, wopiHostOptions)
 	{
-		/// <summary>
-		/// Creates an instance of <see cref="EcosystemController"/>.
-		/// </summary>
-		/// <param name="storageProvider">Storage provider instance for retrieving files and folders.</param>
-		/// <param name="securityHandler">Security handler instance for performing security-related operations.</param>
-		/// <param name="wopiHostOptions">WOPI Host configuration</param>
-		public EcosystemController(IWopiStorageProvider storageProvider, IWopiSecurityHandler securityHandler, IOptionsSnapshot<WopiHostOptions> wopiHostOptions) 
-        : base(storageProvider, securityHandler, wopiHostOptions)
-		{
-		}
 
 		/// <summary>
 		/// The GetRootContainer operation returns the root container. A WOPI client can use this operation to get a reference to the root container, from which the client can call EnumerateChildren (containers) to navigate a container hierarchy.

src/WopiHost.Core/Controllers/FilesController.cs

@@ -155,13 +155,9 @@ public async Task<IActionResult> PutFile(string id)
     /// </summary>
     /// <param name="id">File identifier.</param>
     /// <returns>Returns <see cref="StatusCodes.Status200OK"/> if succeeded.</returns>
-    [HttpPost("{id}"), WopiOverrideHeader(new[] { "PUT_RELATIVE" })]
+    [HttpPost("{id}"), WopiOverrideHeader(["PUT_RELATIVE"])]
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-    public async Task<IActionResult> PutRelativeFile(string id)
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-    {
-        throw new NotImplementedException($"{nameof(PutRelativeFile)} is not implemented yet.");
-    }
+    public async Task<IActionResult> PutRelativeFile(string id) => throw new NotImplementedException($"{nameof(PutRelativeFile)} is not implemented yet.");
 
     /// <summary>
     /// Changes the contents of the file in accordance with [MS-FSSHTTP].
@@ -170,7 +166,7 @@ public async Task<IActionResult> PutRelativeFile(string id)
     /// Example URL path: /wopi/files/(file_id)
     /// </summary>
     /// <param name="id">File identifier.</param>
-    [HttpPost("{id}"), WopiOverrideHeader(new[] { "COBALT" })]
+    [HttpPost("{id}"), WopiOverrideHeader(["COBALT"])]
     public async Task<IActionResult> ProcessCobalt(string id)
     {
         // Check permissions
@@ -189,8 +185,8 @@ public async Task<IActionResult> ProcessCobalt(string id)
         }
 
         var responseAction = CobaltProcessor.ProcessCobalt(file, User, await HttpContext.Request.Body.ReadBytesAsync());
-        HttpContext.Response.Headers.Add(WopiHeaders.CORRELATION_ID, HttpContext.Request.Headers[WopiHeaders.CORRELATION_ID]);
-        HttpContext.Response.Headers.Add("request-id", HttpContext.Request.Headers[WopiHeaders.CORRELATION_ID]);
+        HttpContext.Response.Headers.Append(WopiHeaders.CORRELATION_ID, HttpContext.Request.Headers[WopiHeaders.CORRELATION_ID]);
+        HttpContext.Response.Headers.Append("request-id", HttpContext.Request.Headers[WopiHeaders.CORRELATION_ID]);
         return new Results.FileResult(responseAction, "application/octet-stream");
     }
 
@@ -202,7 +198,7 @@ public async Task<IActionResult> ProcessCobalt(string id)
     /// Example URL path: /wopi/files/(file_id)
     /// </summary>
     /// <param name="id">File identifier.</param>
-    [HttpPost("{id}"), WopiOverrideHeader(new[] { "LOCK", "UNLOCK", "REFRESH_LOCK", "GET_LOCK" })]
+    [HttpPost("{id}"), WopiOverrideHeader(["LOCK", "UNLOCK", "REFRESH_LOCK", "GET_LOCK"])]
     public IActionResult ProcessLock(string id)
     {
         string oldLock = Request.Headers[WopiHeaders.OLD_LOCK];

src/WopiHost.Core/Controllers/WopiBootstrapperController.cs

@@ -1,4 +1,5 @@
 using System.Net.Mime;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
@@ -11,19 +12,15 @@ namespace WopiHost.Core.Controllers;
 /// <summary>
 /// Controller containing the bootstrap operation.
 /// </summary>
+/// <remarks>
+/// Creates an instance of <see cref="WopiBootstrapperController"/>.
+/// </remarks>
+/// <param name="storageProvider">Storage provider instance for retrieving files and folders.</param>
+/// <param name="securityHandler">Security handler instance for performing security-related operations.</param>
+/// <param name="wopiHostOptions">WOPI Host configuration</param>
 [Route("wopibootstrapper")]
-public class WopiBootstrapperController : WopiControllerBase
+public class WopiBootstrapperController(IWopiStorageProvider storageProvider, IWopiSecurityHandler securityHandler, IOptionsSnapshot<WopiHostOptions> wopiHostOptions) : WopiControllerBase(storageProvider, securityHandler, wopiHostOptions)
 {
-    /// <summary>
-		/// Creates an instance of <see cref="WopiBootstrapperController"/>.
-    /// </summary>
-    /// <param name="storageProvider">Storage provider instance for retrieving files and folders.</param>
-    /// <param name="securityHandler">Security handler instance for performing security-related operations.</param>
-    /// <param name="wopiHostOptions">WOPI Host configuration</param>
-    public WopiBootstrapperController(IWopiStorageProvider storageProvider, IWopiSecurityHandler securityHandler, IOptionsSnapshot<WopiHostOptions> wopiHostOptions)
-        : base(storageProvider, securityHandler, wopiHostOptions)
-    {
-    }
 
     /// <summary>
     /// Gets information about the root container.
@@ -33,7 +30,7 @@ public WopiBootstrapperController(IWopiStorageProvider storageProvider, IWopiSec
     [Produces(MediaTypeNames.Application.Json)]
     public IActionResult GetRootContainer() //TODO: fix the path
     {
-        var authorizationHeader = HttpContext.Request.Headers["Authorization"];
+        var authorizationHeader = HttpContext.Request.Headers.Authorization;
         var ecosystemOperation = HttpContext.Request.Headers[WopiHeaders.ECOSYSTEM_OPERATION];
         var wopiSrc = HttpContext.Request.Headers[WopiHeaders.WOPI_SRC].FirstOrDefault();
 
@@ -90,18 +87,18 @@ public IActionResult GetRootContainer() //TODO: fix the path
             var tokenIssuanceUri = "https://contoso.com/api/oauth2/token";
             var providerId = "tp_contoso";
             var urlSchemes = Uri.EscapeDataString("{\"iOS\" : [\"contoso\",\"contoso - EMM\"], \"Android\" : [\"contoso\",\"contoso - EMM\"], \"UWP\": [\"contoso\",\"contoso - EMM\"]}");
-            Response.Headers.Add("WWW-Authenticate", $"Bearer authorization_uri=\"{authorizationUri}\",tokenIssuance_uri=\"{tokenIssuanceUri}\",providerId=\"{providerId}\", UrlSchemes=\"{urlSchemes}\"");
+            Response.Headers.Append("WWW-Authenticate", $"Bearer authorization_uri=\"{authorizationUri}\",tokenIssuance_uri=\"{tokenIssuanceUri}\",providerId=\"{providerId}\", UrlSchemes=\"{urlSchemes}\"");
             return new UnauthorizedResult();
         }
     }
 
     private string GetIdFromUrl(string resourceUrl)
     {
-        var resourceId = resourceUrl[(resourceUrl.LastIndexOf("/", StringComparison.Ordinal) + 1)..];
-        var queryIndex = resourceId.IndexOf("?", StringComparison.Ordinal);
+        var resourceId = resourceUrl[(resourceUrl.LastIndexOf('/') + 1)..];
+        var queryIndex = resourceId.IndexOf('?');
         if (queryIndex > -1)
         {
-            resourceId = resourceId.Substring(0, queryIndex);
+            resourceId = resourceId[..queryIndex];
         }
         resourceId = Uri.UnescapeDataString(resourceId);
         return resourceId;
@@ -111,6 +108,5 @@ private bool ValidateAuthorizationHeader(StringValues authorizationHeader)
     {
         //TODO: implement header validation https://learn.microsoft.com/en-us/microsoft-365/cloud-storage-partner-program/rest/bootstrapper/getrootcontainer#sample-response
         // http://stackoverflow.com/questions/31948426/oauth-bearer-token-authentication-is-not-passing-signature-validation
-        return true;
-    }
+        true;
 }

src/WopiHost.Core/Controllers/WopiControllerBase.cs

@@ -10,22 +10,28 @@ namespace WopiHost.Core.Controllers;
 /// <summary>
 /// Extends the <see cref="ControllerBase"/> with some basic WOPI-related functionality.
 /// </summary>
-public abstract class WopiControllerBase : ControllerBase
+/// <remarks>
+/// Default constructor.
+/// </remarks>
+/// <param name="storageProvider">Object facilitating access to the storage of WOPI files.</param>
+/// <param name="securityHandler">Object facilitating security-related actions.</param>
+/// <param name="wopiHostOptions">WOPI Host configuration object</param>
+public abstract class WopiControllerBase(IWopiStorageProvider storageProvider, IWopiSecurityHandler securityHandler, IOptionsSnapshot<WopiHostOptions> wopiHostOptions) : ControllerBase
 {
     /// <summary>
     /// Provides access to the storage.
     /// </summary>
-    protected IWopiStorageProvider StorageProvider { get; }
+    protected IWopiStorageProvider StorageProvider { get; } = storageProvider;
 
     /// <summary>
     /// Provides security-related actions.
     /// </summary>
-    protected IWopiSecurityHandler SecurityHandler { get; }
+    protected IWopiSecurityHandler SecurityHandler { get; } = securityHandler;
 
     /// <summary>
     /// WOPI Host configuration object.
     /// </summary>
-    protected IOptionsSnapshot<WopiHostOptions> WopiHostOptions { get; }
+    protected IOptionsSnapshot<WopiHostOptions> WopiHostOptions { get; } = wopiHostOptions;
 
     /// <summary>
     /// WOPI Host base URL
@@ -45,19 +51,6 @@ protected string AccessToken
         }
     }
 
-    /// <summary>
-    /// Default constructor.
-    /// </summary>
-    /// <param name="storageProvider">Object facilitating access to the storage of WOPI files.</param>
-    /// <param name="securityHandler">Object facilitating security-related actions.</param>
-    /// <param name="wopiHostOptions">WOPI Host configuration object</param>
-    protected WopiControllerBase(IWopiStorageProvider storageProvider, IWopiSecurityHandler securityHandler, IOptionsSnapshot<WopiHostOptions> wopiHostOptions)
-    {
-        StorageProvider = storageProvider;
-        SecurityHandler = securityHandler;
-        WopiHostOptions = wopiHostOptions;
-    }
-
     /// <summary>
     /// Creates a simple URL to access a WOPI object of choice.
     /// </summary>

src/WopiHost.Core/FileExtensions.cs

@@ -22,15 +22,9 @@ public static class FileExtensions
     /// <returns>CheckFileInfo model</returns>
     public static CheckFileInfo GetCheckFileInfo(this IWopiFile file, ClaimsPrincipal principal, HostCapabilities capabilities)
     {
-        if (file is null)
-        {
-            throw new ArgumentNullException(nameof(file));
-        }
+        ArgumentNullException.ThrowIfNull(file);
 
-        if (capabilities is null)
-        {
-            throw new ArgumentNullException(nameof(capabilities));
-        }
+        ArgumentNullException.ThrowIfNull(capabilities);
 
         var checkFileInfo = new CheckFileInfo();
         if (principal is not null)