From c8c9326746cbe62956be1d4e3f5fd67611c875cd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 19 Aug 2021 09:07:02 +0200
Subject: [PATCH] Address review feedback for TorPlugin
---
.../briarproject/mailbox/core/server/WebServerManager.kt | 2 +-
.../java/org/briarproject/mailbox/core/tor/TorPlugin.java | 6 +++++-
.../java/org/briarproject/mailbox/core/util/LogUtils.kt | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/server/WebServerManager.kt b/mailbox-core/src/main/java/org/briarproject/mailbox/core/server/WebServerManager.kt
index 335367f3..ef517217 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/server/WebServerManager.kt
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/server/WebServerManager.kt
@@ -16,7 +16,7 @@ import javax.inject.Singleton
class WebServerManager @Inject constructor() : Service {
internal companion object {
- private const val PORT = 8888
+ const val PORT = 8888
private val LOG = getLogger(WebServerManager::class.java)
}
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/TorPlugin.java b/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/TorPlugin.java
index 9f73da2e..432e1b83 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/TorPlugin.java
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/TorPlugin.java
@@ -24,8 +24,10 @@ import net.freehaven.tor.control.EventHandler;
import net.freehaven.tor.control.TorControlConnection;
import org.briarproject.mailbox.core.PoliteExecutor;
+import org.briarproject.mailbox.core.lifecycle.IoExecutor;
import org.briarproject.mailbox.core.lifecycle.Service;
import org.briarproject.mailbox.core.lifecycle.ServiceException;
+import org.briarproject.mailbox.core.server.WebServerManager;
import org.briarproject.mailbox.core.system.Clock;
import org.briarproject.mailbox.core.system.LocationUtils;
import org.briarproject.mailbox.core.system.ResourceProvider;
@@ -215,7 +217,7 @@ abstract class TorPlugin implements Service, EventHandler {
// Check whether we're online
updateConnectionStatus(networkManager.getNetworkStatus());
// Create a hidden service if necessary
- ioExecutor.execute(() -> publishHiddenService("8888"));
+ ioExecutor.execute(() -> publishHiddenService(String.valueOf(WebServerManager.PORT)));
}
private boolean assetsAreUpToDate() {
@@ -313,6 +315,7 @@ abstract class TorPlugin implements Service, EventHandler {
}
}
+ @IoExecutor
private void publishHiddenService(String port) {
if (!state.isTorRunning()) return;
// TODO get stored key
@@ -320,6 +323,7 @@ abstract class TorPlugin implements Service, EventHandler {
publishV3HiddenService(port, privKey3);
}
+ @IoExecutor
private void publishV3HiddenService(String port, @Nullable String privKey) {
LOG.info("Creating v3 hidden service");
Map<Integer, String> portLines = singletonMap(80, "127.0.0.1:" + port);
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/util/LogUtils.kt b/mailbox-core/src/main/java/org/briarproject/mailbox/core/util/LogUtils.kt
index 398094bb..b209ee11 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/util/LogUtils.kt
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/util/LogUtils.kt
@@ -44,8 +44,8 @@ object LogUtils {
* Logs the duration of a task.
*
* @param logger the logger to use
- * @param task a description of the task
- * @param start the start time of the task, as returned by [.now]
+ * @param msg a description of the task
+ * @param start the start time of the task, as returned by [now]
*/
@JvmStatic
fun logDuration(logger: Logger, msg: () -> String, start: Long) {
--
GitLab