@azteam/express 1.2.461 → 1.2.466

package/lib/Server.js

@@ -135,9 +135,9 @@ var Server = /*#__PURE__*/function () {
         app.use((0, _cookieParser["default"])(process.env.SECRET_KEY));
         app.use((0, _compression["default"])());
         app.use((0, _cors["default"])(function (req, callback) {
-          var origin = req.header('Origin'),
-            authorization = req.header('Authorization'),
-            agent = req.header('User-Agent') || 'null';
+          var origin = req.get('Origin'),
+            authorization = req.get('Authorization'),
+            agent = req.get('User-Agent') || 'null';
           var error = null;
           if (!authorization && !agent.startsWith(systemUser)) {
             if (origin && whiteList && !whiteList.some(function (re) {
@@ -262,7 +262,7 @@ var Server = /*#__PURE__*/function () {
           req.rootDomain = req.hostname ? _psl["default"].parse(req.hostname).domain : null;
           req.trackDevice = {
             ip: req.ip,
-            forward_ip: req.headers['X-Forwarded-For'],
+            forward_ip: req.get('X-Forwarded-For'),
             device: req.get('X-DEVICE') || req.get('User-Agent'),
             device_id: req.get('X-DEVICE-ID') || 'web',
             os: req.get('X-OS') || 'web'

package/lib/middleware/etagMiddleware.js

@@ -27,7 +27,7 @@ function _default() {
               break;
             }
             etagHash = (0, _etag["default"])(req.url + floorToMinute(Math.floor(Date.now() / 1000), mTimeout));
-            if (!(req.headers['if-none-match'] === etagHash)) {
+            if (!(req.get('if-none-match') === etagHash)) {
               _context.next = 4;
               break;
             }

package/lib/middleware/roleMiddleware.js

@@ -92,7 +92,7 @@ function _default() {
             client = new _httpClient["default"]({
               timeout: 20000,
               headers: {
-                'User-Agent': req.header('User-Agent')
+                'User-Agent': req.get('User-Agent')
               }
             });
             _context.next = 27;
@@ -129,7 +129,7 @@ function _default() {
             _client = new _httpClient["default"]({
               timeout: 20000,
               headers: {
-                'User-Agent': req.header('User-Agent'),
+                'User-Agent': req.get('User-Agent'),
                 Authorization: headers.authorization
               }
             });

package/lib/middleware/signMiddleware.js

@@ -12,24 +12,29 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _default(secret) {
   var mTimeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5;
+  var isThrowError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
-      var url;
+      var cross, url;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!req.query.sign) {
-              _context.next = 4;
-              break;
+            req.validSign = false;
+            if (req.query.sign) {
+              cross = req.get('x-proxy-pass-path');
+              url = "".concat(req.protocol, "://").concat(req.hostname).concat(req.originalUrl);
+              if (cross) {
+                url = url.replace(cross, '');
+              }
+              req.validSign = (0, _crypto.isValidSign)(url, secret, mTimeout);
             }
-            url = "".concat(req.protocol, "://").concat(req.hostname).concat(req.originalUrl);
-            if (!(0, _crypto.isValidSign)(url, secret, mTimeout)) {
+            if (!(isThrowError && !req.validSign)) {
               _context.next = 4;
               break;
             }
-            return _context.abrupt("return", next());
-          case 4:
             throw new _error.ErrorException(_error.SIGNATURE_FAILED);
+          case 4:
+            return _context.abrupt("return", next());
           case 5:
           case "end":
             return _context.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.461",
+    "version": "1.2.466",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",

package/src/Server.js

@@ -109,9 +109,9 @@ class Server {
             app.use(compression());
             app.use(
                 cors(function (req, callback) {
-                    const origin = req.header('Origin'),
-                        authorization = req.header('Authorization'),
-                        agent = req.header('User-Agent') || 'null';
+                    const origin = req.get('Origin'),
+                        authorization = req.get('Authorization'),
+                        agent = req.get('User-Agent') || 'null';
 
                     let error = null;
                     if (!authorization && !agent.startsWith(systemUser)) {
@@ -252,7 +252,7 @@ class Server {
 
                 req.trackDevice = {
                     ip: req.ip,
-                    forward_ip: req.headers['X-Forwarded-For'],
+                    forward_ip: req.get('X-Forwarded-For'),
                     device: req.get('X-DEVICE') || req.get('User-Agent'),
                     device_id: req.get('X-DEVICE-ID') || 'web',
                     os: req.get('X-OS') || 'web',

package/src/middleware/etagMiddleware.js

@@ -9,7 +9,7 @@ export default function (mTimeout = 5) {
     return async function (req, res, next) {
         if (req.method === 'GET') {
             const etagHash = etag(req.url + floorToMinute(Math.floor(Date.now() / 1000), mTimeout));
-            if (req.headers['if-none-match'] === etagHash) {
+            if (req.get('if-none-match') === etagHash) {
                 return res.status(304).send();
             }
             res.setHeader('ETag', etagHash);

package/src/middleware/roleMiddleware.js

@@ -60,7 +60,7 @@ export default function (roles = null, minLevel = USER_LEVEL.USER, opts = {}) {
                     const client = new HttpClient({
                             timeout: 20000,
                             headers: {
-                                'User-Agent': req.header('User-Agent'),
+                                'User-Agent': req.get('User-Agent'),
                             },
                         }),
                         response = await client.get(authAPIURL);
@@ -87,7 +87,7 @@ export default function (roles = null, minLevel = USER_LEVEL.USER, opts = {}) {
             const client = new HttpClient({
                     timeout: 20000,
                     headers: {
-                        'User-Agent': req.header('User-Agent'),
+                        'User-Agent': req.get('User-Agent'),
                         Authorization: headers.authorization,
                     },
                 }),

package/src/middleware/signMiddleware.js

@@ -1,14 +1,21 @@
 import {isValidSign} from '@azteam/crypto';
 import {ErrorException, SIGNATURE_FAILED} from '@azteam/error';
 
-export default function (secret, mTimeout = 5) {
+export default function (secret, mTimeout = 5, isThrowError = true) {
     return async function (req, res, next) {
+        req.validSign = false;
         if (req.query.sign) {
-            const url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
-            if (isValidSign(url, secret, mTimeout)) {
-                return next();
+            const cross = req.get('x-proxy-pass-path');
+            let url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
+            if (cross) {
+                url = url.replace(cross, '');
             }
+            req.validSign = isValidSign(url, secret, mTimeout);
         }
-        throw new ErrorException(SIGNATURE_FAILED);
+        if (isThrowError && !req.validSign) {
+            throw new ErrorException(SIGNATURE_FAILED);
+        }
+
+        return next();
     };
 }