refactor(storage): enforce per-user max_file_bytes limit on upload pipelines (#20)
CD — Deployment / deploy (push) Successful in 22s

* Validate Content-Length on single-part upload route against user limit
* Check total expected size on chunked upload session creation
* Re-evaluate user limit at finalization to reject dynamic quota reductions
* Clean up temporary files on payload size rejection (413)
* Add 60-second polling interval for periodic fetching of messages and images

---------

Co-authored-by: xEsiah <[email protected]>
Reviewed-on: #20
Reviewed-by: Esiah <[email protected]>
Co-authored-by: Gitea Actions <-[email protected]>
This commit was merged in pull request #20.
This commit is contained in:
Gitea Actions
2026-10-31 10:16:28 +00:00
committed by Esiah
co-authored by Esiah
parent b52417053f
commit 3542b33c89
12 changed files with 907 additions and 34 deletions
+6
View File
@@ -85,6 +85,12 @@ export const RestoreIcon = (props: IconProps) => (
</svg>
);
export const RefreshIcon = (props: IconProps) => (
<svg {...base(props)}>
<path d="M20 12a8 8 0 1 1-2.3-5.6M20 4v4h-4" />
</svg>
);
export const StarIcon = ({ filled, ...props }: IconProps & { filled?: boolean }) => (
<svg {...base(props)} fill={filled ? "currentColor" : "none"}>
<path d="m12 3.5 2.6 5.3 5.9.9-4.2 4.1 1 5.8L12 20.8l-5.3 2.8 1-5.8L3.5 14l5.9-.9Z" />
+175 -3
View File
@@ -45,6 +45,20 @@ export interface UploadedFile {
updated_at: string;
}
/** Etat d'une session d'envoi resumable, cote serveur. */
export interface UploadSession {
uploadId: string;
name: string;
folderId: string | null;
size: number;
chunkSize: number;
uploadedBytes: number;
expiresAt: string;
}
/** Au-dela de ce seuil, l'envoi passe par des morceaux de 50 MiB. */
export const LARGE_UPLOAD_THRESHOLD = 90 * 1024 * 1024;
export interface FavoriteFile extends UploadedFile {
folder_name: string | null;
}
@@ -271,6 +285,150 @@ const putBinary = async <T>(path: string, body: BodyInit, type: string): Promise
return parsed as T;
};
/**
* Identifiant de reprise, stocke localement : si l'onglet est ferme pendant un
* gros envoi, le meme fichier reprend a l'octet pres au lieu de repartir de
* zero. La cle inclut la date de modification pour ne pas confondre deux
* fichiers homonymes.
*/
const resumeKey = (file: File, folderId: string | null): string =>
`cohaise.upload:${folderId ?? "root"}:${file.name}:${file.size}:${file.lastModified}`;
const readResume = (key: string): string | null => {
try {
return window.localStorage.getItem(key);
} catch {
return null;
}
};
const writeResume = (key: string, uploadId: string): void => {
try {
window.localStorage.setItem(key, uploadId);
} catch {
/* navigation privee : la reprise inter-onglets est simplement indisponible */
}
};
const clearResume = (key: string): void => {
try {
window.localStorage.removeItem(key);
} catch {
/* voir writeResume */
}
};
/** Envoi d'un morceau en XHR : `fetch` n'expose pas la progression montante. */
const sendChunk = (
uploadId: string,
blob: Blob,
onProgress: (loaded: number) => void,
): Promise<void> =>
new Promise((resolve, reject) => {
const xhr = new XMLHttpRequest();
xhr.open("PUT", `${BASE}/uploads/${encodeURIComponent(uploadId)}/chunks`);
xhr.withCredentials = true;
xhr.setRequestHeader("content-type", "application/octet-stream");
xhr.upload.onprogress = (event) => {
if (event.lengthComputable) onProgress(event.loaded);
};
xhr.onload = () => {
if (xhr.status >= 200 && xhr.status < 300) {
resolve();
return;
}
let parsed: unknown = null;
try {
parsed = JSON.parse(xhr.responseText);
} catch {
/* reponse non JSON : message generique */
}
reject(new ApiError(xhr.status, messageOf(parsed, "L'envoi du morceau a echoue.")));
};
xhr.onerror = () => reject(new ApiError(0, "Serveur injoignable. Verifiez votre connexion."));
xhr.onabort = () => reject(new ApiError(0, "Envoi interrompu."));
xhr.send(blob);
});
const sessionPath = (uploadId: string): string => `/uploads/${encodeURIComponent(uploadId)}`;
/**
* Envoi resumable en morceaux de 50 MiB. Chaque morceau reste sous la limite
* de corps de requete de Cloudflare ; le serveur ne publie le fichier qu'une
* fois tous les morceaux recus et le nom verifie.
*/
const uploadFileResumable = async (
file: File,
folderId: string | null,
onProgress?: (loaded: number, total: number) => void,
): Promise<{ file: UploadedFile }> => {
const key = resumeKey(file, folderId);
let upload: UploadSession | null = null;
const saved = readResume(key);
if (saved !== null) {
try {
const result = await request<{ upload: UploadSession }>(sessionPath(saved));
if (result.upload.name === file.name && result.upload.size === file.size) {
upload = result.upload;
} else {
clearResume(key);
}
} catch (error) {
if (error instanceof ApiError && error.status === 404) clearResume(key);
else throw error;
}
}
if (upload === null) {
const result = await post<{ upload: UploadSession }>("/uploads", {
name: file.name,
folderId,
size: file.size,
mimeType: file.type || null,
});
upload = result.upload;
writeResume(key, upload.uploadId);
}
const uploadId = upload.uploadId;
let offset = upload.uploadedBytes;
let attempts = 0;
while (offset < file.size) {
const end = Math.min(offset + upload.chunkSize, file.size);
try {
await sendChunk(uploadId, file.slice(offset, end), (loaded) =>
onProgress?.(offset + loaded, file.size),
);
offset = end;
attempts = 0;
} catch (error) {
const transient =
!(error instanceof ApiError) ||
error.status === 0 ||
error.status === 409 ||
error.status >= 500;
attempts += 1;
if (!transient || attempts > 4) throw error;
// Laisse au serveur le temps de terminer (ou d'annuler) le morceau
// avant de lui demander ou en est reellement le curseur.
await new Promise((resolve) => setTimeout(resolve, 400 * attempts));
const status = await request<{ upload: UploadSession }>(sessionPath(uploadId));
if (status.upload.name !== file.name || status.upload.size !== file.size) {
throw new ApiError(409, "La session d'envoi ne correspond plus au fichier.");
}
offset = status.upload.uploadedBytes;
}
}
onProgress?.(file.size, file.size);
const result = await post<{ file: UploadedFile }>(`${sessionPath(uploadId)}/complete`);
clearResume(key);
return result;
};
export const api = {
// --- Session -----------------------------------------------------------
me: () => request<{ user: User }>("/auth/me"),
@@ -331,12 +489,26 @@ export const api = {
// --- Fichiers ----------------------------------------------------------
files: (folderId?: string | null) =>
request<{ folderId: string | null; files: UploadedFile[] }>(`/files${query({ folderId })}`),
uploadFile: (file: File, folderId: string | null) =>
putBinary<{ file: UploadedFile }>(
uploadFile: (
file: File,
folderId: string | null,
onProgress?: (loaded: number, total: number) => void,
) => {
if (file.size >= LARGE_UPLOAD_THRESHOLD) {
return uploadFileResumable(file, folderId, onProgress);
}
return putBinary<{ file: UploadedFile }>(
`/files${query({ name: file.name, folderId })}`,
file,
file.type,
),
).then((result) => {
onProgress?.(file.size, file.size);
return result;
});
},
uploadSession: (uploadId: string) =>
request<{ upload: UploadSession }>(sessionPath(uploadId)),
cancelUpload: (uploadId: string) => del<{ ok: boolean }>(sessionPath(uploadId)),
renameFile: (id: string, name: string) =>
patch<{ file: UploadedFile }>(`/files/${encodeURIComponent(id)}`, { name }),
moveFile: (id: string, folderId: string | null) =>
+1
View File
@@ -22,6 +22,7 @@ const en: Record<string, string> = {
"Confirmer": "Confirm",
"Fermer": "Close",
"Retour": "Back",
"Rafraîchir": "Refresh",
"Filtrer": "Filter",
"Tous les utilisateurs": "All users",
"Toutes les actions": "All actions",
+85 -20
View File
@@ -37,6 +37,7 @@ import {
FolderIcon,
PenIcon,
PlusIcon,
RefreshIcon,
ShareIcon,
StarIcon,
TrashIcon,
@@ -68,6 +69,10 @@ const KINDS = [
{ value: "other", label: "Autres" },
] as const;
// Rafraichissement de l'explorateur : un autre compte peut deposer ou
// supprimer un fichier dans un dossier partage sans prevenir.
const REFRESH_FOLDER_MS = 60_000;
export const Browser = () => {
const { user, refresh } = useSession();
const { t } = useI18n();
@@ -80,6 +85,7 @@ export const Browser = () => {
const [, setError] = useState<string | null>(null);
const [, setNotice] = useState<string | null>(null);
const [uploading, setUploading] = useState(false);
const [refreshing, setRefreshing] = useState(false);
const [removing, setRemoving] = useState<string | null>(null);
const [dialog, setDialog] = useState<Dialog>(null);
const [viewer, setViewer] = useState<number | null>(null);
@@ -96,36 +102,46 @@ export const Browser = () => {
const [uploadProgress, setUploadProgress] = useState<{
current: number;
total: number;
uploadedBytes: number;
totalBytes: number;
} | null>(null);
const current = path[path.length - 1] ?? { id: null, name: "Racine" };
const dragActive = dragDepth > 0;
const loadSeq = useRef(0);
const load = useCallback(
async (parentId: string | null) => {
setLoading(true);
async (parentId: string | null, options?: { silent?: boolean }) => {
const sequence = ++loadSeq.current;
if (!options?.silent) setLoading(true);
setError(null);
try {
const [folderResult, fileResult] = await Promise.all([
api.folders(parentId),
api.files(parentId),
]);
if (sequence !== loadSeq.current) return;
setFolders(folderResult.folders);
setFiles(fileResult.files);
} catch (caught) {
if (sequence !== loadSeq.current) return;
const msg =
caught instanceof ApiError
? caught.message
: t("Chargement impossible.");
setError(msg);
toast.error(msg);
setFolders([]);
setFiles([]);
// Un rafraichissement automatique echoue en silence : pas de toast
// toutes les minutes si le reseau tombe pendant la consultation.
if (!options?.silent) {
setError(msg);
toast.error(msg);
setFolders([]);
setFiles([]);
}
} finally {
setLoading(false);
if (!options?.silent) setLoading(false);
}
},
[t],
[t, toast.error],
);
const refreshUnread = useCallback(async () => {
@@ -145,6 +161,18 @@ export const Browser = () => {
void refreshUnread();
}, [current.id, refreshUnread]);
// Un autre compte peut deposer ou supprimer un fichier dans un dossier
// partage : la vue se resynchronise d'elle-meme tant que l'onglet est actif.
useEffect(() => {
const timer = window.setInterval(() => {
if (document.hidden) return;
if (uploading || viewer !== null || dialog !== null || chat !== null) return;
void load(current.id, { silent: true });
void refreshUnread();
}, REFRESH_FOLDER_MS);
return () => window.clearInterval(timer);
}, [chat, current.id, dialog, load, refreshUnread, uploading, viewer]);
// Le filtre de type n'est propre qu'au dossier affiche : on repart sur
// « Tout » a chaque navigation, faute de voir un dossier vide pour rien.
useEffect(() => {
@@ -153,6 +181,17 @@ export const Browser = () => {
const reload = useCallback(() => load(current.id), [current.id, load]);
const manualRefresh = useCallback(async () => {
if (refreshing) return;
setRefreshing(true);
try {
await load(current.id);
await refreshUnread();
} finally {
setRefreshing(false);
}
}, [current.id, load, refreshUnread, refreshing]);
const open = (folder: Folder) => {
setPath((previous) => [...previous, { id: folder.id, name: folder.name }]);
};
@@ -165,14 +204,19 @@ export const Browser = () => {
setUploading(true);
setError(null);
setNotice(null);
const total = selectedFiles.length;
setUploadProgress({ current: 0, total });
const filesArr = Array.from(selectedFiles);
const total = filesArr.length;
const totalBytes = filesArr.reduce((sum, file) => sum + file.size, 0);
let completedBytes = 0;
const update = (current: number, loaded: number) =>
setUploadProgress({ current, total, uploadedBytes: completedBytes + loaded, totalBytes });
update(0, 0);
try {
const filesArr = Array.from(selectedFiles);
for (let i = 0; i < filesArr.length; i++) {
const f = filesArr[i] as File;
setUploadProgress({ current: i + 1, total });
await api.uploadFile(f, current.id);
update(i + 1, 0);
await api.uploadFile(f, current.id, (loaded) => update(i + 1, loaded));
completedBytes += f.size;
}
void refresh();
await reload();
@@ -202,14 +246,19 @@ export const Browser = () => {
setUploading(true);
setError(null);
setNotice(null);
const total = selectedFiles.length;
setUploadProgress({ current: 0, total });
const filesArr = Array.from(selectedFiles);
const total = filesArr.length;
const totalBytes = filesArr.reduce((sum, file) => sum + file.size, 0);
let completedBytes = 0;
const update = (current: number, loaded: number) =>
setUploadProgress({ current, total, uploadedBytes: completedBytes + loaded, totalBytes });
update(0, 0);
try {
const filesArr = Array.from(selectedFiles);
for (let i = 0; i < filesArr.length; i++) {
const f = filesArr[i] as File;
setUploadProgress({ current: i + 1, total });
await api.uploadFile(f, folderId);
update(i + 1, 0);
await api.uploadFile(f, folderId, (loaded) => update(i + 1, loaded));
completedBytes += f.size;
}
void refresh();
// Seule la vue courante est rechargée : un depot dans un sous-dossier ne
@@ -489,6 +538,16 @@ export const Browser = () => {
</ol>
</nav>
<Button
variant="secondary"
size="sm"
iconLeading={<RefreshIcon className="h-3.5 w-3.5" />}
isLoading={refreshing}
onClick={() => void manualRefresh()}
>
{t("Rafraîchir")}
</Button>
{current.id ? (
<Button
variant="secondary"
@@ -539,14 +598,20 @@ export const Browser = () => {
{t("Envoi en cours")}
</span>
<span className="text-xs text-muted-foreground">
{t("{current}/{total}", uploadProgress)}
{t("{current}/{total}", uploadProgress)} ·{" "}
{formatBytes(uploadProgress.uploadedBytes)} / {formatBytes(uploadProgress.totalBytes)}
</span>
</div>
<div className="h-1.5 w-full overflow-hidden rounded-full bg-surface-muted">
<div
className="h-full rounded-full bg-accent transition-[width] duration-200"
style={{
width: `${Math.round((uploadProgress.current / uploadProgress.total) * 100)}%`,
width: `${Math.min(
100,
Math.round(
(uploadProgress.uploadedBytes / Math.max(1, uploadProgress.totalBytes)) * 100,
),
)}%`,
}}
/>
</div>