Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: allow page to connect to CDN (#629)

Guilherme Oenning6de8bab2a80c
diff --git a/app/middlewares/security.go b/app/middlewares/security.go
index a99703dfd..1e2aca519 100644
--- a/app/middlewares/security.go
+++ b/app/middlewares/security.go
@@ -2,6 +2,7 @@ package middlewares
import (
"fmt"
+ "strings"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/web"
@@ -17,7 +18,7 @@ func Secure() web.MiddlewareFunc {
}
csp := fmt.Sprintf(web.CspPolicyTemplate, c.ContextID(), cdnHost)
- c.Response.Header().Set("Content-Security-Policy", csp)
+ c.Response.Header().Set("Content-Security-Policy", strings.TrimSpace(csp))
c.Response.Header().Set("X-XSS-Protection", "1; mode=block")
c.Response.Header().Set("X-Content-Type-Options", "nosniff")
c.Response.Header().Set("Referrer-Policy", "no-referrer-when-downgrade")
diff --git a/app/middlewares/security_test.go b/app/middlewares/security_test.go
index b1bd70fc3..f9c30ec38 100644
--- a/app/middlewares/security_test.go
+++ b/app/middlewares/security_test.go
@@ -46,7 +46,7 @@ func TestSecureWithCDN(t *testing.T) {
return c.NoContent(http.StatusOK)
})
- expectedPolicy := "base-uri 'self'; default-src 'self'; style-src 'self' 'nonce-" + ctxID + "' https://fonts.googleapis.com *.test.fider.io; script-src 'self' 'nonce-" + ctxID + "' https://cdn.polyfill.io https://www.google-analytics.com *.test.fider.io; img-src 'self' https: data: *.test.fider.io; font-src 'self' https://fonts.gstatic.com data: *.test.fider.io; object-src 'none'; media-src 'none'; connect-src 'self' https://www.google-analytics.com"
+ expectedPolicy := "base-uri 'self'; default-src 'self'; style-src 'self' 'nonce-" + ctxID + "' https://fonts.googleapis.com *.test.fider.io; script-src 'self' 'nonce-" + ctxID + "' https://cdn.polyfill.io https://www.google-analytics.com *.test.fider.io; img-src 'self' https: data: *.test.fider.io; font-src 'self' https://fonts.gstatic.com data: *.test.fider.io; object-src 'none'; media-src 'none'; connect-src 'self' https://www.google-analytics.com *.test.fider.io"
Expect(status).Equals(http.StatusOK)
Expect(response.Header().Get("Content-Security-Policy")).Equals(expectedPolicy)
@@ -69,7 +69,7 @@ func TestSecureWithCDN_SingleHost(t *testing.T) {
return c.NoContent(http.StatusOK)
})
- expectedPolicy := "base-uri 'self'; default-src 'self'; style-src 'self' 'nonce-" + ctxID + "' https://fonts.googleapis.com test.fider.io; script-src 'self' 'nonce-" + ctxID + "' https://cdn.polyfill.io https://www.google-analytics.com test.fider.io; img-src 'self' https: data: test.fider.io; font-src 'self' https://fonts.gstatic.com data: test.fider.io; object-src 'none'; media-src 'none'; connect-src 'self' https://www.google-analytics.com"
+ expectedPolicy := "base-uri 'self'; default-src 'self'; style-src 'self' 'nonce-" + ctxID + "' https://fonts.googleapis.com test.fider.io; script-src 'self' 'nonce-" + ctxID + "' https://cdn.polyfill.io https://www.google-analytics.com test.fider.io; img-src 'self' https: data: test.fider.io; font-src 'self' https://fonts.gstatic.com data: test.fider.io; object-src 'none'; media-src 'none'; connect-src 'self' https://www.google-analytics.com test.fider.io"
Expect(status).Equals(http.StatusOK)
Expect(response.Header().Get("Content-Security-Policy")).Equals(expectedPolicy)
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index ff64b551e..cab7a935f 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -30,7 +30,7 @@ var (
cspImage = "img-src 'self' https: data: %[2]s"
cspObject = "object-src 'none'"
cspMedia = "media-src 'none'"
- cspConnect = "connect-src 'self' https://www.google-analytics.com"
+ cspConnect = "connect-src 'self' https://www.google-analytics.com %[2]s"
//CspPolicyTemplate is the template used to generate the policy
CspPolicyTemplate = fmt.Sprintf("%s; %s; %s; %s; %s; %s; %s; %s; %s", cspBase, cspDefault, cspStyle, cspScript, cspImage, cspFont, cspObject, cspMedia, cspConnect)