Contact: captcha-regio (global/eu) in de token-response en frame-src voor de StrictSite-CSP (CMS-U9 vervolg)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-10 23:11:07 +01:00
co-authored by Claude Sonnet 5.5
parent 3275092401
commit 5378c21799
15 changed files with 291 additions and 34 deletions
@@ -47,25 +47,43 @@ public static class CspPolicyCatalog
IEnumerable<string> allowedScriptOrigins,
IEnumerable<string> allowedConnectOrigins,
IEnumerable<string>? allowedSiteScriptOrigins = null,
IEnumerable<string>? allowedSiteConnectOrigins = null)
IEnumerable<string>? allowedSiteConnectOrigins = null,
IEnumerable<string>? allowedSiteFrameOrigins = null)
{
var connect = Join("'self'", allowedConnectOrigins);
if (StrictSite.Equals(policy, StringComparison.OrdinalIgnoreCase))
{
var directives = new List<string>
{
"default-src 'self'",
$"script-src {Join("'self'", allowedSiteScriptOrigins ?? [])}",
// Same documented exception as Strict: inline style attributes only, no script.
"style-src 'self' 'unsafe-inline'",
"img-src 'self' data:",
"font-src 'self'",
$"connect-src {Join("'self'", allowedSiteConnectOrigins ?? [])}",
};
// Only present when a site embeds a third party (for example the captcha widget's iframe); without
// origins the header stays byte-for-byte what it was (frames then fall back to default-src 'self').
var frames = (allowedSiteFrameOrigins ?? [])
.Where(origin => !string.IsNullOrWhiteSpace(origin)).ToArray();
if (frames.Length > 0)
{
directives.Add($"frame-src {Join("'self'", frames)}");
}
directives.AddRange(
[
"object-src 'none'",
"base-uri 'self'",
"form-action 'self'",
"frame-ancestors 'none'",
]);
return new SecurityHeaderSet(
ContentSecurityPolicy: string.Join("; ",
"default-src 'self'",
$"script-src {Join("'self'", allowedSiteScriptOrigins ?? [])}",
// Same documented exception as Strict: inline style attributes only, no script.
"style-src 'self' 'unsafe-inline'",
"img-src 'self' data:",
"font-src 'self'",
$"connect-src {Join("'self'", allowedSiteConnectOrigins ?? [])}",
"object-src 'none'",
"base-uri 'self'",
"form-action 'self'",
"frame-ancestors 'none'"),
ContentSecurityPolicy: string.Join("; ", directives),
FrameOptions: "DENY",
ReferrerPolicy: ReferrerPolicyValue);
}
@@ -35,7 +35,8 @@ public sealed class CspPolicyProvider : ICspPolicyProvider
value.AllowedScriptOrigins,
value.AllowedConnectOrigins,
value.AllowedSiteScriptOrigins,
value.AllowedSiteConnectOrigins),
value.AllowedSiteConnectOrigins,
value.AllowedSiteFrameOrigins),
StringComparer.OrdinalIgnoreCase);
}
@@ -24,7 +24,8 @@ public static class SecurityHeadersExtensions
$"SecurityHeaders:DefaultPolicy is not a known policy. Known policies: {string.Join(", ", CspPolicyCatalog.KnownPolicies)}.")
.Validate(
options => options.AllowedScriptOrigins.Concat(options.AllowedConnectOrigins)
.Concat(options.AllowedSiteScriptOrigins).Concat(options.AllowedSiteConnectOrigins).All(IsOrigin),
.Concat(options.AllowedSiteScriptOrigins).Concat(options.AllowedSiteConnectOrigins)
.Concat(options.AllowedSiteFrameOrigins).All(IsOrigin),
"SecurityHeaders origins must be absolute scheme-and-host values without a path, e.g. https://analytics.example.com.")
// ValidateOnStart, not a constructor check: options resolve lazily, so without this
// a typo in PathPolicies is discovered when the first request arrives — by which
@@ -73,13 +74,15 @@ public static class SecurityHeadersExtensions
logger.LogInformation(
"HTTP security headers enabled. Default policy: {DefaultPolicy}. Path policies: {PathPolicies}. " +
"Allowed script origins: {ScriptOrigins}. Allowed connect origins: {ConnectOrigins}. " +
"Allowed site script origins: {SiteScriptOrigins}. Allowed site connect origins: {SiteConnectOrigins}.",
"Allowed site script origins: {SiteScriptOrigins}. Allowed site connect origins: {SiteConnectOrigins}. " +
"Allowed site frame origins: {SiteFrameOrigins}.",
options.DefaultPolicy,
string.Join(", ", options.PathPolicies.Select(rule => $"{rule.PathPrefix} => {rule.Policy}")),
Describe(options.AllowedScriptOrigins),
Describe(options.AllowedConnectOrigins),
Describe(options.AllowedSiteScriptOrigins),
Describe(options.AllowedSiteConnectOrigins));
Describe(options.AllowedSiteConnectOrigins),
Describe(options.AllowedSiteFrameOrigins));
return app.UseMiddleware<SecurityHeadersMiddleware>();
}
@@ -70,6 +70,13 @@ public sealed class SecurityHeadersOptions
/// analytics and error-reporting hosts called directly by the website).
/// </summary>
public IList<string> AllowedSiteConnectOrigins { get; set; } = [];
/// <summary>
/// Origins added as a <c>frame-src</c> directive under the <c>StrictSite</c> policy only (for example the Friendly
/// Captcha widget, which renders in an iframe: <c>https://global.frcapi.com</c>, <c>https://eu.frcapi.com</c>).
/// Empty (the default) adds no <c>frame-src</c> at all, so existing headers are unchanged.
/// </summary>
public IList<string> AllowedSiteFrameOrigins { get; set; } = [];
}
/// <summary>One entry in <see cref="SecurityHeadersOptions.PathPolicies"/>.</summary>