yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v8/8.17' into v9/feature/merge_v8_14092021

Browse Source 
# Conflicts:
#	src/Umbraco.Core/PropertyEditors/MultiUrlPickerConfiguration.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
This commit is contained in:
Bjarke Berg
2021-09-14 13:10:44 +02:00
parent f3096c99da 237ac53928
commit b30dcf905b
24 changed files with 132 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Core/HealthChecks/Checks/Security/ExcessiveHeadersCheck.cs
View File

@@ -62,7 +62,14 @@ namespace Umbraco.Cms.Core.HealthChecks.Checks.Security
using HttpResponseMessage response = await HttpClient.SendAsync(request);
IEnumerable<string> allHeaders = response.Headers.Select(x => x.Key);
var headersToCheckFor = new[] { "Server", "X-Powered-By", "X-AspNet-Version", "X-AspNetMvc-Version" };
var headersToCheckFor = new List<string> {"Server", "X-Powered-By", "X-AspNet-Version", "X-AspNetMvc-Version" };
// Ignore if server header is present and it's set to cloudflare
if (allHeaders.InvariantContains("Server") && response.Headers.TryGetValues("Server", out var serverHeaders) && serverHeaders.ToString().InvariantEquals("cloudflare"))
{
headersToCheckFor.Remove("Server");
}
var headersFound = allHeaders
.Intersect(headersToCheckFor)
.ToArray();

4
src/Umbraco.Core/PropertyEditors/MarkdownConfiguration.cs
View File

@@ -12,7 +12,7 @@
public string DefaultValue { get; set; }
[ConfigurationField("overlayWidthSize", "Overlay Width Size", "views/propertyeditors/multiurlpicker/multiurlpicker.prevalues.html")]
public string OverlayWidthSize { get; set; }
[ConfigurationField("overlaySize", "Overlay Size", "overlaysize", Description = "Select the width of the overlay (link picker).")]
public string OverlaySize { get; set; }
}
}

4
src/Umbraco.Core/PropertyEditors/MultiUrlPickerConfiguration.cs
View File

@@ -9,8 +9,8 @@ namespace Umbraco.Cms.Core.PropertyEditors
[ConfigurationField("maxNumber", "Maximum number of items", "number")]
public int MaxNumber { get; set; }
[ConfigurationField("overlayWidthSize", "Overlay width size", "views/propertyeditors/multiurlpicker/multiurlpicker.prevalues.html")]
public string OverlayWidthSize { get; set; }
[ConfigurationField("overlaySize", "Overlay Size", "overlaysize", Description = "Select the width of the overlay.")]
public string OverlaySize { get; set; }
[ConfigurationField(Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes,
"Ignore user start nodes", "boolean",

3
src/Umbraco.Core/PropertyEditors/RichTextConfiguration.cs
View File

@@ -9,6 +9,9 @@
[ConfigurationField("editor", "Editor", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
public object Editor { get; set; }
[ConfigurationField("overlaySize", "Overlay Size", "overlaysize", Description = "Select the width of the overlay (link picker).")]
public string OverlaySize { get; set; }
[ConfigurationField("hideLabel", "Hide Label", "boolean")]
public bool HideLabel { get; set; }