yakuza0 2.22.25 → 2.22.26-beta.0

package/nuxt/render/csp.js

@@ -21,6 +21,7 @@ exports.default = function (config) {
   }
 
   if (_config2.default.security.isStupid) {
+    directives['script-src'] = _yakuza._.difference(directives['script-src'], ["'self'"]);
     if (!(directives['object-src'] && _yakuza._.isArray(directives['object-src']) && directives['object-src'].length > 0)) {
       directives['object-src'] = ["'none'"];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.22.25",
+  "version": "2.22.26-beta.0",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {

package/server/proxy/csrf.js

@@ -819,7 +819,7 @@ exports.default = function () {
                     };
                   }());
                 } else {
-                  if (_config2.default.server.csp.custom === true) {
+                  if (_config2.default.server.csp.decoration === true) {
                     app.use(_koaHelmet2.default.contentSecurityPolicy({
                       directives: _config2.default.server.csp.directives
                     }));

package/utils/inclusive.js

@@ -331,6 +331,7 @@ var render = function () {
                   enabled: true,
                   strict: false,
                   custom: false,
+                  decoration: false,
                   policies: {},
                   directives: {}
                 },
@@ -775,7 +776,7 @@ var render = function () {
 
           case 28:
             _context2.t1 = conf.dkyMode;
-            _context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 34 : _context2.t1 === "prod" ? 37 : _context2.t1 === "stupid" ? 43 : _context2.t1 === "tire" ? 50 : 55;
+            _context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 34 : _context2.t1 === "prod" ? 37 : _context2.t1 === "stupid" ? 43 : _context2.t1 === "tire" ? 52 : 57;
             break;
 
           case 31:
@@ -785,7 +786,7 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 55);
+            return _context2.abrupt('break', 57);
 
           case 34:
             // conf.security.encrypt = "none";
@@ -794,7 +795,7 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 55);
+            return _context2.abrupt('break', 57);
 
           case 37:
             conf.security.encrypt = "sm";
@@ -803,7 +804,7 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 55);
+            return _context2.abrupt('break', 57);
 
           case 43:
             conf.security.encrypt = "sm";
@@ -812,20 +813,22 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isStupid = true;
             conf.server.csp.enabled = true;
+            conf.server.csp.strict = true;
+            conf.server.csp.decoration = true;
             conf.server.sri.enabled = true;
             // conf.dev = false;
-            return _context2.abrupt('break', 55);
+            return _context2.abrupt('break', 57);
 
-          case 50:
+          case 52:
             conf.security.encrypt = "none";
             conf.security.stupid = false;
             conf.security.helmet = false;
             // conf.server.f5Offline = false;
             conf.security.isTire = true;
             // conf.dev = false;
-            return _context2.abrupt('break', 55);
+            return _context2.abrupt('break', 57);
 
-          case 55:
+          case 57:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -925,7 +928,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 76;
+            _context2.next = 78;
             return _yakuza._.asyncMap(conf.router.config, function () {
               var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(v, key) {
                 var name, arr, length, num;
@@ -1110,7 +1113,7 @@ var render = function () {
               };
             }());
 
-          case 76:
+          case 78:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1232,7 +1235,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 87:
+          case 89:
           case 'end':
             return _context2.stop();
         }