hippoz/waffle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix avatar uploads

Browse source
This commit is contained in:
hippoz 2023-08-08 23:25:06 +03:00
parent e493e79db3
commit 680ceee880
Signed by: hippoz
GPG key ID: 56C4E02A85F2FBED
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/rpc/apis/users.ts
View file

@ -4,12 +4,11 @@ import { compare, hash } from "bcrypt";
import { getPublicUserObject, loginAttempt } from "../../auth"; import { getPublicUserObject, loginAttempt } from "../../auth";
import { RPCContext, bufferSlice, method, methodButWarningDoesNotAuthenticate, string, usernameRegex, withRegexp } from "./../rpc"; import { RPCContext, bufferSlice, method, methodButWarningDoesNotAuthenticate, string, usernameRegex, withRegexp } from "./../rpc";
import sharp from "sharp"; import sharp from "sharp";
import path from "path";
import { randomBytes } from "crypto"; import { randomBytes } from "crypto";
import { unlink } from "fs/promises"; import { unlink } from "fs/promises";
import { GatewayPayloadType } from "../../gateway/gatewaypayloadtype"; import { GatewayPayloadType } from "../../gateway/gatewaypayloadtype";
import { supportedImageMime } from "../../uploading"; import { UploadTarget, getSafeUploadPath, supportedImageMime } from "../../uploading";
import { avatarUploadDirectory, disableAccountCreation, superuserKey } from "../../serverconfig"; import { disableAccountCreation, superuserKey } from "../../serverconfig";
const fileType = eval("import('file-type')"); const fileType = eval("import('file-type')");
@ -108,10 +107,13 @@ method(
const filenames = new Array(profilePictureSizes.length); const filenames = new Array(profilePictureSizes.length);
for (let i = 0; i < profilePictureSizes.length; i++) { for (let i = 0; i < profilePictureSizes.length; i++) {
filenames[i] = `${avatarId}_${profilePictureSizes[i]}.webp`; filenames[i] = `${avatarId}_${profilePictureSizes[i]}.webp`;
const safePath = getSafeUploadPath(UploadTarget.Avatar, filenames[i]);
if (safePath) {
promises[i] = sharp(buffer, { limitInputPixels: 1000 * 1000 }) promises[i] = sharp(buffer, { limitInputPixels: 1000 * 1000 })
.resize(profilePictureSizes[i], profilePictureSizes[i], { fit: "cover" }) .resize(profilePictureSizes[i], profilePictureSizes[i], { fit: "cover" })
.timeout({ seconds: 3 }) .timeout({ seconds: 3 })
.toFile(path.resolve(path.join(avatarUploadDirectory, filenames[i]))); .toFile(safePath);
}
} }
try { try {
@ -121,7 +123,10 @@ method(
console.error("rpc: putUserAvatar: removing all processed images due to error above"); console.error("rpc: putUserAvatar: removing all processed images due to error above");
for (let i = 0; i < filenames.length; i++) { for (let i = 0; i < filenames.length; i++) {
try { try {
await unlink(path.resolve(path.join(avatarUploadDirectory, filenames[i]))); const safePath = getSafeUploadPath(UploadTarget.Avatar, filenames[i]);
if (safePath) {
await unlink(safePath);
}
} catch(o_0) { } catch(o_0) {
//console.error("rpc: putUserAvatar: error while removing files (upon error)", o_0); //console.error("rpc: putUserAvatar: error while removing files (upon error)", o_0);
} }
@ -133,7 +138,12 @@ method(
if (user.avatar) { if (user.avatar) {
for (let i = 0; i < profilePictureSizes.length; i++) { for (let i = 0; i < profilePictureSizes.length; i++) {
try { try {
await unlink(path.resolve(path.join(avatarUploadDirectory, `${user.avatar}_${profilePictureSizes[i]}.webp`))); const safePath = getSafeUploadPath(UploadTarget.Avatar, `${user.avatar}_${profilePictureSizes[i]}.webp`);
if (safePath) {
await unlink(safePath);
} else {
console.error("rpc: putUserAvatar: error while removing files (removing old avatar): getSafeUploadPath failed. This should not happen.");
}
} catch(o_0) { } catch(o_0) {
console.error("rpc: putUserAvatar: error while removing files (removing old avatar)", o_0); console.error("rpc: putUserAvatar: error while removing files (removing old avatar)", o_0);
} }