SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[bugfix] CSP policy fixes for S3/object storage (#2104) 

* [bugfix] CSP policy fixes for S3 in non-proxied mode

* It should be img-src
* In both img-src and media-src we still need to include 'self'
This commit is contained in:
Daenney 2023-08-12 12:21:48 +02:00 committed by GitHub
parent b7274545e0
commit 5e368d3089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/middleware/extraheaders.go
View File

@ -83,11 +83,15 @@ func BuildContentSecurityPolicy() string {
// Construct endpoint URL. // Construct endpoint URL.
s3EndpointURLStr := scheme + "://" + s3Endpoint s3EndpointURLStr := scheme + "://" + s3Endpoint
// When object storage is in use in non-proxied mode, GtS still serves some
// assets itself like the logo, so keep 'self' in there. That should also
// handle any redirects from the fileserver to object storage.
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/img-src // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/img-src
policy += "; image-src " + s3EndpointURLStr policy += "; img-src 'self' " + s3EndpointURLStr
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/media-src // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/media-src
policy += "; media-src " + s3EndpointURLStr policy += "; media-src 'self' " + s3EndpointURLStr
return policy return policy
} }

8
internal/middleware/middleware_test.go
View File

@ -44,25 +44,25 @@ func TestBuildContentSecurityPolicy(t *testing.T) {
s3Endpoint: "some-bucket-provider.com", s3Endpoint: "some-bucket-provider.com",
s3Proxy: false, s3Proxy: false,
s3Secure: true, s3Secure: true,
expected: "default-src 'self'; image-src https://some-bucket-provider.com; media-src https://some-bucket-provider.com", expected: "default-src 'self'; img-src 'self' https://some-bucket-provider.com; media-src 'self' https://some-bucket-provider.com",
}, },
{ {
s3Endpoint: "some-bucket-provider.com:6969", s3Endpoint: "some-bucket-provider.com:6969",
s3Proxy: false, s3Proxy: false,
s3Secure: true, s3Secure: true,
expected: "default-src 'self'; image-src https://some-bucket-provider.com:6969; media-src https://some-bucket-provider.com:6969", expected: "default-src 'self'; img-src 'self' https://some-bucket-provider.com:6969; media-src 'self' https://some-bucket-provider.com:6969",
}, },
{ {
s3Endpoint: "some-bucket-provider.com:6969", s3Endpoint: "some-bucket-provider.com:6969",
s3Proxy: false, s3Proxy: false,
s3Secure: false, s3Secure: false,
expected: "default-src 'self'; image-src http://some-bucket-provider.com:6969; media-src http://some-bucket-provider.com:6969", expected: "default-src 'self'; img-src 'self' http://some-bucket-provider.com:6969; media-src 'self' http://some-bucket-provider.com:6969",
}, },
{ {
s3Endpoint: "s3.nl-ams.scw.cloud", s3Endpoint: "s3.nl-ams.scw.cloud",
s3Proxy: false, s3Proxy: false,
s3Secure: true, s3Secure: true,
expected: "default-src 'self'; image-src https://s3.nl-ams.scw.cloud; media-src https://s3.nl-ams.scw.cloud", expected: "default-src 'self'; img-src 'self' https://s3.nl-ams.scw.cloud; media-src 'self' https://s3.nl-ams.scw.cloud",
}, },
{ {
s3Endpoint: "some-bucket-provider.com", s3Endpoint: "some-bucket-provider.com",