Add Tor plugin to headless client and introduce new ConfigurationManager

bramble-j2se/src/main/java/org/briarproject/bramble/system/JavaConfigurationManager.java

@@ -0,0 +1,56 @@
+package org.briarproject.bramble.system;
+
+import org.briarproject.bramble.api.ConfigurationManager;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static java.nio.file.Files.setPosixFilePermissions;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@NotNullByDefault
+class JavaConfigurationManager implements ConfigurationManager {
+
+	private static final Logger LOG =
+			Logger.getLogger(JavaConfigurationManager.class.getName());
+
+	@Inject
+	public JavaConfigurationManager() {
+		try {
+			ensurePermissions(getAppDir());
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+		}
+	}
+
+	@Override
+	public File getAppDir() {
+		String home = System.getProperty("user.home");
+		return new File(home + File.separator + ".briar");
+	}
+
+	private void ensurePermissions(File file)throws IOException {
+		if (!file.exists()) {
+			if (!file.mkdirs()) {
+				throw new IOException("Could not create directory");
+			}
+		}
+		Set<PosixFilePermission> perms = new HashSet<>();
+		perms.add(OWNER_READ);
+		perms.add(OWNER_WRITE);
+		perms.add(OWNER_EXECUTE);
+		setPosixFilePermissions(file.toPath(), perms);
+	}
+
+}

bramble-java/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java

@@ -1,5 +1,6 @@
 package org.briarproject.bramble.system;
 
+import org.briarproject.bramble.api.ConfigurationManager;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 
@@ -11,6 +12,13 @@ import dagger.Provides;
 @Module
 public class JavaSystemModule {
 
+	@Provides
+	@Singleton
+	ConfigurationManager provideConfigurationManager(
+			JavaConfigurationManager configurationManager) {
+		return configurationManager;
+	}
+
 	@Provides
 	@Singleton
 	LocationUtils provideLocationUtils(JavaLocationUtils locationUtils) {

briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.java

@@ -1,7 +1,10 @@
 package org.briarproject.briar.headless;
+
+import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.HeadlessAccountModule;
 import org.briarproject.bramble.system.DesktopSecureRandomModule;
+import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
 
 import javax.inject.Singleton;
@@ -16,6 +19,7 @@ import dagger.Component;
 		HeadlessModule.class
 })
 @Singleton
-public interface BriarHeadlessApp {
+public interface BriarHeadlessApp
+		extends BrambleCoreEagerSingletons, BriarCoreEagerSingletons {
 	Router router();
 }

briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.java

@@ -1,67 +1,73 @@
 package org.briarproject.briar.headless;
 
+import org.briarproject.bramble.api.ConfigurationManager;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginConfig;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
 import org.briarproject.bramble.api.reporting.DevConfig;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.ResourceProvider;
+import org.briarproject.bramble.network.JavaNetworkModule;
+import org.briarproject.bramble.plugin.tor.CircumventionModule;
+import org.briarproject.bramble.plugin.tor.CircumventionProvider;
+import org.briarproject.bramble.plugin.tor.LinuxTorPluginFactory;
+import org.briarproject.bramble.system.JavaSystemModule;
 import org.briarproject.bramble.util.StringUtils;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.attribute.PosixFilePermission;
 import java.security.GeneralSecurityException;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.concurrent.Executor;
-import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.inject.Singleton;
+import javax.net.SocketFactory;
 
 import dagger.Module;
 import dagger.Provides;
 
-import static java.nio.file.Files.setPosixFilePermissions;
-import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
-import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
-import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 import static java.util.Collections.emptyList;
-import static java.util.logging.Level.WARNING;
+import static java.util.Collections.singletonList;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_ONION_ADDRESS;
 import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBLIC_KEY_HEX;
 
-@Module
+@Module(includes = {
+		JavaNetworkModule.class,
+		JavaSystemModule.class,
+		CircumventionModule.class
+})
 public class HeadlessModule {
 
-	private final static Logger LOG = getLogger(HeadlessModule.class.getName());
-
-	private final String appDir;
-
-	public HeadlessModule() {
-		String home = System.getProperty("user.home");
-		appDir = home + File.separator + ".briar";
-		try {
-			ensurePermissions(new File(appDir));
-		} catch (IOException e) {
-			LOG.log(WARNING, e.getMessage(), e);
-		}
-	}
-
 	@Provides
 	@Singleton
-	DatabaseConfig provideDatabaseConfig() {
+	DatabaseConfig provideDatabaseConfig(
-		File dbDir = appDir("db");
+			ConfigurationManager configurationManager) {
-		File keyDir = appDir("key");
+		File dbDir = appDir(configurationManager, "db");
+		File keyDir = appDir(configurationManager, "key");
 		return new HeadlessDatabaseConfig(dbDir, keyDir);
 	}
 
 	@Provides
-	PluginConfig providePluginConfig() {
+	PluginConfig providePluginConfig(@IoExecutor Executor ioExecutor,
-		Collection<DuplexPluginFactory> duplex = emptyList();
+			SocketFactory torSocketFactory, BackoffFactory backoffFactory,
+			NetworkManager networkManager, LocationUtils locationUtils,
+			EventBus eventBus, ResourceProvider resourceProvider,
+			CircumventionProvider circumventionProvider, Clock clock,
+			ConfigurationManager configurationManager) {
+		File torDirectory = appDir(configurationManager, "tor");
+		DuplexPluginFactory tor = new LinuxTorPluginFactory(ioExecutor,
+				networkManager, locationUtils, eventBus, torSocketFactory,
+				backoffFactory, resourceProvider, circumventionProvider, clock,
+				torDirectory);
+		Collection<DuplexPluginFactory> duplex = singletonList(tor);
 		@NotNullByDefault
 		PluginConfig pluginConfig = new PluginConfig() {
 
@@ -85,7 +91,8 @@ public class HeadlessModule {
 
 	@Provides
 	@Singleton
-	DevConfig provideDevConfig(CryptoComponent crypto) {
+	DevConfig provideDevConfig(CryptoComponent crypto,
+			ConfigurationManager configurationManager) {
 		@NotNullByDefault
 		DevConfig devConfig = new DevConfig() {
 
@@ -106,27 +113,15 @@ public class HeadlessModule {
 
 			@Override
 			public File getReportDir() {
-				return appDir("reportDir");
+				return appDir(configurationManager, "reportDir");
 			}
 		};
 		return devConfig;
 	}
 
-	private File appDir(String file) {
+	private File appDir(ConfigurationManager configurationManager,
-		return new File(appDir + File.separator + file);
+			String file) {
-	}
+		return new File(configurationManager.getAppDir(), file);
-
-	private void ensurePermissions(File file)throws IOException {
-		if (!file.exists()) {
-			if (!file.mkdirs()) {
-				throw new IOException("Could not create directory");
-			}
-		}
-		Set<PosixFilePermission> perms = new HashSet<>();
-		perms.add(OWNER_READ);
-		perms.add(OWNER_WRITE);
-		perms.add(OWNER_EXECUTE);
-		setPosixFilePermissions(file.toPath(), perms);
 	}
 
 }

briar-headless/src/main/java/org/briarproject/briar/headless/Main.java

@@ -1,5 +1,8 @@
 package org.briarproject.briar.headless;
 
+import org.briarproject.bramble.BrambleCoreModule;
+import org.briarproject.briar.BriarCoreModule;
+
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
@@ -16,10 +19,14 @@ public class Main {
 			}
 		}
 
-		DaggerBriarHeadlessApp
+		BriarHeadlessApp app = DaggerBriarHeadlessApp.builder()
-				.create()
+				.headlessModule(new HeadlessModule()).build();
-				.router()
+		// We need to load the eager singletons directly after making the
-				.start();
+		// dependency graphs
+		BrambleCoreModule.initEagerSingletons(app);
+		BriarCoreModule.initEagerSingletons(app);
+
+		app.router().start();
 	}
 
 }