Skip to content
Snippets Groups Projects
Verified Commit be7f5cf9 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

fixup! Bug 42247: Android helpers for the TorProvider 

Some wiring for TorSettings and TorConnect stuff and fixes to the one I
created previously.
parent 130882cc
Branches
Tags
1 merge request!889Bug 42366: Tor Browser 115.7.0esr alpha rebase
Show whitespace changes
Inline Side-by-side
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
+ 8
− 0
View file @ be7f5cf9
......@@ -1002,6 +1002,14 @@ public final class GeckoRuntime implements Parcelable {
return mPushController;
}
/**
* Get the Tor integration controller for this runtime.
*/
@UiThread
public @NonNull TorIntegrationAndroid getTorIntegrationController() {
return mTorIntegration;
}
/**
* Appends notes to crash report.
*
......
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java
+ 103
− 20
View file @ be7f5cf9
......@@ -9,6 +9,10 @@ package org.mozilla.geckoview;
import android.content.Context;
import android.util.Log;
import androidx.annotation.AnyThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
......@@ -22,6 +26,7 @@ import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
......@@ -32,13 +37,24 @@ import org.mozilla.gecko.util.BundleEventListener;
import org.mozilla.gecko.util.EventCallback;
import org.mozilla.gecko.util.GeckoBundle;
/* package */ class TorIntegrationAndroid implements BundleEventListener {
public class TorIntegrationAndroid implements BundleEventListener {
private static final String TAG = "TorIntegrationAndroid";
private static final String TOR_EVENT_START = "GeckoView:Tor:StartTor";
private static final String TOR_EVENT_STOP = "GeckoView:Tor:StopTor";
private static final String MEEK_EVENT_START = "GeckoView:Tor:StartMeek";
private static final String MEEK_EVENT_STOP = "GeckoView:Tor:StopMeek";
// Events we listen to
private static final String EVENT_TOR_START = "GeckoView:Tor:StartTor";
private static final String EVENT_TOR_STOP = "GeckoView:Tor:StopTor";
private static final String EVENT_MEEK_START = "GeckoView:Tor:StartMeek";
private static final String EVENT_MEEK_STOP = "GeckoView:Tor:StopMeek";
// Events we emit
private static final String EVENT_SETTINGS_GET = "GeckoView:Tor:SettingsGet";
private static final String EVENT_SETTINGS_SET = "GeckoView:Tor:SettingsSet";
private static final String EVENT_SETTINGS_APPLY = "GeckoView:Tor:SettingsApply";
private static final String EVENT_SETTINGS_SAVE = "GeckoView:Tor:SettingsSave";
private static final String EVENT_BOOTSTRAP_BEGIN = "GeckoView:Tor:BootstrapBegin";
private static final String EVENT_BOOTSTRAP_BEGIN_AUTO = "GeckoView:Tor:BootstrapBeginAuto";
private static final String EVENT_BOOTSTRAP_CANCEL = "GeckoView:Tor:BootstrapCancel";
private static final String EVENT_BOOTSTRAP_GET_STATE = "GeckoView:Tor:BootstrapGetState";
private static final String CONTROL_PORT_FILE = "/control-ipc";
private static final String SOCKS_FILE = "/socks-ipc";
......@@ -63,7 +79,7 @@ import org.mozilla.gecko.util.GeckoBundle;
private final HashMap<Integer, MeekTransport> mMeeks = new HashMap<>();
private int mMeekCounter;
public TorIntegrationAndroid(Context context) {
/* package */ TorIntegrationAndroid(Context context) {
mLibraryDir = context.getApplicationInfo().nativeLibraryDir;
mCacheDir = context.getCacheDir().toPath();
mIpcDirectory = mCacheDir + "/tor-private";
......@@ -71,7 +87,7 @@ import org.mozilla.gecko.util.GeckoBundle;
registerListener();
}
public synchronized void shutdown() {
/* package */ synchronized void shutdown() {
// FIXME: It seems this never gets called
if (mTorProcess != null) {
mTorProcess.shutdown();
......@@ -83,21 +99,21 @@ import org.mozilla.gecko.util.GeckoBundle;
EventDispatcher.getInstance()
.registerUiThreadListener(
this,
TOR_EVENT_START,
MEEK_EVENT_START,
MEEK_EVENT_STOP);
EVENT_TOR_START,
EVENT_MEEK_START,
EVENT_MEEK_STOP);
}
@Override // BundleEventListener
public synchronized void handleMessage(
final String event, final GeckoBundle message, final EventCallback callback) {
if (TOR_EVENT_START.equals(event)) {
if (EVENT_TOR_START.equals(event)) {
startDaemon(message, callback);
} else if (TOR_EVENT_STOP.equals(event)) {
} else if (EVENT_TOR_STOP.equals(event)) {
stopDaemon(message, callback);
} else if (MEEK_EVENT_START.equals(event)) {
} else if (EVENT_MEEK_START.equals(event)) {
startMeek(message, callback);
} else if (MEEK_EVENT_STOP.equals(event)) {
} else if (EVENT_MEEK_STOP.equals(event)) {
stopMeek(message, callback);
}
}
......@@ -145,9 +161,9 @@ import org.mozilla.gecko.util.GeckoBundle;
}
class TorProcess extends Thread {
private static final String TOR_EVENT_STARTED = "GeckoView:Tor:TorStarted";
private static final String TOR_EVENT_START_FAILED = "GeckoView:Tor:TorStartFailed";
private static final String TOR_EVENT_EXITED = "GeckoView:Tor:TorExited";
private static final String EVENT_TOR_STARTED = "GeckoView:Tor:TorStarted";
private static final String EVENT_TOR_START_FAILED = "GeckoView:Tor:TorStartFailed";
private static final String EVENT_TOR_EXITED = "GeckoView:Tor:TorExited";
private final String mHandle;
private Process mProcess = null;
......@@ -202,14 +218,14 @@ import org.mozilla.gecko.util.GeckoBundle;
final GeckoBundle data = new GeckoBundle(2);
data.putString("handle", mHandle);
data.putString("error", e.getMessage());
EventDispatcher.getInstance().dispatch(TOR_EVENT_START_FAILED, data);
EventDispatcher.getInstance().dispatch(EVENT_TOR_START_FAILED, data);
return;
}
Log.i(TAG, "Tor process " + mHandle + " started.");
{
final GeckoBundle data = new GeckoBundle(1);
data.putString("handle", mHandle);
EventDispatcher.getInstance().dispatch(TOR_EVENT_STARTED, data);
EventDispatcher.getInstance().dispatch(EVENT_TOR_STARTED, data);
}
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
......@@ -232,7 +248,7 @@ import org.mozilla.gecko.util.GeckoBundle;
// FIXME: We usually don't reach this when the application is killed!
// So, we don't do our cleanup.
Log.i(TAG, "Tor process " + mHandle + " has exited.");
EventDispatcher.getInstance().dispatch(TOR_EVENT_EXITED, data);
EventDispatcher.getInstance().dispatch(EVENT_TOR_EXITED, data);
}
private void cleanIpcDirectory() {
......@@ -432,4 +448,71 @@ import org.mozilla.gecko.util.GeckoBundle;
}
}
}
public static class BootstrapState {
// FIXME: We can do better than this :)
public GeckoBundle mBundle;
BootstrapState(GeckoBundle bundle) {
mBundle = bundle;
}
}
public interface BootstrapStateChangeListener {
void onBootstrapStateChange(BootstrapState state);
}
public @NonNull GeckoResult<GeckoBundle> getSettings() {
return EventDispatcher.getInstance().queryBundle(EVENT_SETTINGS_GET);
}
public @NonNull GeckoResult<Void> saveSettings(final GeckoBundle settings) {
return EventDispatcher.getInstance().queryVoid(EVENT_SETTINGS_SET, settings);
}
public @NonNull GeckoResult<Void> applySettings() {
return EventDispatcher.getInstance().queryVoid(EVENT_SETTINGS_APPLY);
}
public @NonNull GeckoResult<Void> saveSettings() {
return EventDispatcher.getInstance().queryVoid(EVENT_SETTINGS_SAVE);
}
public @NonNull GeckoResult<Void> beginBootstrap() {
return EventDispatcher.getInstance().queryVoid(EVENT_BOOTSTRAP_BEGIN);
}
public @NonNull GeckoResult<Void> beginAutoBootstrap(final String countryCode) {
final GeckoBundle bundle = new GeckoBundle(1);
bundle.putString("countryCode", countryCode);
return EventDispatcher.getInstance().queryVoid(EVENT_BOOTSTRAP_BEGIN_AUTO, bundle);
}
public @NonNull GeckoResult<Void> beginAutoBootstrap() {
return beginAutoBootstrap(null);
}
public @NonNull GeckoResult<Void> cancelBootstrap() {
return EventDispatcher.getInstance().queryVoid(EVENT_BOOTSTRAP_CANCEL);
}
public @NonNull GeckoResult<BootstrapState> getBootstrapState() {
return EventDispatcher.getInstance().queryBundle(EVENT_BOOTSTRAP_GET_STATE).map(new GeckoResult.OnValueMapper<>() {
@AnyThread
@Nullable
public BootstrapState onValue(@Nullable GeckoBundle value) throws Throwable {
return new BootstrapState(value);
}
});
}
public void registerBootstrapStateChangeListener(BootstrapStateChangeListener listener) {
mBootstrapStateListeners.add(listener);
}
public void unregisterBootstrapStateChangeListener(BootstrapStateChangeListener listener) {
mBootstrapStateListeners.remove(listener);
}
private final HashSet<BootstrapStateChangeListener> mBootstrapStateListeners = new HashSet<>();
}
toolkit/modules/TorAndroidIntegration.sys.mjs
+ 31
− 6
View file @ be7f5cf9
......@@ -8,6 +8,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
EventDispatcher: "resource://gre/modules/Messaging.sys.mjs",
TorConnect: "resource://gre/modules/TorConnect.sys.mjs",
TorConnectTopics: "resource://gre/modules/TorConnect.sys.mjs",
TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
TorSettings: "resource://gre/modules/TorSettings.sys.mjs",
});
......@@ -25,9 +26,15 @@ const logger = new ConsoleAPI({
const ListenedEvents = Object.freeze({
settingsGet: "GeckoView:Tor:SettingsGet",
// The data is passed directly to TorSettings.
settingsSet: "GeckoView:Tor:SettingsSet",
settingsApply: "GeckoView:Tor:SettingsApply",
settingsSave: "GeckoView:Tor:SettingsSave",
bootstrapBegin: "GeckoView:Tor:BootstrapBegin",
// Optionally takes a countryCode, as data.countryCode.
bootstrapBeginAuto: "GeckoView:Tor:BootstrapBeginAuto",
bootstrapCancel: "GeckoView:Tor:BootstrapCancel",
bootstrapGetState: "GeckoView:Tor:BootstrapGetState",
});
class TorAndroidIntegrationImpl {
......@@ -41,6 +48,10 @@ class TorAndroidIntegrationImpl {
this.#bootstrapMethodReset();
Services.prefs.addObserver(Prefs.useNewBootstrap, this);
for (const topic in lazy.TorConnectTopics) {
Services.obs.addObserver(this, topic);
}
}
async #initNewBootstrap() {
......@@ -67,6 +78,8 @@ class TorAndroidIntegrationImpl {
this.#bootstrapMethodReset();
}
break;
case lazy.TorConnectTopics.StateChange:
break;
}
}
......@@ -74,24 +87,36 @@ class TorAndroidIntegrationImpl {
logger.debug(`Received event ${event}`, data);
try {
switch (event) {
case settingsGet:
case ListenedEvents.settingsGet:
callback?.onSuccess(lazy.TorSettings.getSettings());
return;
case settingsSet:
case ListenedEvents.settingsSet:
// This does not throw, so we do not have any way to report the error!
lazy.TorSettings.setSettings(data);
break;
case settingsApply:
case ListenedEvents.settingsApply:
await lazy.TorSettings.applySettings();
break;
case settingsSave:
case ListenedEvents.settingsSave:
await lazy.TorSettings.saveSettings();
break;
case ListenedEvents.bootstrapBegin:
lazy.TorConnect.beginBootstrap();
break;
case ListenedEvents.bootstrapBeginAuto:
lazy.TorConnect.beginAutoBootstrap(data.countryCode);
break;
case ListenedEvents.bootstrapCancel:
lazy.TorConnect.cancelBootstrap();
break;
case ListenedEvents.bootstrapGetState:
callback?.onSuccess(lazy.TorConnect.state);
return;
}
callback?.onSuccess();
} catch (e) {
logger.error();
callback?.sendError(e);
logger.error(`Error while handling event ${event}`, e);
callback?.onError(e);
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment