fix: ignore hidden dir files (#459)

avoid oss upload fail > [SignatureDoesNotMatchError]: The request signature we calculated does not match the signature you provided. Check your key and signing method.
cnpm · May 6, 2023 · 637e8ad · 637e8ad
1 parent 5223e8c
commit 637e8ad
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 3 deletions.
diff --git a/app/core/event/SyncPackageVersionFile.ts b/app/core/event/SyncPackageVersionFile.ts
@@ -17,6 +17,8 @@ class SyncPackageVersionFileEvent {
 
   protected async syncPackageVersionFile(fullname: string, version: string) {
     if (!this.config.cnpmcore.enableUnpkg) return;
+    // ignore sync on unittest
+    if (this.config.env === 'unittest' && fullname !== '@cnpm/unittest-unpkg-demo') return;
     const [ scope, name ] = getScopeAndName(fullname);
     const { packageVersion } = await this.packageManagerService.showPackageVersionByVersionOrTag(
       scope, name, version);

diff --git a/app/core/service/PackageVersionFileService.ts b/app/core/service/PackageVersionFileService.ts
@@ -72,6 +72,8 @@ export class PackageVersionFileService extends AbstractService {
         onentry: entry => {
           if (entry.type !== 'File') return;
           if (!entry.path.startsWith('package/')) return;
+          // ignore hidden dir
+          if (entry.path.includes('/./')) return;
           paths.push(entry.path.replace(/^package\//i, '/'));
         },
       });

diff --git a/test/fixtures/unpkg.com/bovo-ui-0.0.4-36.tgz b/test/fixtures/unpkg.com/bovo-ui-0.0.4-36.tgz
diff --git a/test/port/controller/PackageVersionFileController/listFiles.test.ts b/test/port/controller/PackageVersionFileController/listFiles.test.ts
@@ -193,6 +193,26 @@ describe('test/port/controller/PackageVersionFileController/listFiles.test.ts',
       assert.equal(res.body.error, '[NOT_FOUND] [email protected]/files/foo not found');
     });
 
+    it('should auto sync after version publish', async () => {
+      const pkg = await TestUtil.getFullPackage({
+        name: '@cnpm/unittest-unpkg-demo',
+        version: '1.0.0',
+        versionObject: {
+          description: 'work with utf8mb4 💩, 𝌆 utf8_unicode_ci, foo𝌆bar 🍻',
+        },
+      });
+      await app.httpRequest()
+        .put(`/${pkg.name}`)
+        .set('authorization', publisher.authorization)
+        .set('user-agent', publisher.ua)
+        .send(pkg)
+        .expect(201);
+      await app.httpRequest()
+        .get(`/${pkg.name}/1.0.0/files/package.json`)
+        .expect(200)
+        .expect('content-type', 'application/json; charset=utf-8');
+    });
+
     it('should 451 when package block', async () => {
       const { pkg } = await TestUtil.createPackage({ isPrivate: false });
       let res = await app.httpRequest()

diff --git a/test/port/controller/PackageVersionFileController/raw.test.ts b/test/port/controller/PackageVersionFileController/raw.test.ts
@@ -1,5 +1,4 @@
 import { strict as assert } from 'node:assert';
-import { setTimeout } from 'node:timers/promises';
 import { app, mock } from 'egg-mock/bootstrap';
 import { TestUtil } from 'test/TestUtil';
 import { calculateIntegrity } from 'app/common/PackageUtil';
@@ -174,7 +173,6 @@ describe('test/port/controller/PackageVersionFileController/raw.test.ts', () =>
         .set('user-agent', publisher.ua)
         .send(pkg);
       assert.equal(res.status, 201);
-      await setTimeout(1000);
       res = await app.httpRequest()
         .get(`/${pkg.name}/1.0.0/files/resource/`);
       assert.equal(res.status, 200);
@@ -190,6 +188,39 @@ describe('test/port/controller/PackageVersionFileController/raw.test.ts', () =>
       assert.match(res.text, /ToOneFromχ/);
     });
 
+    it('should ignore "." hidden dir', async () => {
+      // https://unpkg.com/browse/[email protected]/
+      const tarball = await TestUtil.readFixturesFile('unpkg.com/bovo-ui-0.0.4-36.tgz');
+      const { integrity } = await calculateIntegrity(tarball);
+      const pkg = await TestUtil.getFullPackage({
+        name: '@cnpm/bovo-ui',
+        version: '1.0.0',
+        versionObject: {
+          description: 'foo latest description',
+        },
+        attachment: {
+          data: tarball.toString('base64'),
+          length: tarball.length,
+        },
+        dist: {
+          integrity,
+        },
+        main: './lib/index.js',
+      });
+      let res = await app.httpRequest()
+        .put(`/${pkg.name}`)
+        .set('authorization', publisher.authorization)
+        .set('user-agent', publisher.ua)
+        .send(pkg);
+      assert.equal(res.status, 201);
+      res = await app.httpRequest()
+        .get(`/${pkg.name}/1.0.0/files/`);
+      assert.equal(res.status, 200);
+      // console.log(res.body);
+      assert.equal(res.body.files.find(file => file.path === '/.'), undefined);
+      assert(res.body.files.find(file => file.path === '/dist'));
+    });
+
     it('should handle big tgz file', async () => {
       const tarball = await TestUtil.readFixturesFile('unpkg.com/pouchdb-3.2.1.tgz');
       const { integrity } = await calculateIntegrity(tarball);
@@ -214,7 +245,6 @@ describe('test/port/controller/PackageVersionFileController/raw.test.ts', () =>
         .set('user-agent', publisher.ua)
         .send(pkg);
       assert.equal(res.status, 201);
-      await setTimeout(5000);
       res = await app.httpRequest()
         .get(`/${pkg.name}/1.0.0/files/`);
       assert.equal(res.status, 200);