OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Check ahead of download if a file exceeds the maximum file size 

fixes https://gitlab.com/famedly/company/frontend/famedly-web/-/issues/539
This commit is contained in:
Nicolas Werner 2022-09-06 11:52:19 +02:00
parent 125ce4d91f
commit abbc474480
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/src/client.dart
View File

@ -19,6 +19,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:core'; import 'dart:core';
import 'dart:math';
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:collection/collection.dart' show IterableExtension; import 'package:collection/collection.dart' show IterableExtension;
@ -887,6 +888,12 @@ class Client extends MatrixApi {
@override @override
Future<Uri> uploadContent(Uint8List file, Future<Uri> uploadContent(Uint8List file,
{String? filename, String? contentType}) async { {String? filename, String? contentType}) async {
final mediaConfig = await getConfig();
final maxMediaSize = mediaConfig.mUploadSize;
if (maxMediaSize != null && maxMediaSize < file.lengthInBytes) {
throw FileTooBigMatrixException(file.lengthInBytes, maxMediaSize);
}
contentType ??= lookupMimeType(filename ?? '', headerBytes: file); contentType ??= lookupMimeType(filename ?? '', headerBytes: file);
final mxc = await super final mxc = await super
.uploadContent(file, filename: filename, contentType: contentType); .uploadContent(file, filename: filename, contentType: contentType);
@ -2904,6 +2911,35 @@ class BadServerLoginTypesException implements Exception {
'Server supports the Login Types: ${serverLoginTypes.toString()} but this application is only compatible with ${supportedLoginTypes.toString()}.'; 'Server supports the Login Types: ${serverLoginTypes.toString()} but this application is only compatible with ${supportedLoginTypes.toString()}.';
} }
class FileTooBigMatrixException extends MatrixException {
int actualFileSize;
int maxFileSize;
static String _formatFileSize(int size) {
if (size < 1024) return '$size B';
final i = (log(size) / log(1024)).floor();
final num = (size / pow(1024, i));
final round = num.round();
final numString = round < 10
? num.toStringAsFixed(2)
: round < 100
? num.toStringAsFixed(1)
: round.toString();
return '$numString ${'kMGTPEZY'[i - 1]}B';
}
FileTooBigMatrixException(this.actualFileSize, this.maxFileSize)
: super.fromJson({
'errcode': MatrixError.M_TOO_LARGE,
'error':
'File size ${_formatFileSize(actualFileSize)} exceeds allowed maximum of ${_formatFileSize(maxFileSize)}'
});
@override
String toString() =>
'File size ${_formatFileSize(actualFileSize)} exceeds allowed maximum of ${_formatFileSize(maxFileSize)}';
}
class HomeserverSummary { class HomeserverSummary {
final DiscoveryInformation? discoveryInformation; final DiscoveryInformation? discoveryInformation;
final GetVersionsResponse versions; final GetVersionsResponse versions;

6
lib/src/room.dart
View File

@ -672,6 +672,12 @@ class Room {
MatrixImageFile? thumbnail, MatrixImageFile? thumbnail,
Map<String, dynamic>? extraContent, Map<String, dynamic>? extraContent,
}) async { }) async {
final mediaConfig = await client.getConfig();
final maxMediaSize = mediaConfig.mUploadSize;
if (maxMediaSize != null && maxMediaSize < file.bytes.lengthInBytes) {
throw FileTooBigMatrixException(file.bytes.lengthInBytes, maxMediaSize);
}
txid ??= client.generateUniqueTransactionId(); txid ??= client.generateUniqueTransactionId();
sendingFilePlaceholders[txid] = file; sendingFilePlaceholders[txid] = file;
if (thumbnail != null) { if (thumbnail != null) {