-
Notifications
You must be signed in to change notification settings - Fork 71
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for system tor #3046
Merged
HenrikJannsen
merged 13 commits into
bisq-network:main
from
HenrikJannsen:add-support-for-system-tor
Dec 11, 2024
Merged
Add support for system tor #3046
HenrikJannsen
merged 13 commits into
bisq-network:main
from
HenrikJannsen:add-support-for-system-tor
Dec 11, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Dec 7, 2024
Closed
Found some issues... |
…artsWith. Rename getProcessCommandLineStream to getProcessCommandStream
Add default values for embedded Tor and external Tor.
Add external_tor.config to resources. Add support for TOR_SKIP_LAUNCH Environment variable. Add BootstrapEvents and BootstrapStates for useExternalTor case.
Log commands (hiding auth data).
Treat Whonix as external Tor case.
Move setting of useExternalTor to TorService. Move setting of CONNECT_TO_EXTERNAL_TOR to TorService.
HenrikJannsen
force-pushed
the
add-support-for-system-tor
branch
from
December 9, 2024 14:10
b57c610
to
570f2bf
Compare
Changed the initial comment to reflect the changes after the initial commit. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for using external tor process.
We provide now the
external_tor.config
config file in the tor directory.It has a flag
UseExternalTor
to enable the usage of external Tor.Alternatively One can set the environment variable
TOR_SKIP_LAUNCH
, or use the the JVM config [1]-Dapplication.network.configByTransportType.tor.useExternalTor
.If Bisq runs on a Whonix system we use the Whonix system Tor process (The
external_tor.config
can be used for customizing the config).If cookie authentication is enabled at the external Tor torrc file, the user need to edit the
external_tor.config
config file to mirror theCookieAuthentication
andCookieAuthFile
value from torrc.ControlPort
is set to the default value127.0.0.1:9051
.The SOCKS port will be dynamically requested from the Tor control server.
In case the connection to the external Tor fails, Bisq falls back to the embedded Tor (except for Whonix, in which case we fail).
This PR addresses issues raised in #1924. In case @adrelanos would have time for a review, it would be highly appreciated.
Open issue:
It would be also a good feature to allow the embedded Tor process to stay running after Bisq gets closed. This would align better with Tor network usage and would speed up next Bisq start.
See #3048
[1] See https://github.com/bisq-network/bisq2/blob/main/docs/dev/build.md how to pass JVM args to the Bisq application.