yakuza0 2.22.36 → 2.22.37

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.
Files changed (4) hide show
  1. package/cli/index.js +2 -2
  2. package/package.json +1 -1
  3. package/server/proxy/conf.js +1 -1
  4. package/server/proxy/csrf.js +25 -12
package/cli/index.js CHANGED
@@ -427,7 +427,7 @@ var run = exports.run = function () {
427
427
  }
428
428
 
429
429
  if (CLNBUILD) {
430
- execCmd('cross-env YK0_server__yk4Addr=http://1.1.1.1 YK0_server__orbAddr=http://1.1.1.1 YK_ENV=' + CLNENV + ' YK_SERVER_ENV=' + CLNENV + ' YK_VERSIONSHA=' + CS + ' YK_DOCKERNAME=' + CS + ' YK_MACHINE_TYPE=workstation YK0_env=docker pxnpm run build -workers=' + CLNWORKERS);
430
+ execCmd('cross-env YK0_server__yk4Addr=http://1.1.1.1 YK0_server__orbAddr=http://1.1.1.1 YK_ENV=' + CLNENV + ' YK_SERVER_ENV=' + CLNENV + ' YK_VERSIONSHA=' + CS + ' YK_DOCKERNAME=' + CS + ' YK_MACHINE_TYPE=workstation YK0_env=docker YK0_CONFIG_WORKERS=' + CLNWORKERS + ' pxnpm run build');
431
431
  }
432
432
 
433
433
  loop = function loop(i) {
@@ -497,7 +497,7 @@ var run = exports.run = function () {
497
497
  case 5:
498
498
  _ref13 = _context8.sent;
499
499
  apps = _ref13.apps;
500
- workers = wk || process.env.npm_config_workers;
500
+ workers = wk || process.env.YK0_CONFIG_WORKERS || process.env.npm_config_workers;
501
501
  // const workers = process.env.npm_config_workers;
502
502
 
503
503
  cpuLen = _os2.default.cpus().length;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "yakuza0",
3
- "version": "2.22.36",
3
+ "version": "2.22.37",
4
4
  "description": "yakuza0 with nuxt",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/server/proxy/conf.js CHANGED
@@ -179,7 +179,7 @@ var serverHeaders = exports.serverHeaders = function serverHeaders(_ref4) {
179
179
  // console.log(req.url, nuxtAppConf.server && nuxtAppConf.server.f5Offline, !isAfk, 666);
180
180
  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 }), (0, _defineProperty3.default)(_ref5, _def.variable.stpV23Header, {
181
181
  data: (0, _stringify2.default)(_config2.default.server.stupid.v23), noWarn: true
182
- }), _ref5;
182
+ }), (0, _defineProperty3.default)(_ref5, "x-referrer-none", { data: _config2.default.server.stupid.referrerPolicy.policy === "no-referrer", noWarn: true }), _ref5;
183
183
  };
184
184
 
185
185
  var apiV3PathRewrite = exports.apiV3PathRewrite = function apiV3PathRewrite(path) {
package/server/proxy/csrf.js CHANGED
@@ -647,7 +647,7 @@ exports.default = function () {
647
647
  switch (_context7.prev = _context7.next) {
648
648
  case 0:
649
649
  if (!_config2.default.server.hotLinking.enabled) {
650
- _context7.next = 21;
650
+ _context7.next = 26;
651
651
  break;
652
652
  }
653
653
 
@@ -675,7 +675,7 @@ exports.default = function () {
675
675
  // console.log(ctx.href, referer, ctx.href.indexOf(jsUrl('hostname', referer)), 11);
676
676
 
677
677
  if (!isInclude) {
678
- _context7.next = 17;
678
+ _context7.next = 22;
679
679
  break;
680
680
  }
681
681
 
@@ -688,29 +688,42 @@ exports.default = function () {
688
688
  return next();
689
689
 
690
690
  case 12:
691
- _context7.next = 15;
691
+ _context7.next = 20;
692
692
  break;
693
693
 
694
694
  case 14:
695
+ if (!(_config2.default.server.stupid.referrerPolicy.policy === "no-referrer")) {
696
+ _context7.next = 19;
697
+ break;
698
+ }
699
+
700
+ _context7.next = 17;
701
+ return next();
702
+
703
+ case 17:
704
+ _context7.next = 20;
705
+ break;
706
+
707
+ case 19:
695
708
  ctx.status = 404;
696
709
 
697
- case 15:
698
- _context7.next = 19;
710
+ case 20:
711
+ _context7.next = 24;
699
712
  break;
700
713
 
701
- case 17:
702
- _context7.next = 19;
714
+ case 22:
715
+ _context7.next = 24;
703
716
  return next();
704
717
 
705
- case 19:
706
- _context7.next = 23;
718
+ case 24:
719
+ _context7.next = 28;
707
720
  break;
708
721
 
709
- case 21:
710
- _context7.next = 23;
722
+ case 26:
723
+ _context7.next = 28;
711
724
  return next();
712
725
 
713
- case 23:
726
+ case 28:
714
727
  case 'end':
715
728
  return _context7.stop();
716
729
  }