From 791f46dfee69bd8435c51fef119875e4c042256c Mon Sep 17 00:00:00 2001 From: Natalia Ivakina Date: Thu, 2 May 2024 13:43:20 +0200 Subject: [PATCH 1/3] Add new configs `dbms.security.http_static_content_security_policy_header`, `server.http.transaction_idle_timeout` --- .../configuration/configuration-settings.adoc | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/modules/ROOT/pages/configuration/configuration-settings.adoc b/modules/ROOT/pages/configuration/configuration-settings.adoc index 744433997..8d3d5f0a3 100644 --- a/modules/ROOT/pages/configuration/configuration-settings.adoc +++ b/modules/ROOT/pages/configuration/configuration-settings.adoc @@ -1497,7 +1497,6 @@ a|A socket address in the format of `hostname:port`, `hostname`, or `:port`. If m|+++:7474+++ |=== - [[config_server.http_enabled_modules]] === `server.http_enabled_modules` @@ -3901,6 +3900,22 @@ m| |=== +[role=label--new-5.20] +[[config_dbms.security.http_static_content_security_policy_header]] +=== `dbms.security.http_static_content_security_policy_header` + +.dbms.security.http_static_content_security_policy_header +[frame="topbot", stripes=odd, grid="cols", cols="<1s,<4"] +|=== +|Description +a|Defines the Content-Security-Policy header to return to content returned on static endpoints. +|Valid values +a|A string +|Default value +m|+++default-src 'self'; script-src 'self' cdn.segment.com canny.io; img-src 'self'; style-src 'self' fonts.googleapis.com 'unsafe-inline'; font-src 'self' fonts.gstatic.com; base-uri 'none'; object-src 'none'; frame-ancestors 'none'; connect-src 'self' api.canny.io api.segment.io wss+++ +|=== + + [role=label--enterprise-edition label--dynamic] [[config_dbms.security.key.name]] === `dbms.security.key.name` @@ -5412,6 +5427,22 @@ a|One of [DISABLED, SAMPLE, ALL]. m|+++DISABLED+++ |=== +[role=label--new-5.20] +[[config_server.http.transaction_idle_timeout]] +=== `server.http.transaction_idle_timeout` + +.server.http.transaction_idle_timeout +[frame="topbot", stripes=odd, grid="cols", cols="<1s,<4"] +|=== +|Description +a|Timeout for idle transactions in the HTTP Server. +Note: this is different from 'db.transaction.timeout' which will timeout the underlying transaction. +|Valid values +a|A duration +|Default value +m|+++30s+++ +|=== + == Transaction log settings From 990dcf7ff816bf7a92deb294d2f308dd7a0972e8 Mon Sep 17 00:00:00 2001 From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com> Date: Thu, 2 May 2024 14:47:20 +0200 Subject: [PATCH 2/3] Apply suggestions from code review --- modules/ROOT/pages/configuration/configuration-settings.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ROOT/pages/configuration/configuration-settings.adoc b/modules/ROOT/pages/configuration/configuration-settings.adoc index 8d3d5f0a3..33d2da0c0 100644 --- a/modules/ROOT/pages/configuration/configuration-settings.adoc +++ b/modules/ROOT/pages/configuration/configuration-settings.adoc @@ -3910,7 +3910,7 @@ m| |Description a|Defines the Content-Security-Policy header to return to content returned on static endpoints. |Valid values -a|A string +a|A string. |Default value m|+++default-src 'self'; script-src 'self' cdn.segment.com canny.io; img-src 'self'; style-src 'self' fonts.googleapis.com 'unsafe-inline'; font-src 'self' fonts.gstatic.com; base-uri 'none'; object-src 'none'; frame-ancestors 'none'; connect-src 'self' api.canny.io api.segment.io wss+++ |=== @@ -5438,7 +5438,7 @@ m|+++DISABLED+++ a|Timeout for idle transactions in the HTTP Server. Note: this is different from 'db.transaction.timeout' which will timeout the underlying transaction. |Valid values -a|A duration +a|A duration (Valid units are: `ns`, `μs`, `ms`, `s`, `m`, `h` and `d`; default unit is `s`). |Default value m|+++30s+++ |=== From 6ebc5929686be03d72fdad4d22142ae733bad5de Mon Sep 17 00:00:00 2001 From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com> Date: Thu, 2 May 2024 16:20:24 +0200 Subject: [PATCH 3/3] Update modules/ROOT/pages/configuration/configuration-settings.adoc Co-authored-by: gjmwoods <42248895+gjmwoods@users.noreply.github.com> --- modules/ROOT/pages/configuration/configuration-settings.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/configuration/configuration-settings.adoc b/modules/ROOT/pages/configuration/configuration-settings.adoc index 33d2da0c0..8c93b25ce 100644 --- a/modules/ROOT/pages/configuration/configuration-settings.adoc +++ b/modules/ROOT/pages/configuration/configuration-settings.adoc @@ -3912,7 +3912,7 @@ a|Defines the Content-Security-Policy header to return to content returned on st |Valid values a|A string. |Default value -m|+++default-src 'self'; script-src 'self' cdn.segment.com canny.io; img-src 'self'; style-src 'self' fonts.googleapis.com 'unsafe-inline'; font-src 'self' fonts.gstatic.com; base-uri 'none'; object-src 'none'; frame-ancestors 'none'; connect-src 'self' api.canny.io api.segment.io wss+++ +m|+++default-src 'self'; script-src 'self' cdn.segment.com canny.io; img-src 'self' data:; style-src 'self' fonts.googleapis.com 'unsafe-inline'; font-src 'self' fonts.gstatic.com; base-uri 'none'; object-src 'none'; frame-ancestors 'none'; connect-src 'self' api.canny.io api.segment.io ws: wss: http: https:+++ |===