yakuza0 2.23.22 → 2.23.24-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.23.22",
+  "version": "2.23.24-beta.0",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -114,13 +114,13 @@
     "ua-parser-js": "^0.7.20",
     "uglify-js": "^3.17.4",
     "v8-compile-cache": "^2.0.2",
-    "yakuza1": "^2.6.17"
+    "yakuza1": "^2.6.18"
   },
   "peerDependencies": {
     "@evolvere/nuxt": "2.15.9",
     "core-js": "3.10.1",
     "eslint": "7.2.0",
-    "yakuza1": "^2.6.17"
+    "yakuza1": "^2.6.18"
   },
   "__npminstall_done": false
 }

package/pxnpm-lock.yaml

@@ -285,8 +285,8 @@ dependencies:
     specifier: ^2.0.2
     version: 2.4.0
   yakuza1:
-    specifier: ^2.6.17
-    version: 2.6.17(core-js@3.10.1)
+    specifier: ^2.6.18
+    version: 2.6.18(core-js@3.10.1)
 
 devDependencies:
   babel-cli:
@@ -16782,8 +16782,8 @@ packages:
     resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
     dev: false
 
-  /yakuza1@2.6.17(core-js@3.10.1):
-    resolution: {integrity: sha512-TJYgz2Bv+27+IyeRSfbKWYhtwOKfGFjYjRelU7/wxtiI/KOO5VjAlhcWIvfWXIa8X/fm9O2YR6SAo5tbxjL91w==}
+  /yakuza1@2.6.18(core-js@3.10.1):
+    resolution: {integrity: sha512-3RmPNqou0uhXteMYSfunF5OO/1HmaR252XMSOvp6sKQOGtOD7ljDMBrciuq+D3UNnw9YwktNRhgG/qj6Omr6Sg==}
     peerDependencies:
       core-js: 3.10.1
     dependencies:

package/server/proxy/csrf.js

@@ -88,6 +88,10 @@ var _koaSslify2 = _interopRequireDefault(_koaSslify);
 
 var _koaMid = require('../../utils/koaMid');
 
+var _universal = require('yakuza1/lib/ky/universal');
+
+var _universal2 = _interopRequireDefault(_universal);
+
 var _fraud = require('./fraud');
 
 var fraud = _interopRequireWildcard(_fraud);
@@ -106,11 +110,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// import {getCache, keys} from "../cache/conf";
-// import csrfPri from "./csrfPri";
-// import csrfPub from "yakuza1/lib/cert/csrfPub";
-
-// import nocache from 'nocache';
+// import {symmetry as gs, asymmetric as as} from 'yakuza1/lib/encrypt/general';
+// import koaJwt from 'koa-jwt';
 var codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -130,8 +131,11 @@ var codeMessage = {
 };
 // import helmet from 'helmet';
 
-// import {symmetry as gs, asymmetric as as} from 'yakuza1/lib/encrypt/general';
-// import koaJwt from 'koa-jwt';
+// import {getCache, keys} from "../cache/conf";
+// import csrfPri from "./csrfPri";
+// import csrfPub from "yakuza1/lib/cert/csrfPub";
+
+// import nocache from 'nocache';
 
 
 var apiErr = function apiErr(options, ctx) {
@@ -855,10 +859,10 @@ exports.default = function () {
             if (_config2.default.security.helmet) {
               // app.use(helmet());
 
-              if (_config2.default.security.isStupid) {
+              if (!_config2.default.security.isStupid) {
                 appCpApiV1(function () {
                   var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx, next) {
-                    var isNext, rHost, rOrigin, rReferer;
+                    var isNext, rHost, rOrigin, rReferer, Cookie;
                     return _regenerator2.default.wrap(function _callee10$(_context10) {
                       while (1) {
                         switch (_context10.prev = _context10.next) {
@@ -871,31 +875,57 @@ exports.default = function () {
                             if (!cspConnectSrcVerify(rHost) || !cspConnectSrcVerify(rOrigin) || !cspConnectSrcVerify(rReferer)) {
                               isNext = false;
                             }
+                            Cookie = _server.Cookies.koaGetCookieStr({ req: ctx.req });
+
+                            if (!Cookie) {
+                              _context10.next = 15;
+                              break;
+                            }
+
+                            _context10.prev = 7;
+                            _context10.next = 10;
+                            return _universal2.default.post(_config2.default.server.orbAddr + '/apiv2/cln/verify/ck', {
+                              headers: {
+                                Cookie: Cookie
+                              },
+                              timeout: 2000
+                            });
 
+                          case 10:
+                            _context10.next = 15;
+                            break;
+
+                          case 12:
+                            _context10.prev = 12;
+                            _context10.t0 = _context10['catch'](7);
+
+                            isNext = false;
+
+                          case 15:
                             if (!isNext) {
-                              _context10.next = 10;
+                              _context10.next = 20;
                               break;
                             }
 
-                            _context10.next = 8;
+                            _context10.next = 18;
                             return next();
 
-                          case 8:
-                            _context10.next = 11;
+                          case 18:
+                            _context10.next = 21;
                             break;
 
-                          case 10:
+                          case 20:
                             ctx.body = apiErr({
                               status: 500,
                               data: '请求完整性校验错误，连接被拒绝'
                             }, ctx);
 
-                          case 11:
+                          case 21:
                           case 'end':
                             return _context10.stop();
                         }
                       }
-                    }, _callee10, undefined);
+                    }, _callee10, undefined, [[7, 12]]);
                   }));
 
                   return function (_x21, _x22) {

package/utils/ck.js

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setOfflineCookie = exports.addCookieStr = undefined;
+
+var _config = require("../config");
+
+var _config2 = _interopRequireDefault(_config);
+
+var _yakuza = require("yakuza1");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var addCookieStr = exports.addCookieStr = function addCookieStr(req, oc, key) {
+  var match = '';
+  if ((0, _yakuza.checkServer)() && req && req.headers && req.headers.cookie) {
+    match = _yakuza.Cookies.getByStr(key, req.headers.cookie);
+  } else {
+    match = _yakuza.Cookies.get(key);
+  }
+
+  if (match === '') {
+    var rs = key + "=";
+    if (typeof oc === "string" && oc.length > 0) {
+      if (oc.endsWith(";") || oc.endsWith("; ")) {
+        oc += rs;
+      } else {
+        oc += '; ' + rs;
+      }
+    } else {
+      oc = rs;
+    }
+  }
+  return oc;
+};
+
+var setOfflineCookie = exports.setOfflineCookie = function setOfflineCookie(req, oc) {
+  oc = addCookieStr(req, oc, _config2.default.server.redirect.afkKey);
+  // oc = addCookieStr(req, oc, yConf.server.stupid.v2023_12.aMark)
+  return oc;
+};

package/utils/secret.js

@@ -51,15 +51,17 @@ var _uaParserJs = require("ua-parser-js");
 
 var _uaParserJs2 = _interopRequireDefault(_uaParserJs);
 
+var _ck = require("./ck");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // require('es6-promise').polyfill();
 // require('isomorphic-fetch');
 
-// import {server} from '../server/proxy/clientKey'
-var secret = {};
 // import {mixin} from "yakuza1/lib/encrypt";
 // import {asymmetric, getKey, symmetry} from "yakuza1/lib/encrypt/sm";
+var secret = {};
+// import {server} from '../server/proxy/clientKey'
 
 _yakuza.global.__yk_gu__ = _yakuza.global.__yk_gu__ || {};
 _yakuza.global.__http_bd__ = {};
@@ -156,35 +158,6 @@ var toLowerObjKey = function toLowerObjKey(data) {
   });
 };
 
-var addCookieStr = function addCookieStr(req, oc, key) {
-  var match = '';
-  if ((0, _yakuza.checkServer)() && req && req.headers && req.headers.cookie) {
-    match = _yakuza.Cookies.getByStr(key, req.headers.cookie);
-  } else {
-    match = _yakuza.Cookies.get(key);
-  }
-
-  if (match === '') {
-    var rs = key + "=";
-    if (typeof oc === "string" && oc.length > 0) {
-      if (oc.endsWith(";") || oc.endsWith("; ")) {
-        oc += rs;
-      } else {
-        oc += '; ' + rs;
-      }
-    } else {
-      oc = rs;
-    }
-  }
-  return oc;
-};
-
-var setOfflineCookie = function setOfflineCookie(req, oc) {
-  oc = addCookieStr(req, oc, _config2.default.server.redirect.afkKey);
-  // oc = addCookieStr(req, oc, yConf.server.stupid.v2023_12.aMark)
-  return oc;
-};
-
 var set = exports.set = function set(_ref3) {
   var $yk = _ref3.$yk,
       $utils = _ref3.$utils,
@@ -346,7 +319,7 @@ var set = exports.set = function set(_ref3) {
 
                           Cookie = _yakuza.Cookies.koaGetCookieStr({ req: req });
 
-                          Cookie = setOfflineCookie(req, Cookie);
+                          Cookie = (0, _ck.setOfflineCookie)(req, Cookie);
                           ucHeaders = (0, _defineProperty3.default)({
                             Cookie: Cookie
                           }, _def.variable.clientKeyHeader, mixin.symmetry.CBC.encrypt((0, _yakuza.md5)((0, _yakuza.uuid)())));
@@ -430,7 +403,7 @@ var set = exports.set = function set(_ref3) {
                             appName: $yk.appName
                           });
 
-                          ucResC = setOfflineCookie(req, ucResC);
+                          ucResC = (0, _ck.setOfflineCookie)(req, ucResC);
                           _context5.prev = 4;
                           _context5.next = 7;
                           return _universal2.default.post($yk.origin + "/apiv2/support/svc/svcInSsrWithServer", {