mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-01-21 07:55:00 +00:00
- 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>
129 lines
4.8 KiB
Python
129 lines
4.8 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
"""
|
|
Forms for configuring Tor.
|
|
"""
|
|
|
|
import re
|
|
|
|
from django import forms
|
|
from django.core.exceptions import ValidationError
|
|
from django.core.validators import validate_ipv46_address
|
|
from django.forms import widgets
|
|
from django.utils.translation import gettext_lazy as _
|
|
|
|
from plinth import cfg
|
|
from plinth.utils import format_lazy
|
|
|
|
|
|
class TrimmedCharField(forms.CharField):
|
|
"""Trim the contents of a CharField"""
|
|
|
|
def clean(self, value):
|
|
"""Clean and validate the field value"""
|
|
if value:
|
|
value = value.strip()
|
|
value = value.replace('\r\n', '\n')
|
|
|
|
return super().clean(value)
|
|
|
|
|
|
def bridges_validator(bridges):
|
|
"""Validate upstream bridges entries."""
|
|
validation_error = ValidationError(
|
|
_('Enter a valid bridge with this format: '
|
|
'[transport] IP:ORPort [fingerprint]'), code='invalid')
|
|
|
|
bridges = [bridge.strip() for bridge in bridges.split('\n')]
|
|
bridges = [bridge for bridge in bridges if bridge]
|
|
if not bridges:
|
|
raise validation_error
|
|
|
|
for bridge in bridges:
|
|
parts = [part for part in bridge.split() if part]
|
|
|
|
# IP:ORPort is required, transport and fingerprint are optional.
|
|
# Transports may have additional options after the fingerprint.
|
|
try:
|
|
ip_port_part = parts[0]
|
|
if re.match('[a-z_][a-z0-9_]*', parts[0]):
|
|
ip_port_part = parts[1]
|
|
except IndexError:
|
|
raise validation_error
|
|
|
|
match = re.match(r'\[([a-fA-F0-9:]+)\](?::([0-9]+))?', ip_port_part)
|
|
if match:
|
|
ip_address = match.group(1)
|
|
port = match.group(2)
|
|
else:
|
|
ip_parts = ip_port_part.rsplit(':', maxsplit=1)
|
|
ip_address = ip_parts[0]
|
|
port = ip_parts[1] if len(ip_parts) > 1 else None
|
|
|
|
try:
|
|
validate_ipv46_address(ip_address)
|
|
except ValidationError:
|
|
raise validation_error
|
|
|
|
if port:
|
|
port = int(port)
|
|
if port < 0 or port > 65535:
|
|
raise validation_error
|
|
|
|
|
|
class TorCommonForm(forms.Form):
|
|
"""Tor common configuration form."""
|
|
use_upstream_bridges = forms.BooleanField(
|
|
label=_('Use upstream bridges to connect to Tor network'),
|
|
required=False, help_text=_(
|
|
'When enabled, the bridges configured below will be used to '
|
|
'connect to the Tor network. Use this option if your Internet '
|
|
'Service Provider (ISP) blocks or censors connections to the '
|
|
'Tor Network. This will disable relay modes.'))
|
|
upstream_bridges = TrimmedCharField(
|
|
widget=widgets.Textarea, label=_('Upstream bridges'), required=False,
|
|
help_text=_(
|
|
'You can get some bridges from <a '
|
|
'href="https://bridges.torproject.org/">'
|
|
'https://bridges.torproject.org/</a> and copy/paste the bridge '
|
|
'information here. Currently supported transports are none, '
|
|
'obfs3, obfs4 and scamblesuit.'), validators=[bridges_validator])
|
|
|
|
|
|
class TorForm(TorCommonForm):
|
|
"""Tor configuration form."""
|
|
relay_enabled = forms.BooleanField(
|
|
label=_('Enable Tor relay'), required=False, help_text=format_lazy(
|
|
_('When enabled, your {box_name} will run a Tor relay and donate '
|
|
'bandwidth to the Tor network. Do this if you have more than '
|
|
'2 megabits/s of upload and download bandwidth.'),
|
|
box_name=_(cfg.box_name)))
|
|
bridge_relay_enabled = forms.BooleanField(
|
|
label=_('Enable Tor bridge relay'), required=False,
|
|
help_text=format_lazy(
|
|
_('When enabled, relay information is published in the Tor bridge '
|
|
'database instead of public Tor relay database making it harder '
|
|
'to censor this node. This helps others circumvent censorship.'),
|
|
box_name=_(cfg.box_name)))
|
|
hs_enabled = forms.BooleanField(
|
|
label=_('Enable Tor Onion Service'), required=False,
|
|
help_text=format_lazy(
|
|
_('An onion service will allow {box_name} to provide selected '
|
|
'services (such as wiki or chat) without revealing its '
|
|
'location. Do not use this for strong anonymity yet.'),
|
|
box_name=_(cfg.box_name)))
|
|
|
|
def clean(self):
|
|
"""Validate the form for cross-field integrity."""
|
|
cleaned_data = super().clean()
|
|
use_upstream_bridges = cleaned_data.get('use_upstream_bridges')
|
|
upstream_bridges = cleaned_data.get('upstream_bridges')
|
|
|
|
if use_upstream_bridges and not upstream_bridges:
|
|
self.add_error(
|
|
'upstream_bridges',
|
|
ValidationError(
|
|
_('Specify at least one upstream bridge to use upstream '
|
|
'bridges.'), code='invalid'))
|
|
|
|
return cleaned_data
|