Skip to content

Commit 30a431f

Browse files
committed
Merge branch 'release/15.4' into v15/dev
2 parents 3579c4a + e932fa5 commit 30a431f

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

build/azure-pipelines.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,8 @@ stages:
829829
condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.myGetDeploy}}))
830830
jobs:
831831
- job:
832+
pool:
833+
vmImage: "windows-latest" # NuGetCommand@2 is no longer supported on Ubuntu 24.04 so we'll use windows until an alternative is available.
832834
displayName: Push to pre-release feed
833835
steps:
834836
- checkout: none
@@ -890,6 +892,8 @@ stages:
890892
condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.nuGetDeploy}}))
891893
jobs:
892894
- job:
895+
pool:
896+
vmImage: "windows-latest" # NuGetCommand@2 is no longer supported on Ubuntu 24.04 so we'll use windows until an alternative is available.
893897
displayName: Push to NuGet
894898
steps:
895899
- checkout: none

src/Umbraco.Cms.Api.Management/Controllers/Webhook/Logs/WebhookLogControllerBase.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1+
using Microsoft.AspNetCore.Authorization;
12
using Microsoft.AspNetCore.Mvc;
23
using Umbraco.Cms.Api.Common.ViewModels.Pagination;
34
using Umbraco.Cms.Api.Management.Factories;
45
using Umbraco.Cms.Api.Management.Routing;
56
using Umbraco.Cms.Api.Management.ViewModels.Webhook.Logs;
67
using Umbraco.Cms.Core;
78
using Umbraco.Cms.Core.Models;
9+
using Umbraco.Cms.Web.Common.Authorization;
810

911
namespace Umbraco.Cms.Api.Management.Controllers.Webhook.Logs;
1012

1113
[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Webhook}")]
1214
[ApiExplorerSettings(GroupName = "Webhook")]
15+
[Authorize(Policy = AuthorizationPolicies.TreeAccessWebhooks)]
1316
public class WebhookLogControllerBase : ManagementApiControllerBase
1417
{
1518
protected PagedViewModel<WebhookLogResponseModel> CreatePagedWebhookLogResponseModel(PagedModel<WebhookLog> logs, IWebhookPresentationFactory webhookPresentationFactory)

src/Umbraco.Core/IO/PhysicalFileSystem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public string GetFullPath(string path)
358358

359359
// nothing prevents us to reach the file, security-wise, yet it is outside
360360
// this filesystem's root - throw
361-
throw new UnauthorizedAccessException($"File original: [{originalPath}] full: [{path}] is outside this filesystem's root.");
361+
throw new UnauthorizedAccessException($"Requested path {originalPath} is outside this filesystem's root.");
362362
}
363363

364364
/// <summary>

0 commit comments

Comments
 (0)