fix: don't block tgz

revert #763

Author: fengmk2

app/port/controller/package/DownloadPackageVersionTar.ts

@@ -20,7 +20,6 @@ import { PackageManagerService } from '../../../core/service/PackageManagerServi
 import { ProxyCacheService } from '../../../core/service/ProxyCacheService.js';
 import { PackageSyncerService } from '../../../core/service/PackageSyncerService.js';
 import { RegistryManagerService } from '../../../core/service/RegistryManagerService.js';
-import { PackageVersionService } from '../../../core/service/PackageVersionService.js';
 
 @HTTPController()
 export class DownloadPackageVersionTarController extends AbstractController {
@@ -33,8 +32,6 @@ export class DownloadPackageVersionTarController extends AbstractController {
   @Inject()
   private packageSyncerService: PackageSyncerService;
   @Inject()
-  private packageVersionService: PackageVersionService;
-  @Inject()
   private nfsAdapter: NFSAdapter;
 
   // Support OPTIONS Request on tgz download
@@ -60,15 +57,6 @@ export class DownloadPackageVersionTarController extends AbstractController {
     const storeKey = `/packages/${fullname}/${version}/${filenameWithVersion}.tgz`;
     const downloadUrl = await this.nfsAdapter.getDownloadUrl(storeKey);
 
-    // block tgz only all versions have been blocked
-    const blockInfo = await this.packageVersionService.findBlockInfo(fullname);
-    if (blockInfo?.reason) {
-      this.setCDNHeaders(ctx);
-      ctx.logger.info('[PackageController:downloadVersionTar] %s@%s, block for %s',
-        fullname, version, blockInfo.reason);
-      throw this.createPackageBlockError(blockInfo.reason, fullname, version);
-    }
-
     if (this.config.cnpmcore.syncMode === SyncMode.all && downloadUrl) {
       // try nfs url first, avoid db query
       this.packageManagerService.plusPackageVersionCounter(fullname, version);

test/port/controller/package/DownloadPackageVersionTarController.test.ts

@@ -5,16 +5,13 @@ import { app, mock } from '@eggjs/mock/bootstrap';
 import { TestUtil } from '../../../../test/TestUtil.js';
 import { NFSClientAdapter } from '../../../../app/infra/NFSClientAdapter.js';
 import { SyncMode } from '../../../../app/common/constants.js';
-import { PackageManagerService } from '../../../../app/core/service/PackageManagerService.js';
 
 describe('test/port/controller/package/DownloadPackageVersionTarController.test.ts', () => {
   let publisher: any;
   let nfsClientAdapter: NFSClientAdapter;
-  let packageManagerService: PackageManagerService;
   beforeEach(async () => {
     publisher = await TestUtil.createUser();
     nfsClientAdapter = await app.getEggObject(NFSClientAdapter);
-    packageManagerService = await app.getEggObject(PackageManagerService);
   });
 
   const scope = '@cnpm';
@@ -42,7 +39,6 @@ describe('test/port/controller/package/DownloadPackageVersionTarController.test.
     assert(res.status === 201);
     assert(res.body.ok === true);
     assert.match(res.body.rev, /^\d+-\w{24}$/);
-    await packageManagerService.unblockPackageByFullname(scopedName);
   });
 
   describe('[GET /:fullname/-/:name-:version.tgz] download()', () => {
@@ -61,14 +57,6 @@ describe('test/port/controller/package/DownloadPackageVersionTarController.test.
       assert(res.headers.location === `https://cdn.mock.com/packages/${scopedName}/1.0.0/${name}-1.0.0.tgz`);
     });
 
-    it('should block tgz', async () => {
-      await packageManagerService.blockPackageByFullname(scopedName, 'test');
-      const res = await app.httpRequest()
-        .get(`/${scopedName}/-/testmodule-download-version-tar-1.0.0.tgz`)
-        .expect(451);
-      assert.equal(res.body.error, '[UNAVAILABLE_FOR_LEGAL_REASONS] @cnpm/[email protected] was blocked, reason: test');
-    });
-
     it('should support cors OPTIONS Request', async () => {
       mock(nfsClientAdapter, 'url', async (storeKey: string) => {
         return `https://cdn.mock.com${storeKey}`;
@@ -350,14 +338,6 @@ describe('test/port/controller/package/DownloadPackageVersionTarController.test.
       assert.equal(res.headers.location, `https://cdn.mock.com/packages/${scopedName}/1.0.0/${name}-1.0.0.tgz`);
     });
 
-    it('should block tgz', async () => {
-      await packageManagerService.blockPackageByFullname(scopedName, 'test');
-      const res = await app.httpRequest()
-        .get(`/${scopedName}/download/${scopedName}-1.0.0.tgz`)
-        .expect(451);
-      assert.equal(res.body.error, '[UNAVAILABLE_FOR_LEGAL_REASONS] @cnpm/[email protected] was blocked, reason: test');
-    });
-
     it('should download a version tar with streaming success', async () => {
       mock(nfsClientAdapter, 'url', 'not-function');
       const res = await app.httpRequest()
@@ -406,15 +386,6 @@ describe('test/port/controller/package/DownloadPackageVersionTarController.test.
       assert(res.headers.location === `https://cdn.mock.com/packages/${scopedName}/1.0.0/${name}-1.0.0.tgz`);
     });
 
-    it('should block tgz', async () => {
-      await packageManagerService.blockPackageByFullname(scopedName, 'test');
-      const res = await app.httpRequest()
-        .get(`/${scopedName}/-/${scope}/${name}-1.0.0.tgz`)
-        .expect(451);
-      assert.equal(res.body.error, '[UNAVAILABLE_FOR_LEGAL_REASONS] @cnpm/[email protected] was blocked, reason: test');
-    });
-
-
     it('should download a version tar with streaming success', async () => {
       mock(nfsClientAdapter, 'url', 'not-function');
       const res = await app.httpRequest()