gitea-mirror/zipline
1
0
Fork 0
mirror of https://github.com/diced/zipline.git synced 2026-01-23 09:49:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix: better max/default expiration validation

Browse Source
This commit is contained in:
diced
2025-12-26 15:52:31 -08:00
parent eaf245a4c9
commit 05df685bd1
1 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/server/routes/api/server/settings/index.ts
View File

@@ -384,6 +384,23 @@ export default fastifyPlugin(
.refine((data) => !data.ratelimitWindow || (data.ratelimitMax && data.ratelimitMax > 0), {
message: 'ratelimitMax must be set if ratelimitWindow is set',
path: ['ratelimitMax'],
})
.superRefine((data, ctx) => {
if (!data.filesDefaultExpiration || !data.filesMaxExpiration) return;
const def = ms(data.filesDefaultExpiration as StringValue);
const max = ms(data.filesMaxExpiration as StringValue);
if (def > max) {
ctx.addIssue({
code: 'custom',
message: 'filesDefaultExpiration must be less than or equal to filesMaxExpiration',
path: ['filesDefaultExpiration'],
});
}
})
.refine((data) => Object.keys(data).length > 0, {
message: 'No settings provided to update',
});
const result = settingsBodySchema.safeParse(req.body);
@@ -398,42 +415,13 @@ export default fastifyPlugin(
});
}
const parsed = { ...result.data };
try {
if (parsed.filesDefaultExpiration && parsed.filesMaxExpiration) {
const parsedDefault = ms(String(parsed.filesDefaultExpiration) as StringValue) as number;
const parsedMaxAfter = ms(String(parsed.filesMaxExpiration) as StringValue) as number;
if (
!isNaN(Number(parsedDefault)) &&
!isNaN(Number(parsedMaxAfter)) &&
parsedDefault > parsedMaxAfter
) {
// set default to the provided max value
parsed.filesDefaultExpiration = String(parsed.filesMaxExpiration);
}
}
} catch (e) {
// If normalization fails, log the error and proceed with original values.
logger.debug('error normalizing expiration settings', { err: e });
}
// Use the keys present in the Zod-parsed object as the allowed set.
const allowedFromSchema = new Set(Object.keys(parsed));
const filteredData = Object.fromEntries(
Object.entries(parsed).filter(([k]) => allowedFromSchema.has(k)),
);
if (Object.keys(filteredData).length === 0) {
return res.status(400).send({ statusCode: 400, message: 'No valid fields to update' });
}
const newSettings = await prisma.zipline.update({
where: {
id: settings.id,
},
// @ts-ignore
data: {
...filteredData,
...result.data,
},
omit: {
createdAt: true,