From dc8305d59e48cd6edc043174b27ebb15edc5ac2d Mon Sep 17 00:00:00 2001 From: TacticalCoderJay Date: Mon, 24 Apr 2023 18:21:45 -0700 Subject: [PATCH 1/4] @diced forgor --- src/pages/view/[id].tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx index 1f7ed6bcb..404154ad2 100644 --- a/src/pages/view/[id].tsx +++ b/src/pages/view/[id].tsx @@ -231,7 +231,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => { if (file.password) file.password = true; return { props: { - image: file, + file, user, pass, prismRender: true, From 92dd4e412e4137fa9d52b510ea21a1f8d92089f5 Mon Sep 17 00:00:00 2001 From: TacticalCoderJay Date: Mon, 24 Apr 2023 20:54:29 -0700 Subject: [PATCH 2/4] check if proper id --- src/pages/api/auth/image.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/api/auth/image.ts b/src/pages/api/auth/image.ts index ff059fd3f..5db9ac729 100644 --- a/src/pages/api/auth/image.ts +++ b/src/pages/api/auth/image.ts @@ -7,6 +7,7 @@ import { extname } from 'path'; async function handler(req: NextApiReq, res: NextApiRes) { const { id, password } = req.query; + if (isNaN(Number(id))) return res.badRequest('invalid id'); const file = await prisma.file.findFirst({ where: { From a680168b4e8aec50a3bc51381775f42bba76d83b Mon Sep 17 00:00:00 2001 From: TacticalCoderJay Date: Mon, 24 Apr 2023 21:05:37 -0700 Subject: [PATCH 3/4] fix(?): await datasource's get --- src/scripts/query-size.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/query-size.ts b/src/scripts/query-size.ts index 655210dc2..56497692f 100644 --- a/src/scripts/query-size.ts +++ b/src/scripts/query-size.ts @@ -29,7 +29,7 @@ async function main() { for (let i = 0; i !== files.length; ++i) { const file = files[i]; - if (!datasource.get(file.name)) { + if (!(await datasource.get(file.name))) { if (process.argv.includes('--force-delete')) { console.log(`File ${file.name} does not exist. Deleting...`); await prisma.file.delete({ From 4ab1555c1006b61537d96ef98aa4fc637b64b9a8 Mon Sep 17 00:00:00 2001 From: TacticalCoderJay Date: Mon, 24 Apr 2023 21:11:36 -0700 Subject: [PATCH 4/4] fix (diced/zipline#350): Return size 0 for not found --- src/lib/datasources/S3.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/datasources/S3.ts b/src/lib/datasources/S3.ts index 011b5e078..3809d488c 100644 --- a/src/lib/datasources/S3.ts +++ b/src/lib/datasources/S3.ts @@ -50,22 +50,22 @@ export class S3 extends Datasource { } public size(file: string): Promise { - return new Promise((res, rej) => { + return new Promise((res) => { this.s3.statObject(this.config.bucket, file, (err, stat) => { - if (err) rej(err); + if (err) res(0); else res(stat.size); }); }); } public async fullSize(): Promise { - return new Promise((res, rej) => { + return new Promise((res) => { const objects = this.s3.listObjectsV2(this.config.bucket, '', true); let size = 0; objects.on('data', (item) => (size += item.size)); objects.on('end', (err) => { - if (err) rej(err); + if (err) res(0); else res(size); }); });