Merge pull request #112 from linkRace/master

Nonce typo and match store

Author: linkRace

lib/csp.js

@@ -30,21 +30,23 @@ module.exports = function (options) {
 
     return function csp(req, res, next) {
         if (styleNonce) {
-            if (value.match(/style-src 'nonce-.{48}'/)) {
-                value = value.replace(value.match(/'style-src nonce-.{48}'/), 'style-src \'nonce-' + res.locals.nonce + '\'');
-            } 
+            var styleMatch = value.match(/style-src 'nonce-.{48}'/);
+            if (styleMatch) {
+                value = value.replace(styleMatch[0], 'style-src \'nonce-' + res.locals.nonce + '\'');
+            }
             else {
                 value = value.replace('style-src', 'style-src \'nonce-' + res.locals.nonce + '\'');
             }
-        } 
+        }
         if (scriptNonce) {
-            if (value.match(/script-src 'nonce-.{48}'/)) {
-                value = value.replace(value.match(/script-src 'nonce-.{48}'/)[0], 'script-src \'nonce-' + res.locals.nonce + '\'');
+            var scriptMatch = value.match(/script-src 'nonce-.{48}'/);
+            if (scriptMatch) {
+                value = value.replace(scriptMatch[0], 'script-src \'nonce-' + res.locals.nonce + '\'');
             }
             else {
                 value = value.replace('script-src', 'script-src \'nonce-' + res.locals.nonce + '\'');
             }
-        } 
+        }
         res.header(name, value);
         next();
     };