Leahnaya/BOSS
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/BOSS.git synced 2026-03-21 17:34:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fixed spr metadata being used as a file while it's a field

Browse Source
This commit is contained in:
mrjvs 2025-09-19 20:45:01 +02:00
parent 3099a9cf3a
commit 840ccc2598
2 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/middleware/multipart.ts Normal file
View File

@ -0,0 +1,43 @@
import { unlink } from 'fs/promises';
import formidable from 'formidable';
import RequestException from '@/request-exception';
import type { File } from 'formidable';
import type { Request, Response } from 'express';
export type MultipartOutput = {
fields: Record<string, string>;
files: Record<string, File>;
};
export async function parseMultipart(request: Request, response: Response): Promise<MultipartOutput> {
const form = formidable({
multiples: false
});
const [fields, files] = await form.parse(request).catch((err: Error) => {
throw new RequestException(err.message, 400);
});
const fileEntries = Object.entries(files);
const fileEntriesUnified = fileEntries.map(v => [v[0], (v[1] ?? [])[0]] as const);
const fileOutput = Object.fromEntries(fileEntriesUnified);
const fieldEntries = Object.entries(fields);
const fieldEntriesUnified = fieldEntries.map(v => [v[0], (v[1] ?? [])[0]] as const);
const fieldOutput = Object.fromEntries(fieldEntriesUnified);
const cleanup = async (): Promise<void> => {
await Promise.allSettled(
Object.values(fileOutput).map(file =>
unlink(file.filepath).catch(() => { /* Ignore cleanup errors */ })
)
);
};
response.once('finish', cleanup);
response.once('close', cleanup);
return {
fields: fieldOutput,
files: fileOutput
};
}

39
src/services/spr.ts
View File

@ -1,6 +1,5 @@
import crypto from 'node:crypto';
import { readFile, unlink } from 'node:fs/promises';
import { formidable } from 'formidable';
import { readFile } from 'node:fs/promises';
import express from 'express';
import { getDuplicateCECData, getRandomCECData } from '@/database';
import { getFriends } from '@/util';
@ -11,41 +10,14 @@ import { config } from '@/config-manager';
import { restrictHostnames } from '@/middleware/host-limit';
import { logger } from '@/logger';
import { getCDNFileAsBuffer, uploadCDNFile } from '@/cdn';
import RequestException from '@/request-exception';
import { parseMultipart } from '@/middleware/multipart';
import type { File } from 'formidable';
import type { Request, Response } from 'express';
import type { SPRSlot } from '@/types/common/spr-slot';
const spr = express.Router();
async function parseMultipart(request: Request, response: Response): Promise<Record<string, File>> {
const form = formidable({
multiples: false
});
const parsedForm = await form.parse(request).catch((err: Error) => {
throw new RequestException(err.message, 400);
});
const entries = Object.entries(parsedForm[1]);
const entriesWithSinglefile = entries.map(v => [v[0], (v[1] ?? [])[0]] as const);
const fileOutput = Object.fromEntries(entriesWithSinglefile);
const cleanup = async (): Promise<void> => {
await Promise.allSettled(
Object.values(fileOutput).map(file =>
unlink(file.filepath).catch(() => { /* Ignore cleanup errors */ })
)
);
};
response.once('finish', cleanup);
response.once('close', cleanup);
return fileOutput;
}
spr.post('/relay/0', async (request, response) => {
const files = await parseMultipart(request, response);
const { files, fields } = await parseMultipart(request, response);
if (!request.pid || !request.nexAccount) {
response.sendStatus(401);
@ -59,9 +31,9 @@ spr.post('/relay/0', async (request, response) => {
return;
}
const sprMetadataFile: File | undefined = files['spr-meta'];
const sprMetadata: string | undefined = fields['spr-meta'];
if (!sprMetadataFile) {
if (!sprMetadata) {
logger.warn(`${request.pid}: Missing spr-meta file`);
response.sendStatus(400);
return;
@ -70,7 +42,6 @@ spr.post('/relay/0', async (request, response) => {
const sprSlots: SPRSlot[] = [];
// * Check spr-meta metadata headers
const sprMetadata = await readFile(sprMetadataFile.filepath, 'utf-8');
const metadataHeaders = sprMetadata.split('\r\n'); // * Split header lines
if (metadataHeaders.length < 1) {