Skip to content

Commit

Permalink
Revert "feat: cross origin opener policy options (#10710)"
Browse files Browse the repository at this point in the history
This reverts commit 8813235.
  • Loading branch information
julianlam committed Jun 17, 2022
1 parent 9f291c0 commit 46050ac
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 12 deletions.
1 change: 0 additions & 1 deletion install/data/defaults.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
"digestHour": 17,
"passwordExpiryDays": 0,
"cross-origin-embedder-policy": 0,
"cross-origin-opener-policy": "same-origin",
"cross-origin-resource-policy": "same-origin",
"hsts-maxage": 31536000,
"hsts-subdomains": 0,
Expand Down
1 change: 0 additions & 1 deletion public/language/en-GB/admin/settings/advanced.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"headers.acah": "Access-Control-Allow-Headers",
"headers.coep": "Cross-Origin-Embedder-Policy",
"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
"headers.coop": "Cross-Origin-Opener-Policy",
"headers.corp": "Cross-Origin-Resource-Policy",
"hsts": "Strict Transport Security",
"hsts.enabled": "Enabled HSTS (recommended)",
Expand Down
9 changes: 0 additions & 9 deletions src/views/admin/settings/advanced.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,6 @@
</label>
</div>
<p class="help-block">[[admin/settings/advanced:headers.coep-help]]</p>
<div class="form-group">
<label for="cross-origin-resource-policy">[[admin/settings/advanced:headers.coop]]</label>
<select class="form-control" id="cross-origin-opener-policy" data-field="cross-origin-opener-policy">
<option value="same-origin">same-origin</option>
<option value="same-origin-allow-popups">same-origin-allow-popups</option>
<option value="unsafe-none">unsafe-none</option>
</select>
</div>

<div class="form-group">
<label for="cross-origin-resource-policy">[[admin/settings/advanced:headers.corp]]</label>
<select class="form-control" id="cross-origin-resource-policy" data-field="cross-origin-resource-policy">
Expand Down
2 changes: 1 addition & 1 deletion src/webserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ function setupHelmet(app) {
if (meta.config['cross-origin-embedder-policy']) {
app.use(helmet.crossOriginEmbedderPolicy());
}
app.use(helmet.crossOriginOpenerPolicy({ policy: meta.config['cross-origin-opener-policy'] }));
app.use(helmet.crossOriginOpenerPolicy());
app.use(helmet.crossOriginResourcePolicy({ policy: meta.config['cross-origin-resource-policy'] }));
app.use(helmet.dnsPrefetchControl());
app.use(helmet.expectCt());
Expand Down

0 comments on commit 46050ac

Please sign in to comment.