From b42cb7a802096762cbffb0fa1177c8355898cc1c Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:48:09 +0000 Subject: [feature] Add warning about `trusted-proxies` to make config easier (#3675) * [feature] Add warning about `trusted-proxies` to make config easier * thank you linter, hugs and kisses to you --- web/source/css/page.css | 21 ++++++++++++++++++++- web/template/page_header.tmpl | 26 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) (limited to 'web') diff --git a/web/source/css/page.css b/web/source/css/page.css index 642586048..752b264ee 100644 --- a/web/source/css/page.css +++ b/web/source/css/page.css @@ -42,7 +42,26 @@ padding: 1.5rem; gap: 1rem; - a { + .trusted-proxies-rec { + color: $info-fg; + background: $info-bg; + max-width: fit-content; + padding-left: 1rem; + padding-right: 1rem; + border-radius: $br; + text-align: center; + align-self: center; + + code { + background: $info-bg; + } + + a { + color: $info-fg; + } + } + + & > a { display: flex; flex-wrap: wrap; gap: 1rem; diff --git a/web/template/page_header.tmpl b/web/template/page_header.tmpl index 388587aaf..f2349581e 100644 --- a/web/template/page_header.tmpl +++ b/web/template/page_header.tmpl @@ -17,6 +17,29 @@ // along with this program. If not, see . */ -}} +{{- define "trustedProxiesRec" -}} +{{- .with }} +
+

+ Warning! It looks like trusted-proxies is not set correctly in this instance's configuration. + This may cause rate-limiting issues and, by extension, federation issues. +

+

+ If you are the instance admin, you should fix this by adding {{- .trustedProxiesRec -}} to your trusted-proxies. +

+

+ For more information, see + + the documentation + . +

+
+{{- end -}} + {{- define "thumbnailDescription" -}} {{- if .instance.ThumbnailDescription -}} {{- .instance.ThumbnailDescription -}} @@ -56,6 +79,9 @@ Instance Logo {{- end -}} {{- with . }} +{{- if .trustedProxiesRec }} +{{- template "trustedProxiesRec" . }} +{{- end }} {{- if .instance.ThumbnailStatic }} -- cgit v1.2.3