fix: allow download without scope filename (cnpm#1665)

Zian502 · Sep 19, 2021 · 2e7354c · 2e7354c
1 parent 5e1c608
commit 2e7354c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/controllers/registry/package/download.js b/controllers/registry/package/download.js
@@ -18,6 +18,14 @@ let globalDownloads = new Map();
 module.exports = function* download(next) {
   var name = this.params.name || this.params[0];
   var filename = this.params.filename || this.params[1];
+  // scope pkg and download with out scope
+  if (name.startsWith('@') && !filename.startsWith('@')) {
+    var scope = name.slice(0, name.indexOf('/'));
+    // fix filename with scope
+    filename = `${scope}/${filename}`;
+  }
+
+
   var version = filename.slice(name.length + 1, -4);
   // can not get dist
   var url = null;

diff --git a/routes/registry.js b/routes/registry.js
@@ -88,8 +88,10 @@ function routes(app) {
 
   // need limit by ip
   app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/download\/(@[\w\-\.]+\/[\w\-\.]+)$/, limit, downloadPackage);
+  app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/download\/([\w\-\.]+)$/, limit, downloadPackage);
   app.get('/:name/download/:filename', limit, downloadPackage);
   app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/\-\/(@[\w\-\.]+\/[\w\-\.]+)$/, limit, downloadPackage);
+  app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/\-\/([\w\-\.]+)$/, limit, downloadPackage);
   app.get('/:name/-/:filename', limit, downloadPackage);
 
   // delete tarball and remove one version

diff --git a/test/controllers/registry/package/download.test.js b/test/controllers/registry/package/download.test.js
@@ -25,12 +25,24 @@ describe('test/controllers/registry/package/download.test.js', function () {
       .expect(200, done);
     });
 
+    it('should download a file with 200', function (done) {
+      request(app)
+        .get('/@cnpmtest/download-test-module/download/download-test-module-1.0.0.tgz')
+        .expect(200, done);
+    });
+
     it('should alias /:name/-/:filename to /:name/download/:filename', function (done) {
       request(app)
       .get('/@cnpmtest/download-test-module/-/@cnpmtest/download-test-module-1.0.0.tgz')
       .expect(200, done);
     });
 
+    it('should alias /:name/-/:filename to /:name/download/:filename', function (done) {
+      request(app)
+        .get('/@cnpmtest/download-test-module/-/download-test-module-1.0.0.tgz')
+        .expect(200, done);
+    });
+
     it('should 404 when package not exists', function (done) {
       request(app)
       .get('/@cnpmtest/download-test-module-not-exists/download/@cnpmtest/download-test-module-not-exists-1.0.0.tgz')