From: kaniini <nenolod@gmail.com>
Date: Sun, 7 Oct 2018 01:10:12 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=b638cc50b67de8b74a490285aa8504a35e87b646;hp=a15eac05a65d04b985505e0a284fe861a1da270d;p=akkoma

Merge branch 'patch-2' into 'develop'

Relax form-action content security policy in sample nginx config

See merge request pleroma/pleroma!364
---

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 37871ea5b..f648336ca 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -77,7 +77,7 @@ server {
         add_header X-Content-Type-Options "nosniff" always;
         add_header Referrer-Policy "same-origin" always;
         add_header X-Download-Options "noopen" always;
-        add_header Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://example.tld; upgrade-insecure-requests;" always;
+        add_header Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action *; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://example.tld; upgrade-insecure-requests;" always;
         
         # Uncomment this only after you get HTTPS working.
         # add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;