b3ni/quasar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: stream hashing y entradas en archivos

Browse Source 
- Añade `computeHashesFromStream` para hashing desde streams
- Añade `streamArchiveEntry` e integra en `importDirectory` (path codificado con ::)
- Extiende `scanDirectory` para exponer entradas internas, normaliza rutas POSIX y evita traversal; `ARCHIVE_MAX_ENTRIES` configurable
- Limpia listeners en hashing y mejora robustez/logging
- Añade tests unitarios e integración; actualiza mocks a `Mock` types
- CI: instala `unzip` junto a `p7zip` para soportar tests de integración
This commit is contained in:
Benito Rodríguez
2026-02-09 19:49:56 +01:00
parent 7ca465fb73
commit 79c42fad55
7 changed files with 187 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
backend/tests/services/archiveReader.integration.spec.ts Normal file
View File

@@ -0,0 +1,54 @@
import { test, expect } from 'vitest';
import { promises as fs } from 'fs';
import path from 'path';
import { execSync } from 'child_process';
import { computeHashesFromStream } from '../../src/services/checksumService';
import { streamArchiveEntry } from '../../src/services/archiveReader';
import { createHash } from 'crypto';
function hasBinary(bin: string): boolean {
try {
execSync(`which ${bin}`, { stdio: 'ignore' });
return true;
} catch (e) {
return false;
}
}
const wantIntegration = process.env.INTEGRATION === '1';
const canCreate = hasBinary('7z') || hasBinary('zip');
if (!wantIntegration) {
test.skip('archiveReader integration tests require INTEGRATION=1', () => {});
} else if (!canCreate) {
test.skip('archiveReader integration tests skipped: no archive creation tool (7z or zip) available', () => {});
} else {
test('reads entry from zip using system tools', async () => {
const tmpDir = await fs.mkdtemp(path.join(process.cwd(), 'tmp-arc-'));
const inner = path.join(tmpDir, 'game.rom');
const content = 'QUASAR-INTEGRATION-TEST';
await fs.writeFile(inner, content);
const archivePath = path.join(tmpDir, 'simple.zip');
// create zip using available tool
if (hasBinary('7z')) {
execSync(`7z a -tzip ${JSON.stringify(archivePath)} ${JSON.stringify(inner)}`, {
stdio: 'ignore',
});
} else {
execSync(`zip -j ${JSON.stringify(archivePath)} ${JSON.stringify(inner)}`, {
stdio: 'ignore',
});
}
const stream = await streamArchiveEntry(archivePath, path.basename(inner));
expect(stream).not.toBeNull();
const hashes = await computeHashesFromStream(stream as any);
const expectedMd5 = createHash('md5').update(content).digest('hex');
expect(hashes.md5).toBe(expectedMd5);
await fs.rm(tmpDir, { recursive: true, force: true });
});
}

49
backend/tests/services/fsScanner.archiveEntries.spec.ts
View File

@@ -2,6 +2,7 @@ import path from 'path';
import os from 'os';
import { promises as fs } from 'fs';
import { afterEach, it, expect, vi } from 'vitest';
import type { Mock } from 'vitest';
vi.mock('../../src/services/archiveReader', () => ({ listArchiveEntries: vi.fn() }));
@@ -15,7 +16,7 @@ it('expone entradas internas de archivos como items virtuales', async () => {
const collectionFile = path.join(tmpDir, 'collection.zip');
await fs.writeFile(collectionFile, '');
(listArchiveEntries as unknown as vi.Mock).mockResolvedValue([
(listArchiveEntries as unknown as Mock).mockResolvedValue([
{ name: 'inner/rom1.bin', size: 1234 },
]);
@@ -33,3 +34,49 @@ it('expone entradas internas de archivos como items virtuales', async () => {
await fs.rm(tmpDir, { recursive: true, force: true });
});
it('ignora entradas con traversal o paths absolutos', async () => {
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'fsScanner-test-'));
const collectionFile = path.join(tmpDir, 'collection.zip');
await fs.writeFile(collectionFile, '');
(listArchiveEntries as unknown as Mock).mockResolvedValue([
{ name: '../evil.rom', size: 10 },
{ name: '/abs/evil.rom', size: 20 },
{ name: 'good/rom.bin', size: 30 },
]);
const results = await scanDirectory(tmpDir);
const safePath = `${collectionFile}::good/rom.bin`;
expect(results.find((r: any) => r.path === safePath)).toBeDefined();
expect(results.find((r: any) => r.path === `${collectionFile}::../evil.rom`)).toBeUndefined();
expect(results.find((r: any) => r.path === `${collectionFile}::/abs/evil.rom`)).toBeUndefined();
await fs.rm(tmpDir, { recursive: true, force: true });
});
it('respeta ARCHIVE_MAX_ENTRIES', async () => {
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'fsScanner-test-'));
const collectionFile = path.join(tmpDir, 'collection.zip');
await fs.writeFile(collectionFile, '');
// Set env var temporarily
const prev = process.env.ARCHIVE_MAX_ENTRIES;
process.env.ARCHIVE_MAX_ENTRIES = '1';
(listArchiveEntries as unknown as Mock).mockResolvedValue([
{ name: 'one.bin', size: 1 },
{ name: 'two.bin', size: 2 },
{ name: 'three.bin', size: 3 },
]);
const results = await scanDirectory(tmpDir);
const matches = results.filter((r: any) => String(r.path).startsWith(collectionFile + '::'));
expect(matches.length).toBe(1);
// restore
if (prev === undefined) delete process.env.ARCHIVE_MAX_ENTRIES;
else process.env.ARCHIVE_MAX_ENTRIES = prev;
await fs.rm(tmpDir, { recursive: true, force: true });
});

23
backend/tests/services/importService.archiveEntry.spec.ts
View File

@@ -1,4 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import type { Mock } from 'vitest';
import { Readable } from 'stream';
vi.mock('../../src/services/fsScanner', () => ({ scanDirectory: vi.fn() }));
@@ -37,29 +38,27 @@ describe('services/importService (archive entries)', () => {
const data = Buffer.from('import-archive-test');
(scanDirectory as unknown as vi.Mock).mockResolvedValue(files);
(streamArchiveEntry as unknown as vi.Mock).mockResolvedValue(Readable.from([data]));
(scanDirectory as unknown as Mock).mockResolvedValue(files);
(streamArchiveEntry as unknown as Mock).mockResolvedValue(Readable.from([data]));
(prisma.game.findUnique as unknown as vi.Mock).mockResolvedValue(null);
(prisma.game.create as unknown as vi.Mock).mockResolvedValue({
(prisma.game.findUnique as unknown as Mock).mockResolvedValue(null);
(prisma.game.create as unknown as Mock).mockResolvedValue({
id: 77,
title: 'ROM1',
slug: 'rom1',
});
(prisma.romFile.upsert as unknown as vi.Mock).mockResolvedValue({ id: 1 });
(prisma.romFile.upsert as unknown as Mock).mockResolvedValue({ id: 1 });
const md5 = createHash('md5').update(data).digest('hex');
const summary = await importDirectory({ dir: '/roms', persist: true });
expect((streamArchiveEntry as unknown as vi.Mock).mock.calls.length).toBe(1);
expect((streamArchiveEntry as unknown as vi.Mock).mock.calls[0][0]).toBe(
'/roms/collection.zip'
);
expect((streamArchiveEntry as unknown as vi.Mock).mock.calls[0][1]).toBe('inner/rom1.bin');
expect((streamArchiveEntry as unknown as Mock).mock.calls.length).toBe(1);
expect((streamArchiveEntry as unknown as Mock).mock.calls[0][0]).toBe('/roms/collection.zip');
expect((streamArchiveEntry as unknown as Mock).mock.calls[0][1]).toBe('inner/rom1.bin');
expect((prisma.romFile.upsert as unknown as vi.Mock).mock.calls.length).toBe(1);
const upsertArgs = (prisma.romFile.upsert as unknown as vi.Mock).mock.calls[0][0];
expect((prisma.romFile.upsert as unknown as Mock).mock.calls.length).toBe(1);
const upsertArgs = (prisma.romFile.upsert as unknown as Mock).mock.calls[0][0];
expect(upsertArgs.where).toEqual({ checksum: md5 });
expect(upsertArgs.create.filename).toBe('rom1.bin');
expect(upsertArgs.create.path).toBe('/roms/collection.zip::inner/rom1.bin');

24
backend/tests/services/importService.spec.ts
View File

@@ -1,4 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import type { Mock } from 'vitest';
vi.mock('../../src/services/fsScanner', () => ({
scanDirectory: vi.fn(),
@@ -44,31 +45,30 @@ describe('services/importService', () => {
const hashes = { size: 123, md5: 'md5-abc', sha1: 'sha1-abc', crc32: 'abcd' };
(scanDirectory as unknown as vi.Mock).mockResolvedValue(files);
(computeHashes as unknown as vi.Mock).mockResolvedValue(hashes);
(scanDirectory as unknown as Mock).mockResolvedValue(files);
(computeHashes as unknown as Mock).mockResolvedValue(hashes);
(prisma.game.findUnique as unknown as vi.Mock).mockResolvedValue(null);
(prisma.game.create as unknown as vi.Mock).mockResolvedValue({
(prisma.game.findUnique as unknown as Mock).mockResolvedValue(null);
(prisma.game.create as unknown as Mock).mockResolvedValue({
id: 77,
title: 'Sonic',
slug: 'sonic',
});
(prisma.romFile.upsert as unknown as vi.Mock).mockResolvedValue({ id: 1 });
(prisma.romFile.upsert as unknown as Mock).mockResolvedValue({ id: 1 });
const summary = await importDirectory({ dir: '/roms', persist: true });
expect((scanDirectory as unknown as vi.Mock).mock.calls[0][0]).toBe('/roms');
expect((computeHashes as unknown as vi.Mock).mock.calls[0][0]).toBe('/roms/Sonic.bin');
expect((scanDirectory as unknown as Mock).mock.calls[0][0]).toBe('/roms');
expect((computeHashes as unknown as Mock).mock.calls[0][0]).toBe('/roms/Sonic.bin');
expect((prisma.game.findUnique as unknown as vi.Mock).mock.calls[0][0]).toEqual({
expect((prisma.game.findUnique as unknown as Mock).mock.calls[0][0]).toEqual({
where: { slug: 'sonic' },
});
expect((prisma.game.create as unknown as vi.Mock).mock.calls[0][0]).toEqual({
expect((prisma.game.create as unknown as Mock).mock.calls[0][0]).toEqual({
data: { title: 'Sonic', slug: 'sonic' },
});
expect((prisma.romFile.upsert as unknown as vi.Mock).mock.calls.length).toBe(1);
const upsertArgs = (prisma.romFile.upsert as unknown as vi.Mock).mock.calls[0][0];
expect((prisma.romFile.upsert as unknown as Mock).mock.calls.length).toBe(1);
const upsertArgs = (prisma.romFile.upsert as unknown as Mock).mock.calls[0][0];
expect(upsertArgs.where).toEqual({ checksum: 'md5-abc' });
expect(upsertArgs.create.gameId).toBe(77);
expect(upsertArgs.create.filename).toBe('Sonic.bin');