yakuza0 2.22.32-beta.2 → 2.22.32-beta.3
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/plugins/init_client.js +4 -0
- package/package.json +1 -1
- package/server/proxy/conf.js +3 -1
- package/server/proxy/tire.js +1 -3
- package/template/redirect.plugin.js +24 -3
- package/utils/inclusive.js +14 -12
- package/utils/secret.js +42 -23
package/package.json
CHANGED
package/server/proxy/conf.js
CHANGED
|
@@ -163,5 +163,7 @@ var serverHeaders = exports.serverHeaders = function serverHeaders(_ref4) {
|
|
|
163
163
|
// console.log(nuxtAppConf.server.gray, 123);
|
|
164
164
|
var appCode = req.headers[_def.variable.appCodeHeader.toLowerCase()] || nuxtAppConf.appCode;
|
|
165
165
|
var adjoinIp = req.headers[_def.variable.adjoinIpHeader.toLowerCase()] || (0, _server.getClientIP)(req, { stupid: true }) || '127.0.0.1';
|
|
166
|
-
|
|
166
|
+
var isAfk = _server.Cookies.getByStr(_config2.default.server.redirect.afkKey, req.headers.cookie);
|
|
167
|
+
// console.log(req.url, nuxtAppConf.server && nuxtAppConf.server.f5Offline, !isAfk, 666);
|
|
168
|
+
return _ref5 = {}, (0, _defineProperty3.default)(_ref5, _def.variable.isDevHeader, { data: conf.dev ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.akHeader, { data: conf.ak, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ipHeader, { data: (0, _server.getClientIP)(req, { stupid: false }) }), (0, _defineProperty3.default)(_ref5, _def.variable.adjoinIpHeader, { data: adjoinIp }), (0, _defineProperty3.default)(_ref5, _def.variable.svcKeyHeader, { data: nuxtAppConf.svcKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.domainHeader, { data: nuxtAppConf.domain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieHeader, { data: crossParams.cookie, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieDomainHeader, { data: crossParams.cookieDomain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieSameSiteHeader, { data: conf.server.cookieSameSite, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.appKeyHeader, { data: crossParams.nuxtAppKey }), (0, _defineProperty3.default)(_ref5, _def.variable.appNameHeader, { data: crossParams.nuxtAppName }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptSwitchHeader, { data: encryptSwitch, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptTypeHeader, { data: conf.security.encrypt, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.helmetHeader, { data: conf.security.helmet.toString(), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.projectNameHeader, { data: conf.name, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.shareRuleHeader, { data: (0, _stringify2.default)(conf.shareRule) }), (0, _defineProperty3.default)(_ref5, _def.variable.baseURLHeader, { data: baseURL, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.isHttpsHeader, { data: conf.https ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.appCodeHeader, { data: appCode, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.processKeyHeader, { data: conf.processKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.childKeyHeader, { data: conf.childKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.orbCsrfHeader, { data: verifyTk.csrf, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.f5OfflineHeader, { data: nuxtAppConf.server && nuxtAppConf.server.f5Offline && !isAfk, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.servicesHeader, { data: req.headers[_def.variable.servicesHeader], noWarn: true }), (0, _defineProperty3.default)(_ref5, 'Cookie', { data: _server.Cookies.setByStr((0, _defineProperty3.default)({}, _def.variable.orbCsrfCookie, verifyTk.csrf), req.headers.cookie), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ddosSwitchHeader, { data: crossParams.ddosSwitch || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.yk0VersionHeader, { data: conf.version || '', noWarn: true }), _ref5;
|
|
167
169
|
};
|
package/server/proxy/tire.js
CHANGED
|
@@ -413,8 +413,7 @@ exports.default = function () {
|
|
|
413
413
|
}
|
|
414
414
|
});
|
|
415
415
|
|
|
416
|
-
if (_config2.default.security.isTire
|
|
417
|
-
console.log(_def.variable.shareRuleHeader, (0, _stringify2.default)(_config2.default.shareRule), 22);
|
|
416
|
+
if (_config2.default.security.isTire) {
|
|
418
417
|
th = (_th = {}, (0, _defineProperty3.default)(_th, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_th, _def.variable.childKeyHeader, _config2.default.childKey), (0, _defineProperty3.default)(_th, _def.variable.appCodeHeader, config.appConf.appCode), (0, _defineProperty3.default)(_th, _def.variable.appKeyHeader, config.appKey), (0, _defineProperty3.default)(_th, _def.variable.shareRuleHeader, (0, _stringify2.default)(_config2.default.shareRule)), _th);
|
|
419
418
|
basePath = _server._.bothAddFix(config.appConf.server.basePath, "/");
|
|
420
419
|
|
|
@@ -426,7 +425,6 @@ exports.default = function () {
|
|
|
426
425
|
|
|
427
426
|
app.use(basePath + "apiv2", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
|
|
428
427
|
target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
|
|
429
|
-
headers: th,
|
|
430
428
|
pathRewrite: (0, _defineProperty3.default)({}, "^" + basePath + "apiv2", "/apiv2")
|
|
431
429
|
})));
|
|
432
430
|
}
|
|
@@ -1,8 +1,27 @@
|
|
|
1
|
-
import {jsUrl, _, checkServer, qs} from 'yakuza1';
|
|
1
|
+
import {jsUrl, _, checkServer, qs, Cookies} from 'yakuza1';
|
|
2
2
|
import yConf from 'yakuza0/config';
|
|
3
3
|
|
|
4
|
+
const setCookie = (key, value, options) => {
|
|
5
|
+
let opt = {
|
|
6
|
+
res: undefined,
|
|
7
|
+
...options,
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
if (checkServer()) {
|
|
11
|
+
let cs = `${key}=${value}`
|
|
12
|
+
if (opt.domain) {
|
|
13
|
+
cs += '; Domain=' + opt.domain
|
|
14
|
+
}
|
|
15
|
+
if (opt.res) {
|
|
16
|
+
opt.res.setHeader('Set-Cookie', [cs]);
|
|
17
|
+
}
|
|
18
|
+
} else {
|
|
19
|
+
Cookies.set(key, value, {domain: opt.domain})
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
4
23
|
export default async (ctx, inject) => {
|
|
5
|
-
const {redirect, $yk} = ctx
|
|
24
|
+
const {redirect, $yk, req, res} = ctx
|
|
6
25
|
|
|
7
26
|
const $redirect = (...args) => {
|
|
8
27
|
let url = args[0]
|
|
@@ -17,6 +36,8 @@ export default async (ctx, inject) => {
|
|
|
17
36
|
}
|
|
18
37
|
let prefix = '';
|
|
19
38
|
|
|
39
|
+
setCookie(yConf.server.redirect.afkKey, "true", {res, domain: $yk.appConf.cookieDomain})
|
|
40
|
+
|
|
20
41
|
if (typeof url === 'string') {
|
|
21
42
|
const parse = _.urlParse(url)
|
|
22
43
|
|
|
@@ -49,7 +70,7 @@ export default async (ctx, inject) => {
|
|
|
49
70
|
// window.location.replace(url)
|
|
50
71
|
// }
|
|
51
72
|
} else {
|
|
52
|
-
if (isOuter || options.target
|
|
73
|
+
if (isOuter || options.target !== '_self' || options.specs) {
|
|
53
74
|
if (_.startsWith(url, '/') && !_.startsWith(url, '//')) {
|
|
54
75
|
url = _.bothAddFix($yk.appConf.server.basePath, '/') + _.trimStart(url, '/')
|
|
55
76
|
}
|
package/utils/inclusive.js
CHANGED
|
@@ -404,7 +404,8 @@ var render = function () {
|
|
|
404
404
|
// ...ykConf.server && ykConf.server.log,
|
|
405
405
|
},
|
|
406
406
|
redirect: {
|
|
407
|
-
useOrigin: false
|
|
407
|
+
useOrigin: false,
|
|
408
|
+
afkKey: "__redirect_afk"
|
|
408
409
|
},
|
|
409
410
|
generate: {
|
|
410
411
|
enabled: false,
|
|
@@ -780,7 +781,7 @@ var render = function () {
|
|
|
780
781
|
|
|
781
782
|
case 28:
|
|
782
783
|
_context2.t1 = conf.dkyMode;
|
|
783
|
-
_context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 34 : _context2.t1 === "prod" ? 37 : _context2.t1 === "stupid" ? 43 : _context2.t1 === "tire" ?
|
|
784
|
+
_context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 34 : _context2.t1 === "prod" ? 37 : _context2.t1 === "stupid" ? 43 : _context2.t1 === "tire" ? 53 : 58;
|
|
784
785
|
break;
|
|
785
786
|
|
|
786
787
|
case 31:
|
|
@@ -790,7 +791,7 @@ var render = function () {
|
|
|
790
791
|
// conf.server.f5Offline = false;
|
|
791
792
|
conf.security.isDev = true;
|
|
792
793
|
conf.dev = true;
|
|
793
|
-
return _context2.abrupt('break',
|
|
794
|
+
return _context2.abrupt('break', 58);
|
|
794
795
|
|
|
795
796
|
case 34:
|
|
796
797
|
// conf.security.encrypt = "none";
|
|
@@ -799,7 +800,7 @@ var render = function () {
|
|
|
799
800
|
// conf.server.f5Offline = false;
|
|
800
801
|
conf.security.isNormal = true;
|
|
801
802
|
conf.dev = false;
|
|
802
|
-
return _context2.abrupt('break',
|
|
803
|
+
return _context2.abrupt('break', 58);
|
|
803
804
|
|
|
804
805
|
case 37:
|
|
805
806
|
conf.security.encrypt = "sm";
|
|
@@ -808,31 +809,32 @@ var render = function () {
|
|
|
808
809
|
// conf.server.f5Offline = false;
|
|
809
810
|
conf.security.isProd = true;
|
|
810
811
|
conf.dev = false;
|
|
811
|
-
return _context2.abrupt('break',
|
|
812
|
+
return _context2.abrupt('break', 58);
|
|
812
813
|
|
|
813
814
|
case 43:
|
|
814
815
|
conf.security.encrypt = "sm";
|
|
815
816
|
conf.security.stupid = true;
|
|
816
817
|
conf.security.helmet = true;
|
|
817
818
|
// conf.server.f5Offline = false;
|
|
819
|
+
conf.server.f5Offline = true;
|
|
818
820
|
conf.security.isStupid = true;
|
|
819
821
|
conf.server.csp.enabled = true;
|
|
820
822
|
conf.server.csp.strict = typeof conf.server.csp.strict === 'boolean' ? conf.server.csp.strict : true;
|
|
821
823
|
conf.server.csp.decoration = typeof conf.server.csp.decoration === 'boolean' ? conf.server.csp.decoration : true;
|
|
822
824
|
conf.server.sri.enabled = true;
|
|
823
825
|
// conf.dev = false;
|
|
824
|
-
return _context2.abrupt('break',
|
|
826
|
+
return _context2.abrupt('break', 58);
|
|
825
827
|
|
|
826
|
-
case
|
|
828
|
+
case 53:
|
|
827
829
|
conf.security.encrypt = "none";
|
|
828
830
|
conf.security.stupid = false;
|
|
829
831
|
conf.security.helmet = false;
|
|
830
832
|
// conf.server.f5Offline = false;
|
|
831
833
|
conf.security.isTire = true;
|
|
832
834
|
// conf.dev = false;
|
|
833
|
-
return _context2.abrupt('break',
|
|
835
|
+
return _context2.abrupt('break', 58);
|
|
834
836
|
|
|
835
|
-
case
|
|
837
|
+
case 58:
|
|
836
838
|
|
|
837
839
|
// conf.router.config['app.examples'].enabled = true;
|
|
838
840
|
if (conf.server.yk4Addr) {
|
|
@@ -932,7 +934,7 @@ var render = function () {
|
|
|
932
934
|
conf.server.csp.directives = directives;
|
|
933
935
|
|
|
934
936
|
// const appPortUsed = [];
|
|
935
|
-
_context2.next =
|
|
937
|
+
_context2.next = 79;
|
|
936
938
|
return _yakuza._.asyncMap(conf.router.config, function () {
|
|
937
939
|
var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(v, key) {
|
|
938
940
|
var name, arr, length, num;
|
|
@@ -1117,7 +1119,7 @@ var render = function () {
|
|
|
1117
1119
|
};
|
|
1118
1120
|
}());
|
|
1119
1121
|
|
|
1120
|
-
case
|
|
1122
|
+
case 79:
|
|
1121
1123
|
// console.log(conf.router.config);
|
|
1122
1124
|
|
|
1123
1125
|
conf.shareRule.app = conf.shareRule.app.map(function (ap) {
|
|
@@ -1239,7 +1241,7 @@ var render = function () {
|
|
|
1239
1241
|
|
|
1240
1242
|
return _context2.abrupt('return', { conf: conf });
|
|
1241
1243
|
|
|
1242
|
-
case
|
|
1244
|
+
case 90:
|
|
1243
1245
|
case 'end':
|
|
1244
1246
|
return _context2.stop();
|
|
1245
1247
|
}
|
package/utils/secret.js
CHANGED
|
@@ -155,6 +155,21 @@ var toLowerObjKey = function toLowerObjKey(data) {
|
|
|
155
155
|
});
|
|
156
156
|
};
|
|
157
157
|
|
|
158
|
+
var setAfkCookie = function setAfkCookie(req, oc) {
|
|
159
|
+
var afk = _yakuza.Cookies.getByStr(_config2.default.server.redirect.afkKey, req.headers.cookie);
|
|
160
|
+
|
|
161
|
+
if (afk) {
|
|
162
|
+
var rs = _config2.default.server.redirect.afkKey + "=true";
|
|
163
|
+
if (oc) {
|
|
164
|
+
oc += rs;
|
|
165
|
+
} else {
|
|
166
|
+
oc = rs;
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
return oc || '';
|
|
171
|
+
};
|
|
172
|
+
|
|
158
173
|
var set = exports.set = function set(_ref3) {
|
|
159
174
|
var $yk = _ref3.$yk,
|
|
160
175
|
$utils = _ref3.$utils,
|
|
@@ -262,7 +277,7 @@ var set = exports.set = function set(_ref3) {
|
|
|
262
277
|
switch (_context4.prev = _context4.next) {
|
|
263
278
|
case 0:
|
|
264
279
|
if (!((0, _yakuza.checkServer)() || !$yk.appConf.ssr)) {
|
|
265
|
-
_context4.next =
|
|
280
|
+
_context4.next = 22;
|
|
266
281
|
break;
|
|
267
282
|
}
|
|
268
283
|
|
|
@@ -292,19 +307,21 @@ var set = exports.set = function set(_ref3) {
|
|
|
292
307
|
}
|
|
293
308
|
|
|
294
309
|
Cookie = _yakuza.Cookies.koaGetCookieStr({ req: req });
|
|
310
|
+
|
|
311
|
+
Cookie = setAfkCookie(req, Cookie);
|
|
295
312
|
ucHeaders = (0, _defineProperty3.default)({
|
|
296
313
|
Cookie: Cookie
|
|
297
314
|
}, _def.variable.clientKeyHeader, mixin.symmetry.CBC.encrypt((0, _yakuza.md5)((0, _yakuza.uuid)())));
|
|
298
|
-
_context4.prev =
|
|
315
|
+
_context4.prev = 11;
|
|
299
316
|
hs = "Set-Cookie";
|
|
300
|
-
_context4.next =
|
|
317
|
+
_context4.next = 15;
|
|
301
318
|
return _universal2.default.post(($yk.appConf.ssr ? $yk.origin + '/' : $yk.server.basePathMU) + "apiv2/support/svc/uc", {
|
|
302
319
|
body: bodyStr,
|
|
303
320
|
headers: ucHeaders,
|
|
304
321
|
timeout: timeout
|
|
305
322
|
});
|
|
306
323
|
|
|
307
|
-
case
|
|
324
|
+
case 15:
|
|
308
325
|
rs = _context4.sent;
|
|
309
326
|
resCookie = rs.headers.get(hs);
|
|
310
327
|
|
|
@@ -316,19 +333,19 @@ var set = exports.set = function set(_ref3) {
|
|
|
316
333
|
})).join(";");
|
|
317
334
|
res.setHeader(hs, resCookie.split(','));
|
|
318
335
|
}
|
|
319
|
-
_context4.next =
|
|
336
|
+
_context4.next = 22;
|
|
320
337
|
break;
|
|
321
338
|
|
|
322
|
-
case
|
|
323
|
-
_context4.prev =
|
|
324
|
-
_context4.t0 = _context4["catch"](
|
|
339
|
+
case 20:
|
|
340
|
+
_context4.prev = 20;
|
|
341
|
+
_context4.t0 = _context4["catch"](11);
|
|
325
342
|
|
|
326
|
-
case
|
|
343
|
+
case 22:
|
|
327
344
|
case "end":
|
|
328
345
|
return _context4.stop();
|
|
329
346
|
}
|
|
330
347
|
}
|
|
331
|
-
}, _callee4, undefined, [[
|
|
348
|
+
}, _callee4, undefined, [[11, 20]]);
|
|
332
349
|
}));
|
|
333
350
|
|
|
334
351
|
return function getUc() {
|
|
@@ -344,7 +361,7 @@ var set = exports.set = function set(_ref3) {
|
|
|
344
361
|
switch (_context5.prev = _context5.next) {
|
|
345
362
|
case 0:
|
|
346
363
|
if (!(0, _yakuza.checkServer)()) {
|
|
347
|
-
_context5.next =
|
|
364
|
+
_context5.next = 21;
|
|
348
365
|
break;
|
|
349
366
|
}
|
|
350
367
|
|
|
@@ -352,8 +369,10 @@ var set = exports.set = function set(_ref3) {
|
|
|
352
369
|
ssrBody = (0, _extends3.default)({}, universalBody, {
|
|
353
370
|
appName: $yk.appName
|
|
354
371
|
});
|
|
355
|
-
|
|
356
|
-
|
|
372
|
+
|
|
373
|
+
ucResC = setAfkCookie(req, ucResC);
|
|
374
|
+
_context5.prev = 4;
|
|
375
|
+
_context5.next = 7;
|
|
357
376
|
return _universal2.default.post($yk.origin + "/apiv2/support/svc/svcInSsrWithServer", {
|
|
358
377
|
json: ssrBody,
|
|
359
378
|
headers: {
|
|
@@ -362,23 +381,23 @@ var set = exports.set = function set(_ref3) {
|
|
|
362
381
|
timeout: timeout
|
|
363
382
|
});
|
|
364
383
|
|
|
365
|
-
case
|
|
384
|
+
case 7:
|
|
366
385
|
rs = _context5.sent;
|
|
367
|
-
_context5.next =
|
|
386
|
+
_context5.next = 10;
|
|
368
387
|
return rs.text();
|
|
369
388
|
|
|
370
|
-
case
|
|
389
|
+
case 10:
|
|
371
390
|
resTxt = _context5.sent;
|
|
372
391
|
|
|
373
392
|
svcRes = JSON.parse(resTxt);
|
|
374
|
-
_context5.next =
|
|
393
|
+
_context5.next = 16;
|
|
375
394
|
break;
|
|
376
395
|
|
|
377
|
-
case
|
|
378
|
-
_context5.prev =
|
|
379
|
-
_context5.t0 = _context5["catch"](
|
|
396
|
+
case 14:
|
|
397
|
+
_context5.prev = 14;
|
|
398
|
+
_context5.t0 = _context5["catch"](4);
|
|
380
399
|
|
|
381
|
-
case
|
|
400
|
+
case 16:
|
|
382
401
|
data = (0, _extends3.default)({}, svcRes && svcRes.data);
|
|
383
402
|
|
|
384
403
|
if (_yakuza._.isPlainObject(data.hostname)) {
|
|
@@ -389,12 +408,12 @@ var set = exports.set = function set(_ref3) {
|
|
|
389
408
|
spiData = data.spiData;
|
|
390
409
|
resolve();
|
|
391
410
|
|
|
392
|
-
case
|
|
411
|
+
case 21:
|
|
393
412
|
case "end":
|
|
394
413
|
return _context5.stop();
|
|
395
414
|
}
|
|
396
415
|
}
|
|
397
|
-
}, _callee5, undefined, [[
|
|
416
|
+
}, _callee5, undefined, [[4, 14]]);
|
|
398
417
|
}));
|
|
399
418
|
|
|
400
419
|
return function getSvcInSsrWithServer() {
|