security/tor: change "hidden" to "onion"

Requested by: @lattera
This commit is contained in:
Franco Fichtner
2017-10-11 18:10:11 +02:00
parent 6105bf5152
commit b74cd9d12b
9 changed files with 18 additions and 18 deletions
@@ -56,7 +56,7 @@
<id>general.fascist_firewall</id>
<label>Fascist Mode</label>
<type>checkbox</type>
<help>This try to circumvent censorship. Please note that the fascist mode does not support "Hidden Services".</help>
<help>This try to circumvent censorship. Please note that the fascist mode does not support "Onion Services".</help>
</field>
<field>
<id>general.fascist_firewall_ports</id>
@@ -3,13 +3,13 @@
<id>hiddenservice.enabled</id>
<label>Enable</label>
<type>checkbox</type>
<help>Enable this hidden service.</help>
<help>Enable this Onion service.</help>
</field>
<field>
<id>hiddenservice.name</id>
<label>Name</label>
<type>text</type>
<help>Enter a directory name for the hidden service. It may consist of lowercase and uppercase characters.</help>
<help>Enter a directory name for the Onion service. It may consist of lowercase and uppercase characters.</help>
</field>
<field>
<id>hiddenservice.type</id>
@@ -23,6 +23,6 @@
<type>select_multiple</type>
<style>tokenize</style>
<allownew>true</allownew>
<help>If configured, only clients that are listed here are authorized to access the hidden service.</help>
<help>If configured, only clients that are listed here are authorized to access the Onion service.</help>
</field>
</form>
@@ -3,11 +3,11 @@
<id>hiddenserviceacl.enabled</id>
<label>Enable</label>
<type>checkbox</type>
<help>Enable this hidden service.</help>
<help>Enable this Onion service.</help>
</field>
<field>
<id>hiddenserviceacl.hiddenservice</id>
<label>Hidden Service</label>
<label>Onion Service</label>
<type>dropdown</type>
</field>
<field>
@@ -1,6 +1,6 @@
<model>
<mount>//OPNsense/tor/hiddenservice</mount>
<description>Tor hidden service configuration</description>
<description>Tor Onion service configuration</description>
<version>1.0.0</version>
<items>
<service type="ArrayField">
@@ -1,6 +1,6 @@
<model>
<mount>//OPNsense/tor/hiddenserviceacl</mount>
<description>Tor Hidden Service ACL</description>
<description>Tor Onion Service ACL</description>
<items>
<hiddenserviceacl type="ArrayField">
<enabled type="BooleanField">
@@ -15,7 +15,7 @@
<display>name</display>
</template>
</Model>
<ValidationMessage>A hidden service must be set.</ValidationMessage>
<ValidationMessage>An Onion service must be set.</ValidationMessage>
<Multiple>N</Multiple>
<Required>Y</Required>
</hiddenservice>
@@ -121,8 +121,8 @@ $( document ).ready(function() {
<ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
<li class="active"><a data-toggle="tab" href="#general">{{ lang._('General') }}</a></li>
<li><a data-toggle="tab" href="#acl">{{ lang._('SOCKS Proxy ACL') }}</a></li>
<li><a data-toggle="tab" href="#hidden">{{ lang._('Hidden Services') }}</a></li>
<li><a data-toggle="tab" href="#hiddenrouting">{{ lang._('Hidden Service Routing') }}</a></li>
<li><a data-toggle="tab" href="#hidden">{{ lang._('Onion Services') }}</a></li>
<li><a data-toggle="tab" href="#hiddenrouting">{{ lang._('Onion Service Routing') }}</a></li>
<li><a data-toggle="tab" href="#relay">{{ lang._('Relaying') }}</a></li>
<li><a data-toggle="tab" href="#exitnodeacl">{{ lang._('Exit Node ACL') }}</a></li>
</ul>
@@ -190,7 +190,7 @@ $( document ).ready(function() {
<thead>
<tr>
<th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="hiddenservice" data-type="string" data-visible="true">{{ lang._('Hidden Service') }}</th>
<th data-column-id="hiddenservice" data-type="string" data-visible="true">{{ lang._('Onion Service') }}</th>
<th data-column-id="port" data-type="string" data-visible="true">{{ lang._('Port') }}</th>
<th data-column-id="target_host" data-type="string" data-visible="true">{{ lang._('Target Host') }}</th>
<th data-column-id="target_port" data-type="string" data-visible="true">{{ lang._('Target Port') }}</th>
@@ -254,6 +254,6 @@ $( document ).ready(function() {
</div>
{{ partial("layout_partials/base_dialog",['fields': toracl,'id':'toracldlg', 'label':lang._('Edit ACL Entry')]) }}
{{ partial("layout_partials/base_dialog",['fields': hidden_service,'id':'hiddenservicedlg', 'label':lang._('Edit Hidden Service')]) }}
{{ partial("layout_partials/base_dialog",['fields': hidden_service_acl,'id':'hiddenserviceacl', 'label':lang._('Edit Hidden Service Route')]) }}
{{ partial("layout_partials/base_dialog",['fields': hidden_service,'id':'hiddenservicedlg', 'label':lang._('Edit Onion Service')]) }}
{{ partial("layout_partials/base_dialog",['fields': hidden_service_acl,'id':'hiddenserviceacl', 'label':lang._('Edit Onion Service Route')]) }}
{{ partial("layout_partials/base_dialog",['fields': exitpolicy,'id':'torexitacldlg', 'label':lang._('Edit Exit Node ACL')]) }}
@@ -56,7 +56,7 @@ $( document ).ready(function() {
</script>
<ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
<li class="active"><a data-toggle="tab" href="#hiddennames">{{ lang._('Hidden Service Names') }}</a></li>
<li class="active"><a data-toggle="tab" href="#hiddennames">{{ lang._('Onion Service Names') }}</a></li>
</ul>
<div class="tab-content content-box tab-content" style="padding-bottom: 1.5em;">
@@ -64,7 +64,7 @@ $( document ).ready(function() {
<table style="margin: 10px;">
<thead>
<tr>
<th>{{ lang._('Hidden Service Name') }}</th>
<th>{{ lang._('Onion Service Name') }}</th>
<th>{{ lang._('Hostname') }}</th>
</tr>
</thead>
@@ -32,4 +32,4 @@ message:generate Tor control key
command:/usr/local/opnsense/service/scripts/tor/get_hostnames
parameters:
type:script_output
message:query hostnames of hidden services
message:Query hostnames of Onion services
@@ -12,7 +12,7 @@ chown _tor:_tor /var/log/tor.log
chown _tor:_tor /var/run/tor
# create hidden service dirs:
# create Onion service dirs:
/usr/local/opnsense/service/scripts/tor/make_hidden_service_dirs.php
# required to access the pf device for nat