From 0014f0e6db1e90edcdc50d2701abb92d05e48f8d Mon Sep 17 00:00:00 2001 From: nikolajlauridsen Date: Wed, 22 Feb 2023 08:38:16 +0100 Subject: [PATCH 1/5] Bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 925296d897..260b3d64b3 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "11.2.0-rc", + "version": "11.2.0", "assemblyVersion": { "precision": "build" }, From 0e65af701fdb6d48f1f5bcb75579a1a2a367ea8b Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 15 Feb 2023 13:57:58 +0100 Subject: [PATCH 2/5] Fixed pipeline after dotnet sdk 7.0.200 --- build/azure-pipelines.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index da728fffb3..ff52d3c2aa 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -110,7 +110,10 @@ stages: } } - dotnet pack $(solution) --configuration $(buildConfiguration) --no-build --output $(Build.ArtifactStagingDirectory)/nupkg + foreach($csproj in Get-ChildItem –Path "src/" -Recurse -Filter *.csproj) + { + dotnet pack $csproj --configuration $(buildConfiguration) --no-build --output $(Build.ArtifactStagingDirectory)/nupkg + } - script: | sha="$(Build.SourceVersion)" sha=${sha:0:7} From cf1cd51266303e06384d9fa42d82bf87fd21d197 Mon Sep 17 00:00:00 2001 From: Andreas Zerbst Date: Thu, 16 Feb 2023 09:18:14 +0100 Subject: [PATCH 3/5] Removed path so we can generate templates --- build/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index ff52d3c2aa..56e6dccc1b 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -110,7 +110,7 @@ stages: } } - foreach($csproj in Get-ChildItem –Path "src/" -Recurse -Filter *.csproj) + foreach($csproj in Get-ChildItem -Recurse -Filter *.csproj) { dotnet pack $csproj --configuration $(buildConfiguration) --no-build --output $(Build.ArtifactStagingDirectory)/nupkg } From fcca1cf5c058d981f6cc3978829afb985b6d98c4 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 14 Mar 2023 08:27:17 +0100 Subject: [PATCH 4/5] Check the tmpimg path is in the expected folder --- .../PropertyEditors/RichTextEditorPastedImages.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs index 1f76f6f802..569f38139d 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs @@ -74,6 +74,7 @@ public sealed class RichTextEditorPastedImages // we have already processed to avoid dupes var uploadedImages = new Dictionary(); + foreach (HtmlNode? img in tmpImages) { // The data attribute contains the path to the tmp img to persist as a media item @@ -84,6 +85,11 @@ public sealed class RichTextEditorPastedImages continue; } + if (IsValidPath(tmpImgPath) == false) + { + continue; + } + var absoluteTempImagePath = _hostingEnvironment.MapPathContentRoot(tmpImgPath); var fileName = Path.GetFileName(absoluteTempImagePath); var safeFileName = fileName.ToSafeFileName(_shortStringHelper); @@ -184,4 +190,6 @@ public sealed class RichTextEditorPastedImages return htmlDoc.DocumentNode.OuterHtml; } + + private bool IsValidPath(string imagePath) => imagePath.StartsWith(Constants.SystemDirectories.TempImageUploads); } From 921a32ee03fa3979ab12583310584c2cfa0c66d9 Mon Sep 17 00:00:00 2001 From: Nikolaj Date: Tue, 14 Mar 2023 14:20:31 +0100 Subject: [PATCH 5/5] Bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 260b3d64b3..f8ff03af10 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "11.2.0", + "version": "11.2.1", "assemblyVersion": { "precision": "build" },