kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2850 from khassel/iframe

Browse Source 
added a new config option `httpHeaders` used by helmet
This commit is contained in:
Michael Teeuw 2022-05-18 09:15:32 +02:00 committed by GitHub
commit cbda20f67e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ _This release is scheduled to be released on 2022-07-01._
### Added ### Added
- Added a new config option `httpHeaders` used by helmet (see https://helmetjs.github.io/). You can now set own httpHeaders which will override the defaults in `js/defauls.js` which is useful e.g. if you want to embed MagicMirror into annother website (solves #2847).
- Show endDate for calendar events when dateHeader is enabled and showEnd is set to true (#2192) - Show endDate for calendar events when dateHeader is enabled and showEnd is set to true (#2192)
- Added the notification emitting from the weather module on infromation updated. - Added the notification emitting from the weather module on infromation updated.

3
js/defaults.js
View File

@ -25,6 +25,9 @@ const defaults = {
units: "metric", units: "metric",
zoom: 1, zoom: 1,
customCss: "css/custom.css", customCss: "css/custom.css",
// httpHeaders used by helmet, see https://helmetjs.github.io/. You can add other/more object values by overriding this in config.js,
// e.g. you need to add `frameguard: false` for embedding MagicMirror in another website, see https://github.com/MichMich/MagicMirror/issues/2847
httpHeaders: { contentSecurityPolicy: false, crossOriginOpenerPolicy: false, crossOriginEmbedderPolicy: false, crossOriginResourcePolicy: false, originAgentCluster: false },
modules: [ modules: [
{ {

2
js/server.js
View File

@ -69,7 +69,7 @@ function Server(config, callback) {
res.status(403).send("This device is not allowed to access your mirror. <br> Please check your config.js or config.js.sample to change this."); res.status(403).send("This device is not allowed to access your mirror. <br> Please check your config.js or config.js.sample to change this.");
}); });
}); });
app.use(helmet({ contentSecurityPolicy: false, crossOriginOpenerPolicy: false, crossOriginEmbedderPolicy: false, crossOriginResourcePolicy: false, originAgentCluster: false })); app.use(helmet(config.httpHeaders));
app.use("/js", express.static(__dirname)); app.use("/js", express.static(__dirname));