Skip to content

O
OpnSense
Commit 1b8cad32 authored by Frédéric LIETART (TheLinuxFr)'s avatar Frédéric LIETART (TheLinuxFr) Committed by Franco Fichtner
Browse files
Options

Minor typo fix; closes #938 

(cherry picked from commit f34957ec)
parent 79ac36e5
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 64 deletions
src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/netflow_capture.xml
View file @ 1b8cad32
......@@ -4,7 +4,7 @@
<label>Interfaces</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Select interface(s) to enable netflow on.]]></help>
<help><![CDATA[Select interface(s) to enable NetFlow on.]]></help>
<hint>Type or select interface.</hint>
</field>
<field>
......@@ -12,27 +12,27 @@
<label>Egress only</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Select interfaces used for wan traffic to avoid counting nat traffic twice]]></help>
<help><![CDATA[Select interfaces used for WAN traffic to avoid counting NAT traffic twice.]]></help>
<hint>Type or select interface.</hint>
</field>
<field>
<id>netflow.collect.enable</id>
<label>Capture local</label>
<type>checkbox</type>
<help>Collect netflow data on this firewall, this will automatically append localhost as netflow target</help>
<help>Collect NetFlow data on this firewall, this will automatically append localhost as NetFlow target.</help>
</field>
<field>
<id>netflow.capture.version</id>
<label>Version</label>
<type>dropdown</type>
<help><![CDATA[Select netflow version to use.]]></help>
<help><![CDATA[Select NetFlow version to use.]]></help>
</field>
<field>
<id>netflow.capture.targets</id>
<label>Destinations</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Select destinations to send netflow data to (ip address:port, eg 192.168.0.1:2550).]]></help>
<help><![CDATA[Select destinations to send NetFlow data to (ip address:port, eg 192.168.0.1:2550).]]></help>
<hint>Type or select destinations.</hint>
<allownew>true</allownew>
</field>
......
src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogAlert.xml
View file @ 1b8cad32
<form>
<field>
<id>timestamp</id>
<label>timestamp</label>
<label>Timestamp</label>
<type>info</type>
</field>
<field>
<id>alert</id>
<label>alert</label>
<label>Alert</label>
<type>info</type>
</field>
<field>
<id>alert_sid</id>
<label>alert sid</label>
<label>Alert sid</label>
<type>info</type>
</field>
<field>
<id>src_ip</id>
<label>source ip</label>
<label>Source IP</label>
<type>info</type>
</field>
<field>
<id>dest_ip</id>
<label>destination ip</label>
<label>Destination IP</label>
<type>info</type>
</field>
<field>
<id>src_port</id>
<label>source port</label>
<label>Source port</label>
<type>info</type>
</field>
<field>
<id>dest_port</id>
<label>destination port</label>
<label>Destination port</label>
<type>info</type>
</field>
</form>
src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogRule.xml
View file @ 1b8cad32
......@@ -33,6 +33,6 @@
<id>action</id>
<label>Action</label>
<type>dropdown</type>
<help>set action to perform here, only used when in IPS mode</help>
<help>Set action to perform here, only used when in IPS mode.</help>
</field>
</form>
src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogRuleset.xml
View file @ 1b8cad32
<form>
<field>
<id>enabled</id>
<label>enabled</label>
<label>Enabled</label>
<type>checkbox</type>
<help>enable ruleset</help>
<help>Enable ruleset</help>
</field>
<field>
<id>filename</id>
<label>filename</label>
<label>Filename</label>
<type>info</type>
</field>
<field>
<id>documentation</id>
<label>source</label>
<label>Source</label>
<type>info</type>
</field>
<field>
<id>filter</id>
<label>Input Filter</label>
<type>dropdown</type>
<help>Filter to use when downloading this ruleset, applies this action to all incoming lines</help>
<help>Filter to use when downloading this ruleset, applies this action to all incoming lines.</help>
</field>
</form>
src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml
View file @ 1b8cad32
<form>
<field>
<id>rule.enabled</id>
<label>enabled</label>
<label>Enabled</label>
<type>checkbox</type>
<help>enable this fingerprint rule</help>
<help>Enable this fingerprint rule.</help>
</field>
<field>
<id>rule.fingerprint</id>
<label>SSL/Fingerprint</label>
<type>text</type>
<help>the SSL fingerprint, for example B5:E1:B3:70:5E:7C:FF:EB:92:C4:29:E5:5B:AC:2F:AE:70:17:E9:9E</help>
<help>The SSL fingerprint, for example "B5:E1:B3:70:5E:7C:FF:EB:92:C4:29:E5:5B:AC:2F:AE:70:17:E9:9E".</help>
</field>
<field>
<id>rule.geoip</id>
<label>GeoIP/Country</label>
<type>select_multiple</type>
<style>tokenize</style>
<help>Countries to alert or block using GeoIP</help>
<help>Countries to alert or block using GeoIP.</help>
</field>
<field>
<id>rule.geoip_direction</id>
<label>GeoIP/Direction</label>
<type>dropdown</type>
<help>Connections coming from (src) or going to (dst) listed countries, default selects both </help>
<help>Connections coming from (src) or going to (dst) listed countries, default selects both.</help>
</field>
<field>
<id>rule.action</id>
<label>Action</label>
<type>dropdown</type>
<help>set action to perform here, only used when in IPS mode</help>
<help>Set action to perform here, only used when in IPS mode.</help>
</field>
<field>
<id>rule.description</id>
......
src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/generalSettings.xml
View file @ 1b8cad32
<form>
<field>
<id>ids.general.enabled</id>
<label>enabled</label>
<label>Enabled</label>
<type>checkbox</type>
<help>enable IDS</help>
<help>Enable intrusion detection system.</help>
</field>
<field>
<id>ids.general.ips</id>
<label>IPS mode</label>
<type>checkbox</type>
<help><![CDATA[enable protection mode (block traffic).
before enabling, please disable all hardware offloading first. <br><a href="/system_advanced_network.php">in advanced network</a>
]]></help>
<help><![CDATA[Enable protection mode (block traffic).<br />Before enabling, please disable all hardware offloading first <a href="/system_advanced_network.php">in advanced network</a>.]]></help>
</field>
<field>
<id>ids.general.promisc</id>
<label>promiscuous mode</label>
<label>Promiscuous mode</label>
<type>checkbox</type>
<help><![CDATA[enable promiscuous mode, for certain setups (like IPS with vlans), this is required to actually capture data on the physical interface
]]></help>
<help><![CDATA[Enable promiscuous mode, for certain setups (like IPS with vlans), this is required to actually capture data on the physical interface.]]></help>
</field>
<field>
<id>ids.general.interfaces</id>
<label>interfaces</label>
<label>Interfaces</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Select interface(s) to use. When enabling IPS, only use physical interfaces here (no vlans etc).]]></help>
......
src/opnsense/mvc/app/models/OPNsense/Cron/Cron.xml
View file @ 1b8cad32
......@@ -7,7 +7,7 @@
<origin type="TextField">
<Required>Y</Required>
<mask>/^([a-z,A-Z,1-9]){0,30}$/</mask>
<ValidationMessage>Origin should be regular text of max 30 characters</ValidationMessage>
<ValidationMessage>Origin should be regular text of max 30 characters.</ValidationMessage>
</origin>
<enabled type="BooleanField">
<default>1</default>
......@@ -17,25 +17,25 @@
<default>0</default>
<Required>Y</Required>
<mask>/^((?:\*|[1-5][0-9]|0[0-9]|[0-9])(,{1}|-{1}|\/{1}|$))+$/</mask>
<ValidationMessage>Value needs to be between 0 and 59; multiple values, ranges, steps and asterisk are supported (ex. 1,10,20,30 or 1-30)</ValidationMessage>
<ValidationMessage>Value needs to be between 0 and 59; multiple values, ranges, steps and asterisk are supported (ex. 1,10,20,30 or 1-30).</ValidationMessage>
</minutes>
<hours type="TextField">
<default>0</default>
<Required>Y</Required>
<mask>/^((?:\*|([1][0-9]|[2][0-3])|0[0-9]|[0-9])(,{1}|-{1}|\/{1}|$))+$/</mask>
<ValidationMessage>Value needs to be between 0 and 23; multiple values, ranges, steps and asterisk are supported (ex. 1,2,8 or 0-8)</ValidationMessage>
<ValidationMessage>Value needs to be between 0 and 23; multiple values, ranges, steps and asterisk are supported (ex. 1,2,8 or 0-8).</ValidationMessage>
</hours>
<days type="TextField">
<default>*</default>
<Required>Y</Required>
<mask>/^(((?:\*|[1-2][0-9]|0[1-9]|[1-9]|[3][0-1])(,{1}|-{1}|\/{1}|$))+|L)$/</mask>
<ValidationMessage>Value needs to be between 1 and 31; multiple values, ranges, L (last day of month), steps and asterisk are supported (ex. 1,2,8 or 1-28)</ValidationMessage>
<ValidationMessage>Value needs to be between 1 and 31; multiple values, ranges, L (last day of month), steps and asterisk are supported (ex. 1,2,8 or 1-28).</ValidationMessage>
</days>
<months type="TextField">
<default>*</default>
<Required>Y</Required>
<mask>/^(((?:\*|[1][0-2]|0[1-9]|[1-9]|JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(,{1}|-{1}|\/{1}|$))+)$/</mask>
<ValidationMessage>Value needs to be between 1 and 12 or JAN to DEC, multiple values, ranges, steps and asterisk are supported (ex. JAN,2,10 or 3-8)</ValidationMessage>
<ValidationMessage>Value needs to be between 1 and 12 or JAN to DEC, multiple values, ranges, steps and asterisk are supported (ex. JAN,2,10 or 3-8).</ValidationMessage>
</months>
<weekdays type="TextField">
<default>*</default>
......
src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
View file @ 1b8cad32
......@@ -32,7 +32,7 @@
<targets type="CSVListField">
<Required>N</Required>
<mask>/^((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?):(6553[0-5]|655[0-2][0-9]|65[0-4](\d){2}|6[0-4](\d){3}|[1-5](\d){4}|[1-9](\d){0,3})([,]){0,1})*/u</mask>
<ValidationMessage>Please enter valid targets (e.g. 192.168.0.1:2055)</ValidationMessage>
<ValidationMessage>Please enter valid targets (e.g. 192.168.0.1:2055).</ValidationMessage>
</targets>
</capture>
<collect>
......
src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
View file @ 1b8cad32
......@@ -7,7 +7,7 @@
<rules>
<rule type="ArrayField">
<sid type="IntegerField">
<ValidationMessage>sid should be a number</ValidationMessage>
<ValidationMessage>Sid should be a number.</ValidationMessage>
<Required>Y</Required>
</sid>
<enabled type="BooleanField">
......@@ -34,7 +34,7 @@
<fingerprint type="TextField">
<Required>N</Required>
<mask>/^([0-9a-fA-F:]){59,59}$/u</mask>
<ValidationMessage>A SSL fingerprint should be a 59 character long hex value</ValidationMessage>
<ValidationMessage>A SSL fingerprint should be a 59 character long hex value.</ValidationMessage>
</fingerprint>
<geoip type="CountryField">
<Required>N</Required>
......@@ -53,7 +53,7 @@
<description type="TextField">
<Required>Y</Required>
<mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>
<ValidationMessage>Description should be a string between 1 and 255 characters</ValidationMessage>
<ValidationMessage>Description should be a string between 1 and 255 characters.</ValidationMessage>
</description>
<action type="OptionField">
<Required>Y</Required>
......@@ -116,7 +116,7 @@
</filters>
</queues>
</Model>
<ValidationMessage>Related cron not found</ValidationMessage>
<ValidationMessage>Related cron not found.</ValidationMessage>
<Required>N</Required>
</UpdateCron>
</general>
......
src/opnsense/mvc/app/views/OPNsense/Cron/index.volt
View file @ 1b8cad32
......@@ -121,17 +121,17 @@ POSSIBILITY OF SUCH DAMAGE.
<table id="grid-jobs" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="DialogEdit">
<thead>
<tr>
<th data-column-id="origin" data-type="string" data-visible="false">Origin</th>
<th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">Enabled</th>
<th data-column-id="minutes" data-type="string">Minutes</th>
<th data-column-id="hours" data-type="string">Hours</th>
<th data-column-id="days" data-type="string">Days</th>
<th data-column-id="months" data-type="string">Months</th>
<th data-column-id="weekdays" data-type="string">Weekdays</th>
<th data-column-id="description" data-type="string">Description</th>
<th data-column-id="command" data-type="string">Command</th>
<th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">Edit | Delete</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">ID</th>
<th data-column-id="origin" data-type="string" data-visible="false">{{ lang._('Origin') }}</th>
<th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="minutes" data-type="string">{{ lang._('Minutes') }}</th>
<th data-column-id="hours" data-type="string">{{ lang._('Hours') }}</th>
<th data-column-id="days" data-type="string">{{ lang._('Days') }}</th>
<th data-column-id="months" data-type="string">{{ lang._('Months') }}</th>
<th data-column-id="weekdays" data-type="string">{{ lang._('Weekdays') }}</th>
<th data-column-id="description" data-type="string">{{ lang._('Description') }}</th>
<th data-column-id="command" data-type="string">{{ lang._('Command') }}</th>
<th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Edit') }} | {{ lang._('Delete') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
</tr>
</thead>
<tbody>
......
src/opnsense/mvc/app/views/OPNsense/IDS/index.volt
View file @ 1b8cad32
......@@ -452,17 +452,17 @@ POSSIBILITY OF SUCH DAMAGE.
<tr>
<td><div class="control-label">
<i class="fa fa-info-circle text-muted"></i>
<b>{{ lang._('rulesets') }}</b>
<b>{{ lang._('Rulesets') }}</b>
</div>
</td>
<td>
<table id="grid-rule-files" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="DialogRuleset">
<thead>
<tr>
<th data-column-id="filename" data-type="string" data-visible="false" data-identifier="true">filename</th>
<th data-column-id="filename" data-type="string" data-visible="false" data-identifier="true">{{ lang._('Filename') }}</th>
<th data-column-id="description" data-type="string" data-sortable="false" data-visible="true">{{ lang._('Description') }}</th>
<th data-column-id="modified_local" data-type="rulets" data-sortable="false" data-visible="true">{{ lang._('Last updated') }}</th>
<th data-column-id="filter_str" data-type="string" data-identifier="true">Filter</th>
<th data-column-id="filter_str" data-type="string" data-identifier="true">{{ lang._('Filter') }}</th>
<th data-column-id="enabled" data-formatter="rowtoggle" data-sortable="false" data-width="10em">{{ lang._('Enabled') }}</th>
</tr>
</thead>
......@@ -472,8 +472,8 @@ POSSIBILITY OF SUCH DAMAGE.
<tr>
<td></td>
<td>
<button title="{{ lang._('disable selected') }}" id="disableSelectedRuleSets" type="button" class="btn btn-xs btn-default"><span class="fa fa-square-o command-toggle"></span></button>
<button title="{{ lang._('enable selected') }}" id="enableSelectedRuleSets" type="button" class="btn btn-xs btn-default"><span class="fa fa-check-square-o command-toggle"></span></button>
<button title="{{ lang._('Disable selected') }}" id="disableSelectedRuleSets" type="button" class="btn btn-xs btn-default"><span class="fa fa-square-o command-toggle"></span></button>
<button title="{{ lang._('Enable selected') }}" id="enableSelectedRuleSets" type="button" class="btn btn-xs btn-default"><span class="fa fa-check-square-o command-toggle"></span></button>
</td>
</tr>
</tfoot>
......@@ -487,7 +487,7 @@ POSSIBILITY OF SUCH DAMAGE.
<button class="btn btn-primary" id="reconfigureAct" type="button"><b>{{ lang._('Apply') }}</b><i id="reconfigureAct_progress" class=""></i></button>
<button class="btn btn-primary" id="updateRulesAct" type="button"><b>{{ lang._('Download & Update Rules') }}</b><i id="updateRulesAct_progress" class=""></i></button>
<br/>
<i>{{ lang._('Please use "Download & Update Rules" to fetch your initial ruleset, automatic updating can be scheduled after the first download') }} </i>
<i>{{ lang._('Please use "Download & Update Rules" to fetch your initial ruleset, automatic updating can be scheduled after the first download.') }} </i>
</div>
</div>
<div id="rules" class="tab-pane fade in">
......@@ -509,7 +509,7 @@ POSSIBILITY OF SUCH DAMAGE.
<th data-column-id="source" data-type="string">{{ lang._('Source') }}</th>
<th data-column-id="classtype" data-type="string">{{ lang._('ClassType') }}</th>
<th data-column-id="msg" data-type="string">{{ lang._('Message') }}</th>
<th data-column-id="enabled" data-formatter="rowtoggle" data-sortable="false" data-width="10em">{{ lang._('Info / enabled') }}</th>
<th data-column-id="enabled" data-formatter="rowtoggle" data-sortable="false" data-width="10em">{{ lang._('Info / Enabled') }}</th>
</tr>
</thead>
<tbody>
......@@ -517,8 +517,8 @@ POSSIBILITY OF SUCH DAMAGE.
<tfoot>
<tr>
<td>
<button title="{{ lang._('disable selected') }}" id="disableSelectedRules" type="button" class="btn btn-xs btn-default"><span class="fa fa-square-o command-toggle"></span></button>
<button title="{{ lang._('enable selected') }}" id="enableSelectedRules" type="button" class="btn btn-xs btn-default"><span class="fa fa-check-square-o command-toggle"></span></button>
<button title="{{ lang._('Disable selected') }}" id="disableSelectedRules" type="button" class="btn btn-xs btn-default"><span class="fa fa-square-o command-toggle"></span></button>
<button title="{{ lang._('Enable selected') }}" id="enableSelectedRules" type="button" class="btn btn-xs btn-default"><span class="fa fa-check-square-o command-toggle"></span></button>
</td>
<td></td>
</tr>
......@@ -536,7 +536,7 @@ POSSIBILITY OF SUCH DAMAGE.
<table id="grid-userrules" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="DialogUserDefined">
<thead>
<tr>
<th data-column-id="enabled" data-formatter="rowtoggle" data-sortable="false" data-width="10em">{{ lang._('Enabled') }}</th>
<th data-column-id="enabled" data-formatter="rowtoggle" data-sortable="false" data-width="10em">{{ lang._('Enabled') }}</th>
<th data-column-id="action" data-type="string" data-sortable="true">{{ lang._('Action') }}</th>
<th data-column-id="description" data-type="string" data-sortable="true">{{ lang._('Description') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023