yakuza0 2.20.13 → 2.20.14-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/nuxt/head.js +37 -0
- package/nuxt/render/csp.js +1 -1
- package/package.json +2 -1
- package/utils/inclusive.js +1 -0
package/nuxt/head.js
CHANGED
|
@@ -28,6 +28,12 @@ var _config2 = _interopRequireDefault(_config);
|
|
|
28
28
|
|
|
29
29
|
var _yakuza = require("yakuza1");
|
|
30
30
|
|
|
31
|
+
var _syncRequest = require("sync-request");
|
|
32
|
+
|
|
33
|
+
var _syncRequest2 = _interopRequireDefault(_syncRequest);
|
|
34
|
+
|
|
35
|
+
var _crypto = require("crypto");
|
|
36
|
+
|
|
31
37
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
32
38
|
|
|
33
39
|
exports.default = function (config) {
|
|
@@ -51,6 +57,14 @@ exports.default = function (config) {
|
|
|
51
57
|
var basePath = _yakuza._.bothAddFix(config.appConf.server.basePath, "/");
|
|
52
58
|
|
|
53
59
|
_yakuza._.forEach(head, function (v, key) {
|
|
60
|
+
// switch (key) {
|
|
61
|
+
// case "script":
|
|
62
|
+
// case "style":
|
|
63
|
+
//
|
|
64
|
+
// break;
|
|
65
|
+
// default:
|
|
66
|
+
// }
|
|
67
|
+
|
|
54
68
|
if ((typeof v === "undefined" ? "undefined" : (0, _typeof3.default)(v)) === 'object') {
|
|
55
69
|
v = _yakuza._.map(v, function (gv) {
|
|
56
70
|
if (_yakuza._.startsWith(gv.src, '/')) {
|
|
@@ -59,6 +73,29 @@ exports.default = function (config) {
|
|
|
59
73
|
if (_yakuza._.startsWith(gv.href, '/')) {
|
|
60
74
|
gv.href = basePath + _yakuza._.trimStart(gv.href, "/");
|
|
61
75
|
}
|
|
76
|
+
|
|
77
|
+
var iUrl = gv.src || gv.href;
|
|
78
|
+
if ((_config2.default.security.isStupid || _config2.default.server.sriSwitch) && iUrl && _yakuza._.startsWith(iUrl, 'http')) {
|
|
79
|
+
try {
|
|
80
|
+
if (!gv.integrity) {
|
|
81
|
+
var res = (0, _syncRequest2.default)('GET', iUrl, {
|
|
82
|
+
timeout: 5000,
|
|
83
|
+
headers: {
|
|
84
|
+
"Host": (0, _yakuza.jsUrl)('hostname', iUrl),
|
|
85
|
+
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.80 Safari/537.36"
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
var iBody = res.getBody('utf8');
|
|
89
|
+
var hash = (0, _crypto.createHash)('sha384').update(iBody).digest('base64');
|
|
90
|
+
gv.integrity = "sha384-" + hash;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
if (gv.integrity) {
|
|
94
|
+
gv.crossorigin = "anonymous";
|
|
95
|
+
}
|
|
96
|
+
} catch (e) {}
|
|
97
|
+
}
|
|
98
|
+
|
|
62
99
|
return gv;
|
|
63
100
|
});
|
|
64
101
|
}
|
package/nuxt/render/csp.js
CHANGED
|
@@ -19,7 +19,7 @@ exports.default = function (config) {
|
|
|
19
19
|
var cspObj = {};
|
|
20
20
|
_yakuza._.forEach(csp, function (v, key) {
|
|
21
21
|
cspObj[_yakuza._.kebabCase(key)] = _yakuza._.compact(v.map(function (k) {
|
|
22
|
-
if (_config2.default.
|
|
22
|
+
if (_config2.default.server.cspStrict) {
|
|
23
23
|
if (k === "*" || k === "data:" || k === "'unsafe-eval'" || k === "'unsafe-inline'") {
|
|
24
24
|
return '';
|
|
25
25
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yakuza0",
|
|
3
|
-
"version": "2.20.
|
|
3
|
+
"version": "2.20.14-beta.0",
|
|
4
4
|
"description": "yakuza0 with nuxt",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -99,6 +99,7 @@
|
|
|
99
99
|
"stylelint-webpack-plugin": "^3.1.0",
|
|
100
100
|
"stylus": "^0.54.7",
|
|
101
101
|
"stylus-loader": "^3.0.2",
|
|
102
|
+
"sync-request": "^6.1.0",
|
|
102
103
|
"tcp-port-used": "^1.0.1",
|
|
103
104
|
"ua-parser-js": "^0.7.20",
|
|
104
105
|
"v8-compile-cache": "^2.0.2",
|