From ae616f855eafb57e3e7934ab7447e8812d2b37c5 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 17 Feb 2022 18:15:45 +0100
Subject: [PATCH] default to broadcasting to the current app only, with opt-in
global
Most apps that use TorService as a library do not want to share the tor
instance with other apps. So TorService should not send global broadcasts
in that case. Apps like Orbot and TorServices still need to send global
broadcasts, so there is a method to re-enable that.
As a follow-on to the issues raised in #71.
---
.../java/org/torproject/jni/TorService.java | 23 +++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
index 8f777180..6269a4ab 100644
--- a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
+++ b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
@@ -119,6 +119,25 @@ public class TorService extends Service {
return new File(getAppTorServiceDir(context), "torrc-defaults");
}
+ public static String getBroadcastPackageName(Context context) {
+ if (broadcastPackageName == UNINITIALIZED) {
+ broadcastPackageName = context.getPackageName();
+ }
+ return broadcastPackageName;
+ }
+
+ /**
+ * Set the Package Name to send the status broadcasts to, or {@code null}
+ * to broadcast to all apps.
+ *
+ * @param packageName The name of the application package to send the
+ * status broadcasts to, or null to broadcast to all.
+ * @see Intent#setPackage(String)
+ */
+ public static void setBroadcastPackageName(String packageName) {
+ TorService.broadcastPackageName = packageName;
+ }
+
private static File getControlSocket(Context context) {
if (controlSocket == null) {
controlSocket = new File(getAppTorServiceDataDir(context), CONTROL_SOCKET_NAME);
@@ -163,6 +182,8 @@ public class TorService extends Service {
private static File appTorServiceDir = null;
private static File controlSocket = null;
private static final String CONTROL_SOCKET_NAME = "ControlSocket";
+ private static final String UNINITIALIZED = "UNINITIALIZED";
+ private static String broadcastPackageName = UNINITIALIZED;
public static int socksPort = -1;
public static int httpTunnelPort = -1;
@@ -477,6 +498,7 @@ public class TorService extends Service {
if (e != null) {
intent.putExtra(Intent.EXTRA_TEXT, e.getLocalizedMessage());
}
+ intent.setPackage(getBroadcastPackageName(context));
intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
context.sendBroadcast(intent);
@@ -485,6 +507,7 @@ public class TorService extends Service {
private static Intent getBroadcastIntent(Context context, String action, String currentStatus) {
Intent intent = new Intent(action);
intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
+ intent.setPackage(getBroadcastPackageName(context));
intent.putExtra(EXTRA_STATUS, currentStatus);
return intent;
}
--
GitLab