mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-01-21 07:55:00 +00:00
b0c75b7849
- Includes SocksPort and "Download software packages over Tor" feature,
as well as setting upstream bridges.
- "Download software packages over Tor" option is enabled by default.
- When upgrading, if Tor app was enabled and "Download software
packages over Tor" was enabled, then Tor Proxy will be installed.
- The default tor instance is now called tor@default. The "tor" service
is an multi-instance master that has Wants relation all instances.
Tests:
- Tests for Tor and Tor Proxy passed.
- Enable Tor, and run the tests for Tor Proxy. Afterwards, Tor is still
enabled and running.
- Enable Tor Proxy, and run the tests for Tor. Afterwards, Tor Proxy is
still enabled and running.
- Test setting upstream bridges for Tor and Tor Proxy.
- Install FreedomBox 23.11 in a VM and install Tor with default
settings. Install new FreedomBox version with Tor Proxy. After
install, both Tor and Tor Proxy apps are installed and running.
/etc/tor/instances/{plinth,fbxproxy}/torrc both have expected content.
Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
48 lines
1.5 KiB
Python
48 lines
1.5 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
"""Tor utility functions."""
|
|
|
|
from plinth import app as app_module
|
|
from plinth.daemon import app_is_running
|
|
from plinth.modules.names.components import DomainName
|
|
|
|
from . import privileged
|
|
|
|
|
|
def get_status(initialized=True):
|
|
"""Return current Tor status."""
|
|
status = privileged.get_status()
|
|
|
|
hs_info = status['hidden_service']
|
|
hs_services = []
|
|
if hs_info['hostname']:
|
|
try:
|
|
domain = DomainName.get('domain-tor-' + hs_info['hostname'])
|
|
except KeyError:
|
|
pass
|
|
else:
|
|
hs_services = domain.get_readable_services()
|
|
|
|
# Filter out obfs3/4 ports when bridge relay is disabled
|
|
ports = {
|
|
service_type: port
|
|
for service_type, port in status['ports'].items()
|
|
if service_type not in ['obfs4', 'obfs3']
|
|
or status['bridge_relay_enabled']
|
|
}
|
|
|
|
app = app_module.App.get('tor')
|
|
return {
|
|
'enabled': app.is_enabled() if initialized else False,
|
|
'is_running': app_is_running(app) if initialized else False,
|
|
'use_upstream_bridges': status['use_upstream_bridges'],
|
|
'upstream_bridges': status['upstream_bridges'],
|
|
'relay_enabled': status['relay_enabled'],
|
|
'bridge_relay_enabled': status['bridge_relay_enabled'],
|
|
'ports': ports,
|
|
'hs_enabled': hs_info['enabled'],
|
|
'hs_status': hs_info['status'],
|
|
'hs_hostname': hs_info['hostname'],
|
|
'hs_ports': hs_info['ports'],
|
|
'hs_services': hs_services,
|
|
}
|