@verdaccio/middleware 6.0.0-6-next.51 → 6.0.0-6-next.52

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @verdaccio/middleware
 
+## 6.0.0-6-next.52
+
+### Patch Changes
+
+- f859d2b1a: fix: official package "-" cannot be synced
+- Updated dependencies [f859d2b1a]
+  - @verdaccio/core@6.0.0-6-next.73
+  - @verdaccio/config@6.0.0-6-next.73
+  - @verdaccio/url@11.0.0-6-next.39
+  - @verdaccio/utils@6.0.0-6-next.41
+
 ## 6.0.0-6-next.51
 
 ### Patch Changes

package/build/middlewares/validation.js

@@ -6,25 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.validateName = validateName;
 exports.validatePackage = validatePackage;
 var _core = require("@verdaccio/core");
-var _utils = require("@verdaccio/utils");
 function validateName(_req, _res, next, value, name) {
-  if (value === '-') {
-    // special case in couchdb usually
-    next('route');
-  } else if ((0, _utils.validateName)(value)) {
+  if (_core.validationUtils.validateName(value)) {
     next();
   } else {
-    next(_core.errorUtils.getForbidden('invalid ' + name));
+    next(_core.errorUtils.getBadRequest('invalid ' + name));
   }
 }
 function validatePackage(_req, _res, next, value, name) {
-  if (value === '-') {
-    // special case in couchdb usually
-    next('route');
-  } else if ((0, _utils.validatePackage)(value)) {
+  if (_core.validationUtils.validatePackage(value)) {
     next();
   } else {
-    next(_core.errorUtils.getForbidden('invalid ' + name));
+    next(_core.errorUtils.getBadRequest('invalid ' + name));
   }
 }
 //# sourceMappingURL=validation.js.map

package/build/middlewares/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","names":["_core","require","_utils","validateName","_req","_res","next","value","name","utilValidateName","errorUtils","getForbidden","validatePackage","utilValidatePackage"],"sources":["../../src/middlewares/validation.ts"],"sourcesContent":["import { errorUtils } from '@verdaccio/core';\nimport {\n  validateName as utilValidateName,\n  validatePackage as utilValidatePackage,\n} from '@verdaccio/utils';\n\nexport function validateName(_req, _res, next, value: string, name: string) {\n  if (value === '-') {\n    // special case in couchdb usually\n    next('route');\n  } else if (utilValidateName(value)) {\n    next();\n  } else {\n    next(errorUtils.getForbidden('invalid ' + name));\n  }\n}\n\nexport function validatePackage(_req, _res, next, value: string, name: string) {\n  if (value === '-') {\n    // special case in couchdb usually\n    next('route');\n  } else if (utilValidatePackage(value)) {\n    next();\n  } else {\n    next(errorUtils.getForbidden('invalid ' + name));\n  }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAKO,SAASE,YAAYA,CAACC,IAAI,EAAEC,IAAI,EAAEC,IAAI,EAAEC,KAAa,EAAEC,IAAY,EAAE;EAC1E,IAAID,KAAK,KAAK,GAAG,EAAE;IACjB;IACAD,IAAI,CAAC,OAAO,CAAC;EACf,CAAC,MAAM,IAAI,IAAAG,mBAAgB,EAACF,KAAK,CAAC,EAAE;IAClCD,IAAI,CAAC,CAAC;EACR,CAAC,MAAM;IACLA,IAAI,CAACI,gBAAU,CAACC,YAAY,CAAC,UAAU,GAAGH,IAAI,CAAC,CAAC;EAClD;AACF;AAEO,SAASI,eAAeA,CAACR,IAAI,EAAEC,IAAI,EAAEC,IAAI,EAAEC,KAAa,EAAEC,IAAY,EAAE;EAC7E,IAAID,KAAK,KAAK,GAAG,EAAE;IACjB;IACAD,IAAI,CAAC,OAAO,CAAC;EACf,CAAC,MAAM,IAAI,IAAAO,sBAAmB,EAACN,KAAK,CAAC,EAAE;IACrCD,IAAI,CAAC,CAAC;EACR,CAAC,MAAM;IACLA,IAAI,CAACI,gBAAU,CAACC,YAAY,CAAC,UAAU,GAAGH,IAAI,CAAC,CAAC;EAClD;AACF"}
+{"version":3,"file":"validation.js","names":["_core","require","validateName","_req","_res","next","value","name","validationUtils","errorUtils","getBadRequest","validatePackage"],"sources":["../../src/middlewares/validation.ts"],"sourcesContent":["import { errorUtils, validationUtils } from '@verdaccio/core';\n\nexport function validateName(_req, _res, next, value: string, name: string) {\n  if (validationUtils.validateName(value)) {\n    next();\n  } else {\n    next(errorUtils.getBadRequest('invalid ' + name));\n  }\n}\n\nexport function validatePackage(_req, _res, next, value: string, name: string) {\n  if (validationUtils.validatePackage(value)) {\n    next();\n  } else {\n    next(errorUtils.getBadRequest('invalid ' + name));\n  }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEO,SAASC,YAAYA,CAACC,IAAI,EAAEC,IAAI,EAAEC,IAAI,EAAEC,KAAa,EAAEC,IAAY,EAAE;EAC1E,IAAIC,qBAAe,CAACN,YAAY,CAACI,KAAK,CAAC,EAAE;IACvCD,IAAI,CAAC,CAAC;EACR,CAAC,MAAM;IACLA,IAAI,CAACI,gBAAU,CAACC,aAAa,CAAC,UAAU,GAAGH,IAAI,CAAC,CAAC;EACnD;AACF;AAEO,SAASI,eAAeA,CAACR,IAAI,EAAEC,IAAI,EAAEC,IAAI,EAAEC,KAAa,EAAEC,IAAY,EAAE;EAC7E,IAAIC,qBAAe,CAACG,eAAe,CAACL,KAAK,CAAC,EAAE;IAC1CD,IAAI,CAAC,CAAC;EACR,CAAC,MAAM;IACLA,IAAI,CAACI,gBAAU,CAACC,aAAa,CAAC,UAAU,GAAGH,IAAI,CAAC,CAAC;EACnD;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/middleware",
-  "version": "6.0.0-6-next.51",
+  "version": "6.0.0-6-next.52",
   "description": "express middleware utils",
   "main": "./build/index.js",
   "types": "build/index.d.ts",
@@ -29,10 +29,10 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@verdaccio/core": "6.0.0-6-next.72",
-    "@verdaccio/utils": "6.0.0-6-next.40",
-    "@verdaccio/config": "6.0.0-6-next.72",
-    "@verdaccio/url": "11.0.0-6-next.38",
+    "@verdaccio/core": "6.0.0-6-next.73",
+    "@verdaccio/utils": "6.0.0-6-next.41",
+    "@verdaccio/config": "6.0.0-6-next.73",
+    "@verdaccio/url": "11.0.0-6-next.39",
     "debug": "4.3.4",
     "lru-cache": "7.18.3",
     "express": "4.18.2",
@@ -45,7 +45,7 @@
     "url": "https://opencollective.com/verdaccio"
   },
   "devDependencies": {
-    "@verdaccio/logger": "6.0.0-6-next.40",
+    "@verdaccio/logger": "6.0.0-6-next.41",
     "body-parser": "1.20.2",
     "supertest": "6.3.3"
   },

package/src/middlewares/validation.ts

@@ -1,27 +1,17 @@
-import { errorUtils } from '@verdaccio/core';
-import {
-  validateName as utilValidateName,
-  validatePackage as utilValidatePackage,
-} from '@verdaccio/utils';
+import { errorUtils, validationUtils } from '@verdaccio/core';
 
 export function validateName(_req, _res, next, value: string, name: string) {
-  if (value === '-') {
-    // special case in couchdb usually
-    next('route');
-  } else if (utilValidateName(value)) {
+  if (validationUtils.validateName(value)) {
     next();
   } else {
-    next(errorUtils.getForbidden('invalid ' + name));
+    next(errorUtils.getBadRequest('invalid ' + name));
   }
 }
 
 export function validatePackage(_req, _res, next, value: string, name: string) {
-  if (value === '-') {
-    // special case in couchdb usually
-    next('route');
-  } else if (utilValidatePackage(value)) {
+  if (validationUtils.validatePackage(value)) {
     next();
   } else {
-    next(errorUtils.getForbidden('invalid ' + name));
+    next(errorUtils.getBadRequest('invalid ' + name));
   }
 }

package/test/params.spec.ts

@@ -2,55 +2,9 @@ import request from 'supertest';
 
 import { HTTP_STATUS } from '@verdaccio/core';
 
-import { match, validateName, validatePackage } from '../src';
+import { match } from '../src';
 import { getApp } from './helper';
 
-describe('validate params', () => {
-  test('should validate package name', async () => {
-    const app = getApp([]);
-    // @ts-ignore
-    app.param('package', validatePackage);
-    app.get('/pkg/:package', (req, res) => {
-      res.status(HTTP_STATUS.OK).json({});
-    });
-
-    return request(app).get('/pkg/react').expect(HTTP_STATUS.OK);
-  });
-
-  test('should fails validate package name', async () => {
-    const app = getApp([]);
-    // @ts-ignore
-    app.param('package', validatePackage);
-    app.get('/pkg/:package', (req, res) => {
-      res.status(HTTP_STATUS.OK).json({});
-    });
-
-    return request(app).get('/pkg/node_modules').expect(HTTP_STATUS.FORBIDDEN);
-  });
-
-  test('should fails file name package name', async () => {
-    const app = getApp([]);
-    // @ts-ignore
-    app.param('filename', validateName);
-    app.get('/file/:filename', (req, res) => {
-      res.status(HTTP_STATUS.OK).json({});
-    });
-
-    return request(app).get('/file/__proto__').expect(HTTP_STATUS.FORBIDDEN);
-  });
-
-  test('should validate file name package name', async () => {
-    const app = getApp([]);
-    // @ts-ignore
-    app.param('filename', validateName);
-    app.get('/file/:filename', (req, res) => {
-      res.status(HTTP_STATUS.OK).json({});
-    });
-
-    return request(app).get('/file/react.tar.gz').expect(HTTP_STATUS.OK);
-  });
-});
-
 describe('match', () => {
   test('should not match middleware', async () => {
     const app = getApp([]);

package/test/validation.spec.ts

@@ -0,0 +1,92 @@
+import request from 'supertest';
+
+import { HTTP_STATUS } from '@verdaccio/core';
+
+import { validateName, validatePackage } from '../src';
+import { getApp } from './helper';
+
+describe('validate package name middleware', () => {
+  test.each(['jquery', '-'])('%s should be valid package name', (pkg) => {
+    const app = getApp([]);
+    app.param('pkg', validatePackage);
+    app.get('/:pkg', (_req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get(`/${pkg}`).expect(HTTP_STATUS.OK);
+  });
+
+  test.each(['node_modules', '%'])('%s should be invalid package name', (pkg) => {
+    const app = getApp([]);
+    app.param('pkg', validatePackage);
+    app.get('/:pkg', (_req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get(`/${pkg}`).expect(HTTP_STATUS.BAD_REQUEST);
+  });
+
+  test('should validate package name double level', async () => {
+    const app = getApp([]);
+    // @ts-ignore
+    app.param('package', validatePackage);
+    app.get('/pkg/:package', (req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get('/pkg/react').expect(HTTP_STATUS.OK);
+  });
+
+  test('should fails validate package name double level', async () => {
+    const app = getApp([]);
+    // @ts-ignore
+    app.param('package', validatePackage);
+    app.get('/pkg/:package', (req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get('/pkg/node_modules').expect(HTTP_STATUS.BAD_REQUEST);
+  });
+});
+
+describe('validate file name name middleware', () => {
+  test.each(['old-package@0.1.2.tgz', '--0.0.1.tgz'])('%s should be valid file name', (pkg) => {
+    const app = getApp([]);
+    app.param('pkg', validateName);
+    app.get('/:pkg', (_req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get(`/${pkg}`).expect(HTTP_STATUS.OK);
+  });
+
+  test.each(['some%2Fthing', '.bin'])('%s should be invalid package name', (pkg) => {
+    const app = getApp([]);
+    app.param('pkg', validateName);
+    app.get('/:pkg', (_req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get(`/${pkg}`).expect(HTTP_STATUS.BAD_REQUEST);
+  });
+
+  test('should fails file name package name', async () => {
+    const app = getApp([]);
+    app.param('filename', validateName);
+    app.get('/file/:filename', (req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get('/file/__proto__').expect(HTTP_STATUS.BAD_REQUEST);
+  });
+
+  test('should validate file name package name', async () => {
+    const app = getApp([]);
+    app.param('filename', validateName);
+    app.get('/file/:filename', (req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get('/file/react.tar.gz').expect(HTTP_STATUS.OK);
+  });
+});