Skip to content

armgit / ente

Public Imported from GitHub
0

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

Preserve mobile callback base URLs in logs

Neeraj Gupta687b50b9526d
diff --git a/mobile/apps/photos/lib/ui/account/passkey_page.dart b/mobile/apps/photos/lib/ui/account/passkey_page.dart
index 39f1ae09f0..8da11eb681 100644
--- a/mobile/apps/photos/lib/ui/account/passkey_page.dart
+++ b/mobile/apps/photos/lib/ui/account/passkey_page.dart
@@ -125,7 +125,9 @@ class _PasskeyPageState extends State<PasskeyPage> {
final json = jsonDecode(res) as Map<String, dynamic>;
await UserService.instance.onPassKeyVerified(context, json);
} else {
- _logger.info('ignored deeplink: mounted $mounted');
+ _logger.info(
+ 'ignored deeplink: ${baseUrlForLogging(link)} mounted $mounted',
+ );
}
} catch (e, s) {
_logger.severe('passKey: failed to handle deeplink', e, s);
diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
index ec9ea1b07d..af5cd5c1e8 100644
--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart
+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
@@ -800,7 +800,9 @@ class _HomeWidgetState extends State<HomeWidget> {
if (_isPublicAlbumDeepLink(initialUri)) {
await _handlePublicAlbumLink(initialUri, "appLinks.getInitialLink");
} else {
- _logger.info("Ignoring deep link");
+ _logger.info(
+ "Ignoring deep link: ${baseUrlForLogging(initialUri.toString())}",
+ );
}
} else {
_logger.info(
@@ -817,7 +819,9 @@ class _HomeWidgetState extends State<HomeWidget> {
if (_isPublicAlbumDeepLink(uri)) {
_handlePublicAlbumLink(uri, "appLinks.uriLinkStream");
} else {
- _logger.info("Ignoring deep link");
+ _logger.info(
+ "Ignoring deep link: ${baseUrlForLogging(uri.toString())}",
+ );
}
} else {
_logger.info("No link received in public album link subscription.");
diff --git a/mobile/packages/accounts/lib/pages/passkey_page.dart b/mobile/packages/accounts/lib/pages/passkey_page.dart
index fe4e7cabf7..92a9952be7 100644
--- a/mobile/packages/accounts/lib/pages/passkey_page.dart
+++ b/mobile/packages/accounts/lib/pages/passkey_page.dart
@@ -136,7 +136,9 @@ class _PasskeyPageState extends State<PasskeyPage> {
json,
);
} else {
- _logger.info('ignored deeplink: mounted $mounted');
+ _logger.info(
+ 'ignored deeplink: ${baseUrlForLogging(link)} mounted $mounted',
+ );
}
} catch (e, s) {
_logger.severe('passKey: failed to handle deeplink', e, s);
diff --git a/mobile/packages/ente_pure_utils/lib/src/parse_util.dart b/mobile/packages/ente_pure_utils/lib/src/parse_util.dart
index d22a2f1e41..680066608f 100644
--- a/mobile/packages/ente_pure_utils/lib/src/parse_util.dart
+++ b/mobile/packages/ente_pure_utils/lib/src/parse_util.dart
@@ -16,3 +16,17 @@ List<double> parseAsDoubleList(List<dynamic> inputList) {
throw FormatException('Invalid type at index $index: ${value.runtimeType}');
}, growable: false);
}
+
+String baseUrlForLogging(String value) {
+ try {
+ final uri = Uri.parse(value);
+ if (!uri.hasScheme || uri.host.isEmpty) return 'unknown URL';
+ return Uri(
+ scheme: uri.scheme,
+ host: uri.host,
+ port: uri.hasPort ? uri.port : null,
+ ).toString();
+ } catch (_) {
+ return 'unknown URL';
+ }
+}
diff --git a/mobile/packages/ente_pure_utils/test/parse_util_test.dart b/mobile/packages/ente_pure_utils/test/parse_util_test.dart
new file mode 100644
index 0000000000..c203b23148
--- /dev/null
+++ b/mobile/packages/ente_pure_utils/test/parse_util_test.dart
@@ -0,0 +1,41 @@
+import 'package:ente_pure_utils/ente_pure_utils.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+ group('baseUrlForLogging', () {
+ test('retains scheme, host and port without sensitive URL components', () {
+ const cases = {
+ 'ente://passkey?response=SYNTHETIC_RESPONSE#SYNTHETIC_FRAGMENT':
+ 'ente://passkey',
+ 'enteauth://passkey?response=SYNTHETIC_RESPONSE': 'enteauth://passkey',
+ 'entelocker://passkey?response=SYNTHETIC_RESPONSE':
+ 'entelocker://passkey',
+ 'ente://SYNTHETIC_USER:SYNTHETIC_PASSWORD@passkey:8443/SYNTHETIC_PATH?response=SYNTHETIC_RESPONSE#SYNTHETIC_FRAGMENT':
+ 'ente://passkey:8443',
+ 'https://SYNTHETIC_USER:[email protected]:8443/SYNTHETIC_PATH?response=SYNTHETIC_RESPONSE#SYNTHETIC_FRAGMENT':
+ 'https://example.test:8443',
+ 'https://[::1]:8443/SYNTHETIC_PATH?response=SYNTHETIC_RESPONSE#SYNTHETIC_FRAGMENT':
+ 'https://[::1]:8443',
+ 'HTTPS://EXAMPLE.TEST:443/SYNTHETIC_PATH': 'https://example.test',
+ };
+ for (final entry in cases.entries) {
+ expect(baseUrlForLogging(entry.key), entry.value, reason: entry.key);
+ }
+ });
+
+ test('returns a generic fallback when a base URL cannot be extracted', () {
+ const cases = [
+ '',
+ 'SYNTHETIC_PRIVATE_DATA',
+ '//example.test?response=SYNTHETIC_RESPONSE',
+ 'ente:SYNTHETIC_PRIVATE_DATA',
+ 'https://example.test:SYNTHETIC_PRIVATE_DATA',
+ 'https://[SYNTHETIC_PRIVATE_DATA',
+ 'https://example.test:999999999999999999999/SYNTHETIC_PRIVATE_DATA',
+ ];
+ for (final value in cases) {
+ expect(baseUrlForLogging(value), 'unknown URL', reason: value);
+ }
+ });
+ });
+}