diff --git a/security/tor/Makefile b/security/tor/Makefile index ba90fb86f..b6fb0bfe8 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= tor -PLUGIN_VERSION= 1.9 +PLUGIN_VERSION= 1.10 PLUGIN_COMMENT= The Onion Router PLUGIN_DEPENDS= tor ruby rubygem-rexml PLUGIN_MAINTAINER= franz.fabian.94@gmail.com diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/relay.xml b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/relay.xml index 5997b877d..40f86a268 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/relay.xml +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/relay.xml @@ -54,6 +54,13 @@ text You can enter a publicly visible (obfuscated) email address into this field to allow other users to notify you if there are issues with your relay. + + relay.family + + text + Fingerprints of other relays controlled or administered by the same group or organization. Do not list any bridge relay as it would compromise its concealment. + true + relay.bandwithrate diff --git a/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.xml index c81f06f8e..2d4ced170 100644 --- a/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.xml +++ b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.xml @@ -54,6 +54,11 @@ N ]+$/]]> + + N + + /^[a-fA-F0-9,]+$/ + N diff --git a/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc b/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc index 8e0e11240..c92807af0 100644 --- a/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc +++ b/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc @@ -171,6 +171,12 @@ OutboundBindAddress {{ OPNsense.tor.relay.outboundbindv6 }} Nickname {{ OPNsense.tor.relay.nick }} {% endif %} +{% if helpers.exists('OPNsense.tor.relay.family') and OPNsense.tor.relay.family != '' %} +{% if OPNsense.tor.relay.relay|default('1') != '1' %} +MyFamily {{ OPNsense.tor.relay.family }} +{% endif %} +{% endif %} + {% if helpers.exists('OPNsense.tor.relay.contact_info') and OPNsense.tor.relay.contact_info != '' %} ContactInfo {{ OPNsense.tor.relay.contact_info }} {% endif %}