tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-11-28 12:27:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(csp): add wss and tauri to conf template (#1974)

Browse Source 
* fix(csp): add wss and tauri to conf template

* add change file, update examples/docs

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
This commit is contained in:
nothingismagick 2021-06-15 18:37:24 +02:00 committed by GitHub
parent fb1f483a33
commit 463fd00d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 68 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/template-csp-change.md Normal file
View File

@ -0,0 +1,5 @@
---
"cli.rs": patch
---
Change the `csp` value on the template to include `wss:` and `tauri:` to the `default-src` attribute.

2
core/tauri/test/fixture/src-tauri/tauri.conf.json
View File

@ -17,7 +17,7 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false

2
docs/api/config.md
View File

@ -358,7 +358,7 @@ Instead of launching the app directly, we configure the bundled app to run a scr
"fullscreen": false "fullscreen": false
}], }],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
} }
} }
``` ```

2
docs/usage/development/integration.md
View File

@ -107,7 +107,7 @@ App directory structure
App App
tauri.rs - 1.0.0-beta.1 tauri.rs - 1.0.0-beta.1
build-type - bundle build-type - bundle
CSP - default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self' CSP - default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'
distDir - ../public distDir - ../public
devPath - ../public devPath - ../public
framework - Svelte framework - Svelte

4
examples/api/src-tauri/tauri.conf.json
View File

@ -78,10 +78,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'"
}, },
"systemTray": { "systemTray": {
"iconPath": "../../.icons/icon.png" "iconPath": "../../.icons/icon.png"
} }
} }
} }

12
examples/commands/src-tauri/tauri.conf.json
View File

@ -1,7 +1,11 @@
{ {
"build": { "build": {
"distDir": ["../index.html"], "distDir": [
"devPath": ["../index.html"], "../index.html"
],
"devPath": [
"../index.html"
],
"beforeDevCommand": "", "beforeDevCommand": "",
"beforeBuildCommand": "" "beforeBuildCommand": ""
}, },
@ -47,10 +51,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

12
examples/helloworld/src-tauri/tauri.conf.json
View File

@ -1,7 +1,11 @@
{ {
"build": { "build": {
"distDir": ["../index.html"], "distDir": [
"devPath": ["../index.html"], "../index.html"
],
"devPath": [
"../index.html"
],
"beforeDevCommand": "", "beforeDevCommand": "",
"beforeBuildCommand": "" "beforeBuildCommand": ""
}, },
@ -47,10 +51,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

10
examples/multiwindow/src-tauri/tauri.conf.json
View File

@ -1,7 +1,11 @@
{ {
"build": { "build": {
"distDir": ["../index.html"], "distDir": [
"devPath": ["../index.html"], "../index.html"
],
"devPath": [
"../index.html"
],
"withGlobalTauri": true "withGlobalTauri": true
}, },
"tauri": { "tauri": {
@ -39,7 +43,7 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false

4
examples/navigation/src-tauri/tauri.conf.json
View File

@ -48,10 +48,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

12
examples/params/src-tauri/tauri.conf.json
View File

@ -1,7 +1,11 @@
{ {
"build": { "build": {
"distDir": ["../index.html"], "distDir": [
"devPath": ["../index.html"], "../index.html"
],
"devPath": [
"../index.html"
],
"beforeDevCommand": "", "beforeDevCommand": "",
"beforeBuildCommand": "" "beforeBuildCommand": ""
}, },
@ -47,10 +51,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

4
examples/splashscreen/src-tauri/tauri.conf.json
View File

@ -42,10 +42,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

12
examples/state/src-tauri/tauri.conf.json
View File

@ -1,7 +1,11 @@
{ {
"build": { "build": {
"distDir": ["../index.html"], "distDir": [
"devPath": ["../index.html"], "../index.html"
],
"devPath": [
"../index.html"
],
"beforeDevCommand": "", "beforeDevCommand": "",
"beforeBuildCommand": "" "beforeBuildCommand": ""
}, },
@ -47,10 +51,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

12
examples/updater/src-tauri/tauri.conf.json
View File

@ -1,7 +1,11 @@
{ {
"build": { "build": {
"distDir": ["../index.html"], "distDir": [
"devPath": ["../index.html"], "../index.html"
],
"devPath": [
"../index.html"
],
"beforeDevCommand": "", "beforeDevCommand": "",
"beforeBuildCommand": "" "beforeBuildCommand": ""
}, },
@ -47,7 +51,7 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": true, "active": true,
@ -58,4 +62,4 @@
] ]
} }
} }
} }

4
tooling/bench/tests/cpu_intensive/src-tauri/tauri.conf.json
View File

@ -47,10 +47,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

4
tooling/bench/tests/files_transfer/src-tauri/tauri.conf.json
View File

@ -47,10 +47,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

4
tooling/bench/tests/helloworld/src-tauri/tauri.conf.json
View File

@ -47,10 +47,10 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self'"
}, },
"updater": { "updater": {
"active": false "active": false
} }
} }
} }

2
tooling/cli.rs/templates/src-tauri/tauri.conf.json
View File

@ -61,7 +61,7 @@
} }
], ],
"security": { "security": {
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'" "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'"
} }
} }
} }