MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CSP for remote instances

This commit is contained in:
wvffle 2022-09-26 18:34:13 +00:00
parent 50fd01de1a
commit 306a2e9738
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/nginx/conf.dev
View File

@ -83,7 +83,7 @@ http {
proxy_pass http://funkwhale-front/front/; proxy_pass http://funkwhale-front/front/;
} }
location /front/embed.html { location /front/embed.html {
add_header Content-Security-Policy "default-src 'self'; script-src 'self' unpkg.com 'unsafe-inline' 'unsafe-eval'; style-src https: http: 'self' 'unsafe-inline'; img-src https: http: 'self' data:; font-src https: http: 'self' data:; object-src 'none'; media-src https: http: 'self' data:"; add_header Content-Security-Policy "connect-src https: http: 'self'; default-src 'self'; script-src 'self' unpkg.com 'unsafe-inline' 'unsafe-eval'; style-src https: http: 'self' 'unsafe-inline'; img-src https: http: 'self' data:; font-src https: http: 'self' data:; object-src 'none'; media-src https: http: 'self' data:";
add_header Referrer-Policy "strict-origin-when-cross-origin"; add_header Referrer-Policy "strict-origin-when-cross-origin";
add_header X-Frame-Options "" always; add_header X-Frame-Options "" always;
proxy_pass http://funkwhale-front/front/embed.html; proxy_pass http://funkwhale-front/front/embed.html;

8
front/public/embed.html
View File

@ -45,7 +45,7 @@
} }
if (type === 'artist') { if (type === 'artist') {
fetchArtistCover(id) fetchArtistCover(id).catch(() => undefined)
} }
// Tracks // Tracks
@ -111,6 +111,7 @@
if (response.status > 299) { if (response.status > 299) {
switch (response.status) { switch (response.status) {
case 400:
case 404: case 404:
error.value = `${type} not found.` error.value = `${type} not found.`
break break
@ -162,7 +163,10 @@
// NOTE: Fetch tracks only if there is no error // NOTE: Fetch tracks only if there is no error
if (error.value === false) { if (error.value === false) {
fetchTracks() fetchTracks().catch(err => {
console.error(err)
error.value = `An unknown error occurred while loading ${type} data.`
})
} }
// Duration // Duration