Skip to content

Commit cb02513

Browse files
committed
fix: remove block tgz
revert #763
1 parent de3da1e commit cb02513

File tree

2 files changed

+0
-42
lines changed

2 files changed

+0
-42
lines changed

app/port/controller/package/DownloadPackageVersionTar.ts

-12
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { PackageManagerService } from '../../../core/service/PackageManagerServi
1919
import { ProxyCacheService } from '../../../core/service/ProxyCacheService';
2020
import { PackageSyncerService } from '../../../core/service/PackageSyncerService';
2121
import { RegistryManagerService } from '../../../core/service/RegistryManagerService';
22-
import { PackageVersionService } from '../../../core/service/PackageVersionService';
2322

2423
@HTTPController()
2524
export class DownloadPackageVersionTarController extends AbstractController {
@@ -32,8 +31,6 @@ export class DownloadPackageVersionTarController extends AbstractController {
3231
@Inject()
3332
private packageSyncerService: PackageSyncerService;
3433
@Inject()
35-
private packageVersionService: PackageVersionService;
36-
@Inject()
3734
private nfsAdapter: NFSAdapter;
3835

3936
// Support OPTIONS Request on tgz download
@@ -59,15 +56,6 @@ export class DownloadPackageVersionTarController extends AbstractController {
5956
const storeKey = `/packages/${fullname}/${version}/${filenameWithVersion}.tgz`;
6057
const downloadUrl = await this.nfsAdapter.getDownloadUrl(storeKey);
6158

62-
// block tgz only all versions have been blocked
63-
const blockInfo = await this.packageVersionService.findBlockInfo(fullname);
64-
if (blockInfo?.reason) {
65-
this.setCDNHeaders(ctx);
66-
ctx.logger.info('[PackageController:downloadVersionTar] %s@%s, block for %s',
67-
fullname, version, blockInfo.reason);
68-
throw this.createPackageBlockError(blockInfo.reason, fullname, version);
69-
}
70-
7159
if (this.config.cnpmcore.syncMode === SyncMode.all && downloadUrl) {
7260
// try nfs url first, avoid db query
7361
this.packageManagerService.plusPackageVersionCounter(fullname, version);

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

-30
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@ import { app, mock } from 'egg-mock/bootstrap';
44
import { TestUtil } from '../../../../test/TestUtil';
55
import { NFSClientAdapter } from '../../../../app/infra/NFSClientAdapter';
66
import { SyncMode } from '../../../../app/common/constants';
7-
import { PackageManagerService } from '../../../../app/core/service/PackageManagerService';
87

98
describe('test/port/controller/package/DownloadPackageVersionTarController.test.ts', () => {
109
let publisher: any;
1110
let nfsClientAdapter: NFSClientAdapter;
12-
let packageManagerService: PackageManagerService;
1311
beforeEach(async () => {
1412
publisher = await TestUtil.createUser();
1513
nfsClientAdapter = await app.getEggObject(NFSClientAdapter);
16-
packageManagerService = await app.getEggObject(PackageManagerService);
1714
});
1815

1916
const scope = '@cnpm';
@@ -41,8 +38,6 @@ describe('test/port/controller/package/DownloadPackageVersionTarController.test.
4138
assert(res.status === 201);
4239
assert(res.body.ok === true);
4340
assert.match(res.body.rev, /^\d+\-\w{24}$/);
44-
45-
await packageManagerService.unblockPackageByFullname(scopedName);
4641
});
4742

4843
describe('[GET /:fullname/-/:name-:version.tgz] download()', () => {
@@ -61,14 +56,6 @@ describe('test/port/controller/package/DownloadPackageVersionTarController.test.
6156
assert(res.headers.location === `https://cdn.mock.com/packages/${scopedName}/1.0.0/${name}-1.0.0.tgz`);
6257
});
6358

64-
it('should block tgz', async () => {
65-
await packageManagerService.blockPackageByFullname(scopedName, 'test');
66-
const res = await app.httpRequest()
67-
.get(`/${scopedName}/-/testmodule-download-version-tar-1.0.0.tgz`)
68-
.expect(451);
69-
assert.equal(res.body.error, '[UNAVAILABLE_FOR_LEGAL_REASONS] @cnpm/[email protected] was blocked, reason: test');
70-
});
71-
7259
it('should support cors OPTIONS Request', async () => {
7360
mock(nfsClientAdapter, 'url', async (storeKey: string) => {
7461
return `https://cdn.mock.com${storeKey}`;
@@ -350,14 +337,6 @@ describe('test/port/controller/package/DownloadPackageVersionTarController.test.
350337
assert(res.headers.location === `https://cdn.mock.com/packages/${scopedName}/1.0.0/${name}-1.0.0.tgz`);
351338
});
352339

353-
it('should block tgz', async () => {
354-
await packageManagerService.blockPackageByFullname(scopedName, 'test');
355-
const res = await app.httpRequest()
356-
.get(`/${scopedName}/download/${scopedName}-1.0.0.tgz`)
357-
.expect(451);
358-
assert.equal(res.body.error, '[UNAVAILABLE_FOR_LEGAL_REASONS] @cnpm/[email protected] was blocked, reason: test');
359-
});
360-
361340
it('should download a version tar with streaming success', async () => {
362341
mock(nfsClientAdapter, 'url', 'not-function');
363342
const res = await app.httpRequest()
@@ -406,15 +385,6 @@ describe('test/port/controller/package/DownloadPackageVersionTarController.test.
406385
assert(res.headers.location === `https://cdn.mock.com/packages/${scopedName}/1.0.0/${name}-1.0.0.tgz`);
407386
});
408387

409-
it('should block tgz', async () => {
410-
await packageManagerService.blockPackageByFullname(scopedName, 'test');
411-
const res = await app.httpRequest()
412-
.get(`/${scopedName}/-/${scope}/${name}-1.0.0.tgz`)
413-
.expect(451);
414-
assert.equal(res.body.error, '[UNAVAILABLE_FOR_LEGAL_REASONS] @cnpm/[email protected] was blocked, reason: test');
415-
});
416-
417-
418388
it('should download a version tar with streaming success', async () => {
419389
mock(nfsClientAdapter, 'url', 'not-function');
420390
const res = await app.httpRequest()

0 commit comments

Comments
 (0)