Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Handle missing video preview metadata as no content

Neeraj Gupta4b34fb7a0653
diff --git a/mobile/apps/photos/lib/gateways/files/file_data_gateway.dart b/mobile/apps/photos/lib/gateways/files/file_data_gateway.dart
index 16636d7fed..21a7e66355 100644
--- a/mobile/apps/photos/lib/gateways/files/file_data_gateway.dart
+++ b/mobile/apps/photos/lib/gateways/files/file_data_gateway.dart
@@ -111,19 +111,24 @@ class FileDataGateway {
return response.data["url"] as String;
}
- Future<({String encryptedData, String decryptionHeader})>
+ Future<({String encryptedData, String decryptionHeader})?>
fetchSingleFileData({required int fileID, required String type}) async {
final response = await _enteDio.get(
"/files/data/fetch",
- queryParameters: {"fileID": fileID, "type": type},
+ queryParameters: {
+ "fileID": fileID,
+ "type": type,
+ "preferNoContent": true,
+ },
);
+ if (response.statusCode == 204) return null;
return (
encryptedData: response.data["data"]["encryptedData"] as String,
decryptionHeader: response.data["data"]["decryptionHeader"] as String,
);
}
- Future<({String encryptedData, String decryptionHeader})>
+ Future<({String encryptedData, String decryptionHeader})?>
fetchPublicFileData({
required String baseUrl,
required int fileID,
@@ -133,9 +138,14 @@ class FileDataGateway {
}) async {
final response = await nonEnteDio.get(
"$baseUrl/public-collection/files/data/fetch",
- queryParameters: {"fileID": fileID, "type": type},
+ queryParameters: {
+ "fileID": fileID,
+ "type": type,
+ "preferNoContent": true,
+ },
options: Options(headers: headers),
);
+ if (response.statusCode == 204) return null;
return (
encryptedData: response.data["data"]["encryptedData"] as String,
decryptionHeader: response.data["data"]["decryptionHeader"] as String,
diff --git a/mobile/apps/photos/lib/services/video_preview_service.dart b/mobile/apps/photos/lib/services/video_preview_service.dart
index 71c9ac3bc0..bb13417e74 100644
--- a/mobile/apps/photos/lib/services/video_preview_service.dart
+++ b/mobile/apps/photos/lib/services/video_preview_service.dart
@@ -920,7 +920,6 @@ class VideoPreviewService {
bool Function(int bytes)? tryReserveBytes,
}) async {
_logger.fine("Getting playlist for $file");
- int? width, height, size;
try {
late final String objectID;
@@ -937,7 +936,7 @@ class VideoPreviewService {
objectID = previewInfo.objectId;
}
- final FileInfo? playlistCache = await cacheManager.getFileFromCache(
+ final playlistCache = await cacheManager.getFileFromCache(
_getCacheKey(objectID),
);
final detailsCache = await cacheManager.getFileFromCache(
@@ -945,26 +944,27 @@ class VideoPreviewService {
);
for (final cachedFile in [playlistCache, detailsCache]) {
if (cachedFile != null &&
- cachedFile.file.lengthSync() > maxHlsMetadataBytes) {
+ await cachedFile.file.length() > maxHlsMetadataBytes) {
throw const FormatException("HLS metadata exceeds the allowed size");
}
}
late final String playlistTemplate;
+ late final Map<String, dynamic> metadata;
if (playlistCache != null) {
- playlistTemplate = playlistCache.file.readAsStringSync();
- if (detailsCache != null) {
- final details = json.decode(detailsCache.file.readAsStringSync());
- width = details["width"];
- height = details["height"];
- size = details["size"];
- }
+ playlistTemplate = await playlistCache.file.readAsString();
+ metadata = detailsCache == null
+ ? const {}
+ : json.decode(await detailsCache.file.readAsString())
+ as Map<String, dynamic>;
} else {
- final Map<String, dynamic> playlistData = await _getPlaylistData(file);
- playlistTemplate = playlistData["playlist"];
- width = playlistData["width"];
- height = playlistData["height"];
- size = playlistData["size"];
+ final playlistData = await _getPlaylistData(file);
+ if (playlistData == null) return null;
+ playlistTemplate = playlistData["playlist"] as String;
+ metadata = playlistData;
}
+ final width = metadata["width"] as int?;
+ final height = metadata["height"] as int?;
+ final size = metadata["size"] as int?;
final videoFile = (await videoCacheManager.getFileFromCache(
_getVideoPreviewKey(objectID),
))?.file;
@@ -1057,9 +1057,12 @@ class VideoPreviewService {
}
}
- Future<Map<String, dynamic>> _getPlaylistData(EnteFile file) async {
- late final ({String encryptedData, String decryptionHeader}) fetchResult;
- if (collectionsService.isSharedPublicLink(file.collectionID!)) {
+ Future<Map<String, dynamic>?> _getPlaylistData(EnteFile file) async {
+ final isPublicCollection = collectionsService.isSharedPublicLink(
+ file.collectionID!,
+ );
+ late final ({String encryptedData, String decryptionHeader})? fetchResult;
+ if (isPublicCollection) {
fetchResult = await _fileDataGateway.fetchPublicFileData(
baseUrl: endpointConfig.endpoint,
fileID: file.uploadedFileID!,
@@ -1073,17 +1076,16 @@ class VideoPreviewService {
type: "vid_preview",
);
}
- final encryptionKey =
- collectionsService.isSharedPublicLink(file.collectionID!)
+ if (fetchResult == null) return null;
+ final encryptionKey = isPublicCollection
? getPublicFileKey(file)
: getFileKey(file);
- final playlistData = await decryptAndUnzipJson(
+ return decryptAndUnzipJson(
encryptionKey,
encryptedData: fetchResult.encryptedData,
header: fetchResult.decryptionHeader,
maxOutputBytes: maxHlsMetadataBytes,
);
- return playlistData;
}
int? parseDurationFromHLS(String playlist) {
diff --git a/mobile/apps/photos/test/gateways/files/file_data_gateway_test.dart b/mobile/apps/photos/test/gateways/files/file_data_gateway_test.dart
new file mode 100644
index 0000000000..f396560709
--- /dev/null
+++ b/mobile/apps/photos/test/gateways/files/file_data_gateway_test.dart
@@ -0,0 +1,88 @@
+import "dart:io";
+
+import "package:dio/dio.dart";
+import "package:flutter_test/flutter_test.dart";
+import "package:photos/core/network/api_response.dart";
+import "package:photos/gateways/files/file_data_gateway.dart";
+
+void main() {
+ for (final publicCollection in [false, true]) {
+ group(publicCollection ? "public file data" : "private file data", () {
+ late HttpServer server;
+ late Dio dio;
+ late FileDataGateway gateway;
+ late String baseUrl;
+ late HttpRequest lastRequest;
+ late int status;
+ late String body;
+
+ setUp(() async {
+ status = HttpStatus.ok;
+ body =
+ '{"data":{"encryptedData":"cipher","decryptionHeader":"header"}}';
+ server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+ baseUrl = "http://${server.address.host}:${server.port}";
+ server.listen((request) async {
+ lastRequest = request;
+ request.response.statusCode = status;
+ if (status == HttpStatus.ok) {
+ request.response.headers.contentType = ContentType.json;
+ }
+ request.response.write(body);
+ await request.response.close();
+ });
+ dio = Dio(BaseOptions(baseUrl: baseUrl))
+ ..interceptors.add(ApiResponseInterceptor(baseUrl));
+ gateway = FileDataGateway(dio);
+ });
+
+ tearDown(() async {
+ dio.close(force: true);
+ await server.close(force: true);
+ });
+
+ Future<Object?> fetch() {
+ if (publicCollection) {
+ return gateway.fetchPublicFileData(
+ baseUrl: baseUrl,
+ fileID: 42,
+ type: "vid_preview",
+ headers: {"X-Auth-Access-Token": "public-token"},
+ nonEnteDio: dio,
+ );
+ }
+ return gateway.fetchSingleFileData(fileID: 42, type: "vid_preview");
+ }
+
+ test("requests no-content responses and parses available data", () async {
+ expect(await fetch(), (
+ encryptedData: "cipher",
+ decryptionHeader: "header",
+ ));
+ expect(
+ lastRequest.uri.path,
+ publicCollection
+ ? "/public-collection/files/data/fetch"
+ : "/files/data/fetch",
+ );
+ expect(lastRequest.uri.queryParameters, {
+ "fileID": "42",
+ "type": "vid_preview",
+ "preferNoContent": "true",
+ });
+ if (publicCollection) {
+ expect(
+ lastRequest.headers.value("X-Auth-Access-Token"),
+ "public-token",
+ );
+ }
+ });
+
+ test("handles an empty 204 before parsing", () async {
+ status = HttpStatus.noContent;
+ body = "";
+ expect(await fetch(), isNull);
+ });
+ });
+ }
+}
diff --git a/mobile/apps/photos/test/services/video_preview_service_test.dart b/mobile/apps/photos/test/services/video_preview_service_test.dart
index c98202529d..1e98f32e50 100644
--- a/mobile/apps/photos/test/services/video_preview_service_test.dart
+++ b/mobile/apps/photos/test/services/video_preview_service_test.dart
@@ -1,3 +1,4 @@
+import "package:dio/dio.dart";
import "package:flutter_cache_manager/flutter_cache_manager.dart";
import 'package:flutter_test/flutter_test.dart';
import "package:photos/core/configuration.dart";
@@ -11,11 +12,32 @@ import "package:photos/services/file_magic_service.dart";
import 'package:photos/services/filedata/model/file_data.dart';
import "package:photos/services/isolated_ffmpeg_service.dart";
import 'package:photos/services/video_preview_service.dart';
+import "package:shared_preferences/shared_preferences.dart";
void main() {
+ TestWidgetsFlutterBinding.ensureInitialized();
late VideoPreviewService videoPreviewService;
+ final requestedPaths = <String>[];
+
+ setUpAll(() async {
+ SharedPreferences.setMockInitialValues({});
+ ServiceLocator.instance.prefs = await SharedPreferences.getInstance();
+ ServiceLocator.instance.enteDio = Dio()
+ ..interceptors.add(
+ InterceptorsWrapper(
+ onRequest: (request, handler) {
+ requestedPaths.add(request.path);
+ expect(request.path, "/files/data/fetch");
+ handler.resolve(Response(requestOptions: request, statusCode: 204));
+ },
+ ),
+ );
+ });
+
+ tearDownAll(() => ServiceLocator.instance.enteDio.close(force: true));
setUp(() {
+ requestedPaths.clear();
videoPreviewService = VideoPreviewService(
_FakeConfiguration(),
_FakeServiceLocator(),
@@ -28,6 +50,19 @@ void main() {
);
});
+ test("missing playlist data returns no preview before decryption", () async {
+ final file = EnteFile()
+ ..uploadedFileID = 42
+ ..collectionID = 1
+ ..fileType = FileType.video;
+ fileDataService.previewIds[42] = PreviewInfo(
+ objectId: "preview-object",
+ objectSize: 1000,
+ );
+ expect(await videoPreviewService.getPlaylist(file), isNull);
+ expect(requestedPaths, ["/files/data/fetch"]);
+ });
+
group('calcStatus', () {
test('excludes legacy files unless they already have previews', () async {
final files = [
@@ -79,6 +114,12 @@ class _FakeFileMagicService extends Fake implements FileMagicService {}
class _FakeIsolatedFfmpegService extends Fake
implements IsolatedFfmpegService {}
-class _FakeDefaultCacheManager extends Fake implements DefaultCacheManager {}
+class _FakeDefaultCacheManager extends Fake implements DefaultCacheManager {
+ @override
+ Future<FileInfo?> getFileFromCache(
+ String key, {
+ bool ignoreMemCache = false,
+ }) async => null;
+}
class _FakeCacheManager extends Fake implements CacheManager {}