summaryrefslogtreecommitdiff
path: root/lib/csp.js
diff options
context:
space:
mode:
authorSheogorath2018-03-07 15:17:35 +0100
committerSheogorath2018-03-25 19:08:14 +0200
commit2411dffa2ce997370a636ed56cc73bcc4661ec7f (patch)
treea66922974296879dbf5e7f033decfcc0b21070ec /lib/csp.js
parentfa4a8418afc57a45f71471ca7fd1adcd4d8d4cd4 (diff)
Change config to camel case with backwards compatibility
This refactors the configs a bit to now use camel case everywhere. This change should help to clean up the config interface and make it better understandable. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
Diffstat (limited to 'lib/csp.js')
-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