pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-18 21:45:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat(media-proxy): sign attachment URLs and gate origins (#2830)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-09-18 15:57:32 +02:00
1 parent 025c01ab13
commit 522cf08e61
108 files changed
+10148 -441
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_api/src/api/worker/tasks/HarvestGuildData.ts
+29 -11
View File
@@ -11,9 +11,10 @@ import {
createArchiveTask,
throwIfArchiveTerminallyFailed,
} from '@app/api/archive/ArchiveTask';
import {makeDataPackageAttachmentCdnUrl} from '@app/api/attachment/AttachmentUrls';
import {type AttachmentID, type ChannelID, createGuildID, type MessageID} from '@app/api/BrandedTypes';
import {Config} from '@app/api/Config';
import {makeAttachmentCdnKey, makeAttachmentCdnUrl} from '@app/api/channel/services/message/MessageHelpers';
import {makeAttachmentCdnKey} from '@app/api/channel/services/message/MessageHelpers';
import type {IStorageService} from '@app/api/infrastructure/IStorageService';
import {Logger} from '@app/api/Logger';
import {mapWithConcurrency} from '@app/api/utils/ConcurrencyUtils';
@@ -54,6 +55,32 @@ interface PendingAttachmentDownload {
filename: string;
}
export interface GuildHarvestAttachment {
id: AttachmentID;
filename: string;
size: bigint;
contentType: string;
width: number | null;
height: number | null;
}
export function buildGuildHarvestAttachment(
channelId: ChannelID,
attachment: GuildHarvestAttachment,
includeAttachments: boolean,
): Record<string, unknown> {
return {
attachment_id: attachment.id.toString(),
filename: attachment.filename,
size: attachment.size.toString(),
content_type: attachment.contentType,
archive_path: includeAttachments ? `attachments/${channelId}/${attachment.id}/${attachment.filename}` : null,
cdn_url: makeDataPackageAttachmentCdnUrl(channelId, attachment.id, attachment.filename),
width: attachment.width,
height: attachment.height,
};
}
function cdnBucket(): string {
return Config.s3.buckets.cdn;
}
@@ -182,16 +209,7 @@ const harvestGuildData: ArchiveTaskHandler = async (payload, helpers, attempt) =
if (msg.authorId == null) continue;
const attachments: Array<object> = [];
for (const att of msg.attachments) {
attachments.push({
attachment_id: att.id.toString(),
filename: att.filename,
size: att.size.toString(),
content_type: att.contentType,
archive_path: validated.includeAttachments ? `attachments/${channel.id}/${att.id}/${att.filename}` : null,
cdn_url: makeAttachmentCdnUrl(channel.id, att.id, att.filename),
width: att.width,
height: att.height,
});
attachments.push(buildGuildHarvestAttachment(channel.id, att, validated.includeAttachments));
if (validated.includeAttachments) {
channelDownloads.push({
channelId: channel.id,
fluxer_api/src/api/worker/tasks/HarvestUserData.ts
+2 -2
View File
@@ -11,6 +11,7 @@ import {
createArchiveTask,
throwIfArchiveTerminallyFailed,
} from '@app/api/archive/ArchiveTask';
import {makeDataPackageAttachmentCdnUrl} from '@app/api/attachment/AttachmentUrls';
import {
type ChannelID,
createAttachmentID,
@@ -21,7 +22,6 @@ import {
type UserID,
} from '@app/api/BrandedTypes';
import {Config} from '@app/api/Config';
import {makeAttachmentCdnUrl} from '@app/api/channel/services/message/MessageHelpers';
import {
isChannelEligible,
isTimestampInWindow,
@@ -340,7 +340,7 @@ export async function harvestMessages(
content_type: attachment.contentType,
content_hash: null,
archive_path: null,
cdn_url: makeAttachmentCdnUrl(channelId, attachment.id, attachment.filename),
cdn_url: makeDataPackageAttachmentCdnUrl(channelId, attachment.id, attachment.filename),
width: attachment.width,
height: attachment.height,
})),