π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][locker] Cap PDF page count before opening the viewer (#13997)
aman-pilotbafda3fe4da2
diff --git a/mobile/apps/locker/lib/ui/pages/pdf_viewer_page.dart b/mobile/apps/locker/lib/ui/pages/pdf_viewer_page.dartindex c513173e6d..ef64bd9e60 100644--- a/mobile/apps/locker/lib/ui/pages/pdf_viewer_page.dart+++ b/mobile/apps/locker/lib/ui/pages/pdf_viewer_page.dart@@ -39,6 +39,7 @@ class _PdfViewerPageState extends State<PdfViewerPage> {static const _maxScale = 5.0;static const _doubleTapScale = 2.5;static const _maxRenderPixels = 8 * 1024 * 1024;+ static const _maxPages = 500;final _transformation = TransformationController();final _currentPage = ValueNotifier(1);@@ -83,6 +84,7 @@ class _PdfViewerPageState extends State<PdfViewerPage> {final document = await EntePdfRenderer.open(widget.localFile.path,password: password,+ maxPages: _maxPages,);if (!mounted || document.pageCount == 0) {await document.close();diff --git a/mobile/packages/ente_pdf_renderer/android/src/main/kotlin/io/ente/pdf_renderer/EntePdfRendererPlugin.kt b/mobile/packages/ente_pdf_renderer/android/src/main/kotlin/io/ente/pdf_renderer/EntePdfRendererPlugin.ktindex 9d4624ff2d..ee51a12c7b 100644--- a/mobile/packages/ente_pdf_renderer/android/src/main/kotlin/io/ente/pdf_renderer/EntePdfRendererPlugin.kt+++ b/mobile/packages/ente_pdf_renderer/android/src/main/kotlin/io/ente/pdf_renderer/EntePdfRendererPlugin.kt@@ -44,7 +44,11 @@ class EntePdfRendererPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {executor.execute {try {val reply: Any? = when (call.method) {- "open" -> open(call.argument<String>("path")!!, call.argument<String>("password"))+ "open" -> open(+ call.argument<String>("path")!!,+ call.argument<String>("password"),+ call.argument<Int>("maxPages")!!,+ )"render" -> render(call.argument<Int>("id")!!,call.argument<Int>("page")!!,@@ -63,13 +67,13 @@ class EntePdfRendererPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {mainThread.post { result.success(reply) }} catch (e: PdfError) {mainThread.post { result.error(e.code, e.message, null) }- } catch (e: Exception) {+ } catch (e: Throwable) {mainThread.post { result.error("invalid", e.toString(), null) }}}}- private fun open(path: String, password: String?): Map<String, Any> {+ private fun open(path: String, password: String?, maxPages: Int): Map<String, Any> {val descriptor = ParcelFileDescriptor.open(File(path), ParcelFileDescriptor.MODE_READ_ONLY)val renderer = try {if (supportsPasswords && password != null) {@@ -77,7 +81,7 @@ class EntePdfRendererPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {} else {PdfRenderer(descriptor)}- } catch (e: Exception) {+ } catch (e: Throwable) {descriptor.close()when {e !is SecurityException -> throw e@@ -86,16 +90,19 @@ class EntePdfRendererPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {else -> throw PdfError("password_incorrect", "Wrong password")}}- val widths = ArrayList<Double>(renderer.pageCount)- val heights = ArrayList<Double>(renderer.pageCount)+ val widths = ArrayList<Double>()+ val heights = ArrayList<Double>()try {+ if (renderer.pageCount > maxPages) {+ throw PdfError("too_many_pages", "PDF has ${renderer.pageCount} pages")+ }for (index in 0 until renderer.pageCount) {renderer.openPage(index).use {widths.add(it.width.toDouble())heights.add(it.height.toDouble())}}- } catch (e: Exception) {+ } catch (e: Throwable) {renderer.close()throw e}diff --git a/mobile/packages/ente_pdf_renderer/ios/Classes/EntePdfRendererPlugin.swift b/mobile/packages/ente_pdf_renderer/ios/Classes/EntePdfRendererPlugin.swiftindex e61a38d463..a8c35784b5 100644--- a/mobile/packages/ente_pdf_renderer/ios/Classes/EntePdfRendererPlugin.swift+++ b/mobile/packages/ente_pdf_renderer/ios/Classes/EntePdfRendererPlugin.swift@@ -24,10 +24,10 @@ public class EntePdfRendererPlugin: NSObject, FlutterPlugin {let reply: Any?switch call.method {case "open":- guard let path = arguments["path"] as? String else {- throw PdfError(code: "invalid", message: "Missing path")+ guard let path = arguments["path"] as? String, let maxPages = arguments["maxPages"] as? Int else {+ throw PdfError(code: "invalid", message: "Missing open arguments")}- reply = try self.open(path: path, password: arguments["password"] as? String)+ reply = try self.open(path: path, password: arguments["password"] as? String, maxPages: maxPages)case "render":guard let id = arguments["id"] as? Int, let page = arguments["page"] as? Int,let width = arguments["width"] as? Int, let height = arguments["height"] as? Int else {@@ -59,7 +59,7 @@ public class EntePdfRendererPlugin: NSObject, FlutterPlugin {return page.rotation % 180 == 0 ? bounds.size : CGSize(width: bounds.height, height: bounds.width)}- private func open(path: String, password: String?) throws -> [String: Any] {+ private func open(path: String, password: String?, maxPages: Int) throws -> [String: Any] {guard let document = PDFDocument(url: URL(fileURLWithPath: path)) else {throw PdfError(code: "invalid", message: "Not a readable PDF")}@@ -71,6 +71,9 @@ public class EntePdfRendererPlugin: NSObject, FlutterPlugin {throw PdfError(code: "password_incorrect", message: "Wrong password")}}+ guard document.pageCount <= maxPages else {+ throw PdfError(code: "too_many_pages", message: "PDF has \(document.pageCount) pages")+ }var widths: [Double] = []var heights: [Double] = []for index in 0..<document.pageCount {diff --git a/mobile/packages/ente_pdf_renderer/lib/ente_pdf_renderer.dart b/mobile/packages/ente_pdf_renderer/lib/ente_pdf_renderer.dartindex 89ae5587b5..3440550bfb 100644--- a/mobile/packages/ente_pdf_renderer/lib/ente_pdf_renderer.dart+++ b/mobile/packages/ente_pdf_renderer/lib/ente_pdf_renderer.dart@@ -52,10 +52,15 @@ class EntePdfDocument {class EntePdfRenderer {static const _channel = MethodChannel("io.ente/pdf_renderer");- static Future<EntePdfDocument> open(String path, {String? password}) async {+ static Future<EntePdfDocument> open(+ String path, {+ String? password,+ required int maxPages,+ }) async {final reply = await _invoke<Map<Object?, Object?>>("open", {"path": path,"password": password,+ "maxPages": maxPages,});final widths = (reply!["widths"]! as List).cast<double>();final heights = (reply["heights"]! as List).cast<double>();diff --git a/mobile/packages/ente_pdf_renderer/test/ente_pdf_renderer_test.dart b/mobile/packages/ente_pdf_renderer/test/ente_pdf_renderer_test.dartindex 84fef5bda3..273069b62d 100644--- a/mobile/packages/ente_pdf_renderer/test/ente_pdf_renderer_test.dart+++ b/mobile/packages/ente_pdf_renderer/test/ente_pdf_renderer_test.dart@@ -44,10 +44,18 @@ void main() {}});- final document = await EntePdfRenderer.open("/tmp/a.pdf", password: "x");+ final document = await EntePdfRenderer.open(+ "/tmp/a.pdf",+ password: "x",+ maxPages: 500,+ );expect(document.pageCount, 2);expect(document.pageSizes[1], const Size(842, 595));- expect(calls.single.arguments, {"path": "/tmp/a.pdf", "password": "x"});+ expect(calls.single.arguments, {+ "path": "/tmp/a.pdf",+ "password": "x",+ "maxPages": 500,+ });final bytes = await document.render(2, width: 100, height: 70);expect(bytes, [1, 2, 3]);@@ -65,25 +73,25 @@ void main() {test("platform error codes become typed exceptions", () async {fail("password_required");await expectLater(- EntePdfRenderer.open("/tmp/a.pdf"),+ EntePdfRenderer.open("/tmp/a.pdf", maxPages: 500),throwsA(isA<PdfPasswordRequiredException>()),);fail("password_incorrect");await expectLater(- EntePdfRenderer.open("/tmp/a.pdf", password: "nope"),+ EntePdfRenderer.open("/tmp/a.pdf", password: "nope", maxPages: 500),throwsA(isA<PdfPasswordIncorrectException>()),);fail("password_unsupported");await expectLater(- EntePdfRenderer.open("/tmp/a.pdf"),+ EntePdfRenderer.open("/tmp/a.pdf", maxPages: 500),throwsA(isA<PdfPasswordUnsupportedException>()),);fail("invalid", message: "Unable to load");await expectLater(- EntePdfRenderer.open("/tmp/a.pdf"),+ EntePdfRenderer.open("/tmp/a.pdf", maxPages: 500),throwsA(isA<PdfException>().having((e) => e.message,