From bf4cca9ec98036d5d7c6ea8b295791044f04e62d Mon Sep 17 00:00:00 2001 From: Arya Kiran Date: Sun, 17 Nov 2024 17:55:56 +0530 Subject: [PATCH] caddyfmt on the templated Caddyfile as well --- privfrontends/templates/Caddyfile.j2 | 401 +++++++++++++-------------- 1 file changed, 200 insertions(+), 201 deletions(-) diff --git a/privfrontends/templates/Caddyfile.j2 b/privfrontends/templates/Caddyfile.j2 index 149efba..81c1b0e 100644 --- a/privfrontends/templates/Caddyfile.j2 +++ b/privfrontends/templates/Caddyfile.j2 @@ -4,191 +4,190 @@ } (tor) { - header { - -Strict-Transport-Security - -Referrer-Policy - -Content-Security-Policy - # disable clients from sniffing the media type - X-Content-Type-Options nosniff - Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), screen-wake-lock=(), serial=(), usb=(), sync-xhr=(), xr-spatial-tracking=()"; + header { + -Strict-Transport-Security + -Referrer-Policy + -Content-Security-Policy + # disable clients from sniffing the media type + X-Content-Type-Options nosniff + Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), screen-wake-lock=(), serial=(), usb=(), sync-xhr=(), xr-spatial-tracking=()"; - # clickjacking protection - X-Frame-Options SAMEORIGIN - Onion-Location http://{args[0]}.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion{path} - defer - } + # clickjacking protection + X-Frame-Options SAMEORIGIN + Onion-Location http://{args[0]}.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion{path} + defer + } } (torloc) { - header Onion-Location http://{args[0]}.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion{path} + header Onion-Location http://{args[0]}.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion{path} } (acmedns) { tls { - dns rfc2136 { - key_name "dynupd" - key_alg "hmac-sha256" - key "{{ rfc2136_key }}" - server "45.145.41.226:53" - } + dns rfc2136 { + key_name "dynupd" + key_alg "hmac-sha256" + key "{{ rfc2136_key }}" + server "45.145.41.226:53" + } } } (def) { - header { - # disable FLoC tracking - Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), screen-wake-lock=(), serial=(), usb=(), sync-xhr=(), xr-spatial-tracking=()"; + header { + # disable FLoC tracking + Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), screen-wake-lock=(), serial=(), usb=(), sync-xhr=(), xr-spatial-tracking=()"; - # enable HSTS - Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" - # disable clients from sniffing the media type - X-Content-Type-Options nosniff + # enable HSTS + Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" + # disable clients from sniffing the media type + X-Content-Type-Options nosniff - # clickjacking protection - X-Frame-Options SAMEORIGIN + # clickjacking protection + X-Frame-Options SAMEORIGIN - defer - } - - log { - # Anonymised IPs, User-Agents, and Cookies, also removed the URI as mentionned in the privacy policy. - # Subject to change, if we find any missing config we haven't filtered, it will be added. - output file /var/log/caddy/caddy.log - format filter { - wrap json - fields { - request>remote_ip ip_mask { - ipv4 16 - ipv6 64 - } - request>client_ip ip_mask { - ipv4 16 - ipv6 64 - } - request>headers>X-Forwarded-For ip_mask { - ipv4 16 - ipv6 64 - } - request>headers>Cookie cookie { - replace session REDACTED - delete secret - } - request>headers>User-Agent delete - request>headers>Onion-Location delete - request>headers>Referer delete - request>uri replace "/ABCDF" - } - } + defer + } + + log { + # Anonymised IPs, User-Agents, and Cookies, also removed the URI as mentionned in the privacy policy. + # Subject to change, if we find any missing config we haven't filtered, it will be added. + output file /var/log/caddy/caddy.log + format filter { + wrap json + fields { + request>remote_ip ip_mask { + ipv4 16 + ipv6 64 + } + request>client_ip ip_mask { + ipv4 16 + ipv6 64 + } + request>headers>X-Forwarded-For ip_mask { + ipv4 16 + ipv6 64 + } + request>headers>Cookie cookie { + replace session REDACTED + delete secret + } + request>headers>User-Agent delete + request>headers>Onion-Location delete + request>headers>Referer delete + request>uri replace "/ABCDF" + } } - @denied client_ip {{ blocked_ranges }} - respond @denied "Unfortunately, your IP is part of a range that has been involved in mass spam to our servers. If you think our action was a mistake, please email contact@projectsegfau.lt." 403 - + } + @denied client_ip {{ blocked_ranges }} + respond @denied "Unfortunately, your IP is part of a range that has been involved in mass spam to our servers. If you think our action was a mistake, please email contact@projectsegfau.lt." 403 - import acmedns + import acmedns } import ./*.Caddyfile {{ inventory_hostname }}.projectsegfau.lt {% if inventory_hostname == 'eu' %} pizza1.projectsegfau.lt {% endif %} { - redir https://wiki.projectsegfau.lt/index.php?title={{ wiki_page }} + redir https://wiki.projectsegfau.lt/index.php?title={{ wiki_page }} } cdn.projectsegfau.lt cdn.{{ server_prefix }}.projectsegfau.lt { - encode zstd gzip - root * /var/cdn - file_server { - browse - } - import def + encode zstd gzip + root * /var/cdn + file_server { + browse + } + import def } lbry.{{ server_prefix }}.projectsegfau.lt lbry.projectsegfau.lt { - reverse_proxy :3550 - import def - import torloc lbry + reverse_proxy :3550 + import def + import torloc lbry } # We need this inventory_hostname block since nitter is only going to be on EU from now on {% if inventory_hostname == 'eu' %} nitter.eu.projectsegfau.lt nitter.us.projectsegfau.lt nitter.in.projectsegfau.lt nitter.projectsegfau.lt n.psf.lt n.eu.psf.lt n.us.psf.lt n.in.psf.lt { - import def + import def import torloc nitter - reverse_proxy :8387 + reverse_proxy :8387 basicauth { {% for item in private_service_basicauth %} - {{ item }} + {{ item }} {% endfor %} } } {% endif %} libreddit.{{ server_prefix }}.projectsegfau.lt libreddit.projectsegfau.lt lr.psf.lt lr.{{ server_prefix }}.psf.lt { - reverse_proxy :6464 - import def - log { - # This is temporarily required to monitor nitter traffic due to scrapers being more active, so we need to monitor and rate limit them at a later date. - output file /var/log/caddy/ratelimiters.log - format json - } - import torloc libreddit + reverse_proxy :6464 + import def + log { + # This is temporarily required to monitor nitter traffic due to scrapers being more active, so we need to monitor and rate limit them at a later date. + output file /var/log/caddy/ratelimiters.log + format json + } + import torloc libreddit } teddit.{{ server_prefix }}.projectsegfau.lt teddit.projectsegfau.lt t.psf.lt t.{{ server_prefix }}.psf.lt { - redir https://libreddit.projectsegfau.lt{uri} - import def - import torloc teddit + redir https://libreddit.projectsegfau.lt{uri} + import def + import torloc teddit } inv.{{ server_prefix }}.projectsegfau.lt i.{{ server_prefix }}.psf.lt { - reverse_proxy :7573 { - header_up Host "inv.{{server_prefix}}.projectsegfau.lt" - } - @pipedproxy { - path /videoplayback - path /videoplayback/* - path /vi/* - path /ggpht/* - } - handle @pipedproxy { - reverse_proxy :6970 { - header_up Host "pipedproxy.{{server_prefix}}.projectsegfau.lt" - } - @jpgRedirect path_regexp maxres2 /vi/(.+)/maxres.jpg - @thumbnailRedirect path /ggpht/* - uri @thumbnailRedirect strip_prefix /ggpht - rewrite @thumbnailRedirect ?host=yt3.ggpht.com - uri @jpgRedirect replace /maxres.jpg /maxres2.jpg - rewrite /vi/* ?host=i.ytimg.com - } - import def - header -X-Frame-Options - header -Content-Security-Policy + reverse_proxy :7573 { + header_up Host "inv.{{ server_prefix }}.projectsegfau.lt" + } + @pipedproxy { + path /videoplayback + path /videoplayback/* + path /vi/* + path /ggpht/* + } + handle @pipedproxy { + reverse_proxy :6970 { + header_up Host "pipedproxy.{{ server_prefix }}.projectsegfau.lt" + } + @jpgRedirect path_regexp maxres2 /vi/(.+)/maxres.jpg + @thumbnailRedirect path /ggpht/* + uri @thumbnailRedirect strip_prefix /ggpht + rewrite @thumbnailRedirect ?host=yt3.ggpht.com + uri @jpgRedirect replace /maxres.jpg /maxres2.jpg + rewrite /vi/* ?host=i.ytimg.com + } + import def + header -X-Frame-Options + header -Content-Security-Policy @ratelimit not path /videoplayback/* /ggpht/* /vi/* /videoplayback /videojs/* /css/* /js/* /fonts/* /apple-touch-icon.png /favicon-16x16.png /feed/webhook /feed/webhook/* rate_limit @ratelimit {remote.ip} 10r/s rate_limit @ratelimit {remote.ip} 100r/m @ratelimit_pubsub path /feed/webhook /feed/webhook/* rate_limit @ratelimit_pubsub {remote.ip} 2r/s 404 - log { - # This is temporarily required to monitor nitter traffic due to scrapers being more active, so we need to monitor and rate limit them at a later date. - output file /var/log/caddy/ratelimiters.log - format json - } + log { + # This is temporarily required to monitor nitter traffic due to scrapers being more active, so we need to monitor and rate limit them at a later date. + output file /var/log/caddy/ratelimiters.log + format json + } } gothub.{{ server_prefix }}.projectsegfau.lt gothub.projectsegfau.lt gh.psf.lt gh.{{ server_prefix }}.psf.lt { - reverse_proxy :1024 - import def - import torloc gothub + reverse_proxy :1024 + import def + import torloc gothub } overflow.{{ server_prefix }}.projectsegfau.lt overflow.projectsegfau.lt o.psf.lt o.{{ server_prefix }}.psf.lt { - reverse_proxy :8694 - import def - import torloc overflow + reverse_proxy :8694 + import def + import torloc overflow } rimgo.{{ server_prefix }}.projectsegfau.lt rimgo.projectsegfau.lt rg.psf.lt rg.{{ server_prefix }}.psf.lt { - reverse_proxy :9016 - import def - import torloc rimgo + reverse_proxy :9016 + import def + import torloc rimgo } bw.{{ server_prefix }}.projectsegfau.lt bw.projectsegfau.lt bw.psf.lt bw.{{ server_prefix }}.psf.lt { - import def - import torloc breezewiki - reverse_proxy :10416 + import def + import torloc breezewiki + reverse_proxy :10416 } scribe.{{ server_prefix }}.projectsegfau.lt scribe.projectsegfau.lt sc.psf.lt sc.{{ server_prefix }}.psf.lt { - import def - import torloc scribe - reverse_proxy :8006 + import def + import torloc scribe + reverse_proxy :8006 } translate.{{ server_prefix }}.projectsegfau.lt translate.projectsegfau.lt tl.psf.lt tl.{{ server_prefix }}.psf.lt { import def @@ -214,80 +213,80 @@ hyperpipebackend.{{ server_prefix }}.projectsegfau.lt { import def } search.{{ server_prefix }}.projectsegfau.lt search.projectsegfau.lt s.psf.lt s.{{ server_prefix }}.psf.lt { - import def - import torloc search - reverse_proxy :8081 { - header_up X-Real-IP {remote_host} - } - @api { - path /config - path /healthz - path /stats/errors - path /stats/checker - } - @static { - path /static/* - } - @notstatic { - not path /static/* - } - @imageproxy { - path /image_proxy - } - @notimageproxy { - not path /image_proxy - } - header { - # Enable HTTP Strict Transport Security (HSTS) to force clients to always connect via HTTPS - Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" - # Prevent some browsers from MIME-sniffing a response away from the declared Content-Type - X-Content-Type-Options "nosniff" - # Disable some features - Permissions-Policy "accelerometer=(),ambient-light-sensor=(),autoplay=(),camera=(),encrypted-media=(),focus-without-user-activation=(),geolocation=(),gyroscope=(),magnetometer=(),microphone=(),midi=(),payment=(),picture-in-picture=(),speaker=(),sync-xhr=(),usb=(),vr=()" - # Disable some features (legacy) - Feature-Policy "accelerometer 'none';ambient-light-sensor 'none'; autoplay 'none';camera 'none';encrypted-media 'none';focus-without-user-activation 'none'; geolocation 'none';gyroscope 'none';magnetometer 'none';microphone 'none';midi 'none';payment 'none';picture-in-picture 'none'; speaker 'none';sync-xhr 'none';usb 'none';vr 'none'" - # Referer - Referrer-Policy "no-referrer" - # X-Robots-Tag - X-Robots-Tag "noindex, noarchive, nofollow" - # Remove Server header - -Server - } - import acmedns - header @api { - Access-Control-Allow-Methods "GET, OPTIONS" - Access-Control-Allow-Origin "*" - } - # Cache - header @static { - # Cache - Cache-Control "public, max-age=31536000" - defer - } - header @notstatic { - # No Cache - Cache-Control "no-cache, no-store" - Pragma "no-cache" - } - # CSP (see http://content-security-policy.com/ ) - header @imageproxy { - Content-Security-Policy "default-src 'none'; img-src 'self' data:" - } - header @notimageproxy { - Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self' https://github.com/searxng/searxng/issues/new; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com" - } + import def + import torloc search + reverse_proxy :8081 { + header_up X-Real-IP {remote_host} + } + @api { + path /config + path /healthz + path /stats/errors + path /stats/checker + } + @static { + path /static/* + } + @notstatic { + not path /static/* + } + @imageproxy { + path /image_proxy + } + @notimageproxy { + not path /image_proxy + } + header { + # Enable HTTP Strict Transport Security (HSTS) to force clients to always connect via HTTPS + Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" + # Prevent some browsers from MIME-sniffing a response away from the declared Content-Type + X-Content-Type-Options "nosniff" + # Disable some features + Permissions-Policy "accelerometer=(),ambient-light-sensor=(),autoplay=(),camera=(),encrypted-media=(),focus-without-user-activation=(),geolocation=(),gyroscope=(),magnetometer=(),microphone=(),midi=(),payment=(),picture-in-picture=(),speaker=(),sync-xhr=(),usb=(),vr=()" + # Disable some features (legacy) + Feature-Policy "accelerometer 'none';ambient-light-sensor 'none'; autoplay 'none';camera 'none';encrypted-media 'none';focus-without-user-activation 'none'; geolocation 'none';gyroscope 'none';magnetometer 'none';microphone 'none';midi 'none';payment 'none';picture-in-picture 'none'; speaker 'none';sync-xhr 'none';usb 'none';vr 'none'" + # Referer + Referrer-Policy "no-referrer" + # X-Robots-Tag + X-Robots-Tag "noindex, noarchive, nofollow" + # Remove Server header + -Server + } + import acmedns + header @api { + Access-Control-Allow-Methods "GET, OPTIONS" + Access-Control-Allow-Origin "*" + } + # Cache + header @static { + # Cache + Cache-Control "public, max-age=31536000" + defer + } + header @notstatic { + # No Cache + Cache-Control "no-cache, no-store" + Pragma "no-cache" + } + # CSP (see http://content-security-policy.com/ ) + header @imageproxy { + Content-Security-Policy "default-src 'none'; img-src 'self' data:" + } + header @notimageproxy { + Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self' https://github.com/searxng/searxng/issues/new; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com" + } } piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projectsegfau.lt pipedapi.{{ server_prefix }}.projectsegfau.lt { - reverse_proxy :6970 - header -X-Frame-Options - import def + reverse_proxy :6970 + header -X-Frame-Options + import def } pi.{{ server_prefix }}.psf.lt { - reverse_proxy :6970 { - header_up Host "{% if server_prefix == 'eu' %}piped.projectsegfau.lt{%else%}piped.{{ server_prefix }}.projectsegfau.lt{%endif%}" - } - header -X-Frame-Options - import def + reverse_proxy :6970 { + header_up Host "{% if server_prefix == 'eu' %}piped.projectsegfau.lt{%else%}piped.{{ server_prefix }}.projectsegfau.lt{%endif%}" + } + header -X-Frame-Options + import def } priviblur.{{ server_prefix }}.projectsegfau.lt priviblur.projectsegfau.lt pb.psf.lt pb.{{ server_prefix }}.psf.lt { import def