merge: upd: flip rehash behavior, convert argon2 into bcrypt (!444 )

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/444
merge: handle ranged requests for proxied files - fixes #494 (!490 )
2024-09-23 02:01:59 +03:00 · 2024-04-11 12:24:42 +00:00 · 2024-04-11 10:07:25 +00:00 · 2024-04-09 16:21:30 +01:00 · 2024-04-09 15:42:29 +01:00
1 changed files with 5 additions and 1 deletions
--- a/packages/backend/src/server/FileServerService.ts
+++ b/packages/backend/src/server/FileServerService.ts
@ -192,6 +192,7 @@ export class FileServerService {
 						reply.header('Content-Range', `bytes ${start}-${end}/${file.file.size}`);
 						reply.header('Accept-Ranges', 'bytes');
 						reply.header('Content-Length', chunksize);
+						reply.code(206);
 					} else {
 						image = {
 							data: fs.createReadStream(file.path),
@ -261,7 +262,6 @@ export class FileServerService {
 					const parts = range.replace(/bytes=/, '').split('-');
 					const start = parseInt(parts[0], 10);
 					let end = parts[1] ? parseInt(parts[1], 10) : file.file.size - 1;
-					console.log(end);
 					if (end > file.file.size) {
 						end = file.file.size - 1;
 					}
@ -431,6 +431,7 @@ export class FileServerService {
 					reply.header('Content-Range', `bytes ${start}-${end}/${file.file.size}`);
 					reply.header('Accept-Ranges', 'bytes');
 					reply.header('Content-Length', chunksize);
+					reply.code(206);
 				} else {
 					image = {
 						data: fs.createReadStream(file.path),
@ -527,6 +528,9 @@ export class FileServerService {
 		if (!file.storedInternal) {
 			if (!(file.isLink && file.uri)) return '204';
 			const result = await this.downloadAndDetectTypeFromUrl(file.uri);
+			if (!file.size) {
+				file.size = (await fs.promises.stat(result.path)).size;
+			}
 			return {
 				...result,
 				url: file.uri,
Author	SHA1	Message	Date
S Kopper	3c68d15bbb	merge: upd: flip rehash behavior, convert argon2 into bcrypt (!444 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/444	2024-04-11 12:24:42 +00:00
Amelia Yukii	28065fc1d1	merge: handle ranged requests for proxied files - fixes #494 (!490 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/490 Closes #494 Approved-by: Amelia Yukii <amelia.yukii@shourai.de> Approved-by: Marie <marie@kaifa.ch>	2024-04-11 10:07:25 +00:00
dakkar	960f4fcff7	detect size of remote files - fixes #494 without this, remote files are assumed to have size 0 (even if we just downloaded them!) and the range-related code won't run	2024-04-09 16:21:30 +01:00
dakkar	92eec2178f	return 206 for every ranged response - fixes #494	2024-04-09 15:42:29 +01:00