summaryrefslogtreecommitdiff
path: root/lib/csp.js
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-03-25 19:15:17 +0200
committerGitHub2018-03-25 19:15:17 +0200
commit57c47a65dde59d355fba702bc91c63eebcc2533c (patch)
treed24e3e7a226d4587497873a0a73a29110c21832c /lib/csp.js
parentea1d35eddb12815f0d28b4531d6671ed8a1a4e23 (diff)
parent2411dffa2ce997370a636ed56cc73bcc4661ec7f (diff)
Merge pull request #758 from SISheogorath/cleanup/config
Change config to camel case with backwards compatibility
Diffstat (limited to '')
-rw-r--r--lib/csp.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/csp.js b/lib/csp.js
index b46ae8ef..cef2e2f6 100644
--- a/lib/csp.js
+++ b/lib/csp.js
@@ -25,7 +25,7 @@ CspStrategy.computeDirectives = function () {
var directives = {}
mergeDirectives(directives, config.csp.directives)
mergeDirectivesIf(config.csp.addDefaults, directives, defaultDirectives)
- mergeDirectivesIf(config.usecdn, directives, cdnDirectives)
+ mergeDirectivesIf(config.useCDN, directives, cdnDirectives)
if (!areAllInlineScriptsAllowed(directives)) {
addInlineScriptExceptions(directives)
}
@@ -66,7 +66,7 @@ function getCspNonce (req, res) {
}
function addUpgradeUnsafeRequestsOptionTo (directives) {
- if (config.csp.upgradeInsecureRequests === 'auto' && config.usessl) {
+ if (config.csp.upgradeInsecureRequests === 'auto' && config.useSSL) {
directives.upgradeInsecureRequests = true
} else if (config.csp.upgradeInsecureRequests === true) {
directives.upgradeInsecureRequests = true