forked from devsam/image
feat: store editor images in upload bind
This commit is contained in:
@@ -38,7 +38,7 @@ function parseJson(body) {
|
||||
|
||||
function hasImageSignature(body, extension) {
|
||||
if (extension === 'png') return body.length >= 8 && body.subarray(0, 8).equals(Buffer.from('89504e470d0a1a0a', 'hex'));
|
||||
if (extension === 'jpg') return body.length >= 3 && body[0] === 0xff && body[1] === 0xd8 && body[2] === 0xff;
|
||||
if (extension === 'jpg' || extension === 'jpeg') return body.length >= 3 && body[0] === 0xff && body[1] === 0xd8 && body[2] === 0xff;
|
||||
if (extension === 'gif') return body.length >= 6 && ['GIF87a', 'GIF89a'].includes(body.subarray(0, 6).toString('ascii'));
|
||||
if (extension === 'webp') return body.length >= 12 && body.subarray(0, 4).toString('ascii') === 'RIFF'
|
||||
&& body.subarray(8, 12).toString('ascii') === 'WEBP';
|
||||
@@ -149,23 +149,26 @@ export async function createApp(config = loadConfig(), dependencies = {}) {
|
||||
});
|
||||
return json(response, 200, { ok: true, ...result });
|
||||
}
|
||||
if (request.method === 'PUT' && url.pathname.startsWith('/v1/uploads/user-icons/')) {
|
||||
if (request.method === 'PUT' && url.pathname.startsWith('/v1/uploads/')) {
|
||||
const client = request.headers['x-image-client'];
|
||||
const expires = request.headers['x-image-expires'];
|
||||
const requestId = request.headers['x-image-request-id'];
|
||||
const contentType = request.headers['content-type']?.toLowerCase() ?? '';
|
||||
const knownClient = typeof client === 'string' && Object.hasOwn(config.uploadClientSecrets, client);
|
||||
const match = url.pathname.match(/^\/v1\/uploads\/user-icons\/([a-z0-9][a-z0-9_-]{1,31})\/([a-f0-9]{32})\.(avif|webp|jpg|png|gif)$/);
|
||||
if (!match || match[1] !== client) {
|
||||
const match = url.pathname.match(/^\/v1\/uploads\/(user-icons|content)\/([a-z0-9][a-z0-9_-]{1,31})\/([a-f0-9]{32})\.(avif|webp|jpe?g|png|gif)$/);
|
||||
if (!match || match[2] !== client) {
|
||||
throw new DeploymentError('Invalid upload path', 400);
|
||||
}
|
||||
const mimeByExtension = {
|
||||
avif: 'image/avif', webp: 'image/webp', jpg: 'image/jpeg', png: 'image/png', gif: 'image/gif',
|
||||
avif: 'image/avif', webp: 'image/webp', jpg: 'image/jpeg', jpeg: 'image/jpeg', png: 'image/png', gif: 'image/gif',
|
||||
};
|
||||
if (contentType !== mimeByExtension[match[3]]) {
|
||||
if (contentType !== mimeByExtension[match[4]]) {
|
||||
throw new DeploymentError('Content-Type does not match upload path', 415);
|
||||
}
|
||||
const body = await readBody(request, config.maxUploadBytes);
|
||||
const body = await readBody(
|
||||
request,
|
||||
match[1] === 'user-icons' ? config.maxUploadBytes : config.maxContentUploadBytes,
|
||||
);
|
||||
const signatureValid = verifyUploadSignature({
|
||||
secret: knownClient ? config.uploadClientSecrets[client] : 'invalid-client-secret'.padEnd(32, '!'),
|
||||
expires,
|
||||
@@ -178,13 +181,14 @@ export async function createApp(config = loadConfig(), dependencies = {}) {
|
||||
if (!knownClient || !signatureValid) {
|
||||
return json(response, 401, { ok: false, reason: 'invalid or expired upload grant' });
|
||||
}
|
||||
if (!hasImageSignature(body, match[3])) {
|
||||
if (!hasImageSignature(body, match[4])) {
|
||||
throw new DeploymentError('Body is not the declared image format', 400);
|
||||
}
|
||||
const result = await uploadStore.store({
|
||||
requestKey: `${client}:${requestId}`,
|
||||
category: match[1],
|
||||
client,
|
||||
filename: `${match[2]}.${match[3]}`,
|
||||
filename: `${match[3]}.${match[4]}`,
|
||||
body,
|
||||
});
|
||||
const urls = config.publicBases.map((base) => `${base}/${result.path}`);
|
||||
|
||||
Reference in New Issue
Block a user