Merge pull request #386 from opnsense/tor

security/tor: fix help string, add memory limit; closes #384
This commit is contained in:
Fabian Franz, BSc
2017-11-20 18:55:49 +01:00
committed by GitHub
5 changed files with 17 additions and 2 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= tor
PLUGIN_VERSION= 1.2
PLUGIN_VERSION= 1.3
PLUGIN_COMMENT= The Onion Router
PLUGIN_DEPENDS= tor ruby
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
@@ -101,4 +101,11 @@
<help>Enable this, if you want to map onion services to the IP pool configured above.</help>
<advanced>true</advanced>
</field>
<field>
<id>general.max_memory_in_queues</id>
<label>Maximum Memory In Queues (MB)</label>
<type>text</type>
<help>If this amount of memory is reached, Tor will close circuits until 10% of this limit are free again.</help>
<advanced>true</advanced>
</field>
</form>
@@ -52,7 +52,7 @@
<id>relay.relay</id>
<label>Bridge</label>
<type>checkbox</type>
<help>A bridge is a private relay. It is not visible in the public directory. Check this if you want to become a relay (public).</help>
<help>A bridge is a private relay. It is not visible in the public directory. Uncheck this if you want to become a public relay.</help>
</field>
<field>
<id>relay.publish</id>
@@ -117,5 +117,9 @@
</auth_cookie>
</client_auth>
</client_authentications>
<max_memory_in_queues type="IntegerField">
<MinimumValue>0</MinimumValue>
<Required>N</Required>
</max_memory_in_queues>
</items>
</model>
@@ -97,6 +97,10 @@ HidServAuth {{ service.onion_service }} {{ service.auth_cookie }}
{% endfor %}
{% endif %}
{% if helpers.exists('OPNsense.tor.general.max_memory_in_queues') and OPNsense.tor.general.max_memory_in_queues != '' %}
MaxMemInQueues {{ OPNsense.tor.general.max_memory_in_queues }} MB
{% endif %}
{% if helpers.exists('OPNsense.tor.hiddenservice') and helpers.exists('OPNsense.tor.hiddenserviceacl') and helpers.exists('OPNsense.tor.hiddenserviceacl.hiddenserviceacl') %}
############### This section is just for location-hidden services ###