diff --git a/src/etc/ssl/opnsense.cnf b/src/etc/ssl/opnsense.cnf index de7e1e9ed..996bf0974 100644 --- a/src/etc/ssl/opnsense.cnf +++ b/src/etc/ssl/opnsense.cnf @@ -48,11 +48,11 @@ database = $dir/index.txt # database index file. # several ctificates with same subject. new_certs_dir = $dir/newcerts # default place for new certs. -certificate = $dir/cacert.pem # The CA certificate -serial = $dir/serial # The current serial number +certificate = $dir/cacert.pem # The CA certificate +serial = $dir/serial # The current serial number crlnumber = $dir/crlnumber # the current crl number # must be commented out to leave a V1 CRL -crl = $dir/crl.pem # The current CRL +crl = $dir/crl.pem # The current CRL private_key = $dir/private/cakey.pem# The private key RANDFILE = $dir/private/.rand # private random number file @@ -60,8 +60,8 @@ x509_extensions = usr_cert # The extentions to add to the cert # Comment out the following two lines for the "traditional" # (and highly broken) format. -name_opt = ca_default # Subject Name options -cert_opt = ca_default # Certificate field options +name_opt = ca_default # Subject Name options +cert_opt = ca_default # Certificate field options # Extension copying option: use with caution. # copy_extensions = copy @@ -105,7 +105,7 @@ emailAddress = optional #################################################################### [ req ] default_bits = 1024 -default_keyfile = privkey.pem +default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes x509_extensions = v3_ca # The extentions to add to the self signed cert @@ -331,7 +331,7 @@ default_tsa = tsa_config1 # the default TSA section dir = ./demoCA # TSA root directory serial = $dir/tsaserial # The current serial number (mandatory) crypto_device = builtin # OpenSSL engine to use for signing -signer_cert = $dir/tsacert.pem # The TSA signing certificate +signer_cert = $dir/tsacert.pem # The TSA signing certificate # (optional) certs = $dir/cacert.pem # Certificate chain to include in reply # (optional) diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml index 0a2665b23..10b576ae0 100644 --- a/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml +++ b/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml @@ -8,4 +8,4 @@ api/ids/* - \ No newline at end of file + diff --git a/src/www/firewall_aliases.php b/src/www/firewall_aliases.php index ecb2ae399..7f68e914e 100644 --- a/src/www/firewall_aliases.php +++ b/src/www/firewall_aliases.php @@ -93,49 +93,49 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['id']) && isset($a_aliases[$_POST['id']])) { // perform validation /* make sure rule is not being referenced by any nat or filter rules */ - $is_alias_referenced = false; - $referenced_by = false; - $alias_name = $a_aliases[$_POST['id']]['name']; - // Firewall rules - find_alias_reference(array('filter', 'rule'), array('source', 'address'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('filter', 'rule'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('filter', 'rule'), array('source', 'port'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('filter', 'rule'), array('destination', 'port'), $alias_name, $is_alias_referenced, $referenced_by); - // NAT Rules - find_alias_reference(array('nat', 'rule'), array('source', 'address'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'rule'), array('source', 'port'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'rule'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'rule'), array('destination', 'port'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'rule'), array('target'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'rule'), array('local-port'), $alias_name, $is_alias_referenced, $referenced_by); - // NAT 1:1 Rules - //find_alias_reference(array('nat', 'onetoone'), array('external'), $alias_name, $is_alias_referenced, $referenced_by); - //find_alias_reference(array('nat', 'onetoone'), array('source', 'address'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'onetoone'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by); - // NAT Outbound Rules - find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('source', 'network'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('sourceport'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('dstport'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('target'), $alias_name, $is_alias_referenced, $referenced_by); - // Alias in an alias - find_alias_reference(array('aliases', 'alias'), array('address'), $alias_name, $is_alias_referenced, $referenced_by); - // Load Balancer - find_alias_reference(array('load_balancer', 'lbpool'), array('port'), $alias_name, $is_alias_referenced, $referenced_by); - find_alias_reference(array('load_balancer', 'virtual_server'), array('port'), $alias_name, $is_alias_referenced, $referenced_by); - // Static routes - find_alias_reference(array('staticroutes', 'route'), array('network'), $alias_name, $is_alias_referenced, $referenced_by); - if($is_alias_referenced) { - $savemsg = sprintf(gettext("Cannot delete alias. Currently in use by %s"), $referenced_by); - } else { - unset($a_aliases[$_POST['id']]); - if (write_config()) { - filter_configure(); - mark_subsystem_dirty('aliases'); - } + $is_alias_referenced = false; + $referenced_by = false; + $alias_name = $a_aliases[$_POST['id']]['name']; + // Firewall rules + find_alias_reference(array('filter', 'rule'), array('source', 'address'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('filter', 'rule'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('filter', 'rule'), array('source', 'port'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('filter', 'rule'), array('destination', 'port'), $alias_name, $is_alias_referenced, $referenced_by); + // NAT Rules + find_alias_reference(array('nat', 'rule'), array('source', 'address'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'rule'), array('source', 'port'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'rule'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'rule'), array('destination', 'port'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'rule'), array('target'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'rule'), array('local-port'), $alias_name, $is_alias_referenced, $referenced_by); + // NAT 1:1 Rules + //find_alias_reference(array('nat', 'onetoone'), array('external'), $alias_name, $is_alias_referenced, $referenced_by); + //find_alias_reference(array('nat', 'onetoone'), array('source', 'address'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'onetoone'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by); + // NAT Outbound Rules + find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('source', 'network'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('sourceport'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('dstport'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('nat', 'advancedoutbound', 'rule'), array('target'), $alias_name, $is_alias_referenced, $referenced_by); + // Alias in an alias + find_alias_reference(array('aliases', 'alias'), array('address'), $alias_name, $is_alias_referenced, $referenced_by); + // Load Balancer + find_alias_reference(array('load_balancer', 'lbpool'), array('port'), $alias_name, $is_alias_referenced, $referenced_by); + find_alias_reference(array('load_balancer', 'virtual_server'), array('port'), $alias_name, $is_alias_referenced, $referenced_by); + // Static routes + find_alias_reference(array('staticroutes', 'route'), array('network'), $alias_name, $is_alias_referenced, $referenced_by); + if($is_alias_referenced) { + $savemsg = sprintf(gettext("Cannot delete alias. Currently in use by %s"), $referenced_by); + } else { + unset($a_aliases[$_POST['id']]); + if (write_config()) { + filter_configure(); + mark_subsystem_dirty('aliases'); + } header("Location: firewall_aliases.php?tab=" . $selected_tab); - exit; - } + exit; + } } } } diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php index fb62928e4..e1b7fbc3e 100644 --- a/src/www/firewall_aliases_edit.php +++ b/src/www/firewall_aliases_edit.php @@ -308,16 +308,16 @@ include("head.inc");
- 0) print_input_errors($input_errors); ?> + 0) print_input_errors($input_errors); ?>
-
+

-
+
-
+
@@ -410,15 +410,15 @@ include("head.inc"); "?> - diff --git a/src/www/firewall_aliases_import.php b/src/www/firewall_aliases_import.php index 35784d903..5e7c458e1 100644 --- a/src/www/firewall_aliases_import.php +++ b/src/www/firewall_aliases_import.php @@ -154,8 +154,8 @@ include("head.inc"); 0) print_input_errors($input_errors); ?>
-
-

+
+

diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php index dea402e29..854883b20 100644 --- a/src/www/firewall_nat.php +++ b/src/www/firewall_nat.php @@ -81,42 +81,42 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $id = $pconfig['id']; } if (isset($pconfig['apply'])) { - write_config(); - filter_configure(); - $savemsg = get_std_save_message(); - clear_subsystem_dirty('natconf'); - clear_subsystem_dirty('filter'); - } elseif (isset($pconfig['act']) && $pconfig['act'] == 'del' && isset($id)) { + write_config(); + filter_configure(); + $savemsg = get_std_save_message(); + clear_subsystem_dirty('natconf'); + clear_subsystem_dirty('filter'); + } elseif (isset($pconfig['act']) && $pconfig['act'] == 'del' && isset($id)) { // delete nat rule and associated rule if it exists if (isset($a_nat[$id]['associated-rule-id'])) { - delete_id($a_nat[$id]['associated-rule-id'], $config['filter']['rule']); - mark_subsystem_dirty('filter'); - } - unset($a_nat[$id]); + delete_id($a_nat[$id]['associated-rule-id'], $config['filter']['rule']); + mark_subsystem_dirty('filter'); + } + unset($a_nat[$id]); - if (write_config()) { - mark_subsystem_dirty('natconf'); - } - header("Location: firewall_nat.php"); - exit; - } elseif (isset($pconfig['act']) && $pconfig['act'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) { + if (write_config()) { + mark_subsystem_dirty('natconf'); + } + header("Location: firewall_nat.php"); + exit; + } elseif (isset($pconfig['act']) && $pconfig['act'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) { /* delete selected rules */ foreach ($pconfig['rule'] as $rulei) { if (isset($a_nat[$rulei])) { $target = $rule['target']; - // Check for filter rule associations - if (isset($a_nat[$rulei]['associated-rule-id'])){ + // Check for filter rule associations + if (isset($a_nat[$rulei]['associated-rule-id'])){ delete_id($a_nat[$rulei]['associated-rule-id'], $config['filter']['rule']); mark_subsystem_dirty('filter'); } - unset($a_nat[$rulei]); + unset($a_nat[$rulei]); } - } - if (write_config()) { + } + if (write_config()) { mark_subsystem_dirty('natconf'); } - header("Location: firewall_nat.php"); - exit; + header("Location: firewall_nat.php"); + exit; } elseif ( isset($pconfig['act']) && $pconfig['act'] == 'move') { // move records if (isset($pconfig['rule']) && count($pconfig['rule']) > 0) { @@ -183,41 +183,41 @@ $( document ).ready(function() { if (id != 'x') { // delete single BootstrapDialog.show({ - type:BootstrapDialog.TYPE_INFO, - title: "", - message: "", - buttons: [{ + type:BootstrapDialog.TYPE_INFO, + title: "", + message: "", + buttons: [{ label: "", action: function(dialogRef) { dialogRef.close(); }}, { - label: "", - action: function(dialogRef) { - $("#id").val(id); + label: "", + action: function(dialogRef) { + $("#id").val(id); $("#action").val("del"); - $("#iform").submit() - } + $("#iform").submit() + } }] - }); + }); } else { // delete selected BootstrapDialog.show({ - type:BootstrapDialog.TYPE_INFO, - title: "", - message: "", - buttons: [{ + type:BootstrapDialog.TYPE_INFO, + title: "", + message: "", + buttons: [{ label: "", action: function(dialogRef) { dialogRef.close(); }}, { - label: "", - action: function(dialogRef) { - $("#id").val(""); + label: "", + action: function(dialogRef) { + $("#id").val(""); $("#action").val("del_x"); - $("#iform").submit() - } + $("#iform").submit() + } }] - }); + }); } }); @@ -276,7 +276,7 @@ $( document ).ready(function() {
- + - + @@ -380,7 +380,7 @@ $( document ).ready(function() {   - + @@ -398,7 +398,7 @@ $( document ).ready(function() { - + @@ -414,7 +414,7 @@ $( document ).ready(function() { - "> + ">" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> @@ -423,9 +423,9 @@ $( document ).ready(function() { "> - - - + + + diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php index f66c327c3..8bf9d6b79 100644 --- a/src/www/firewall_nat_edit.php +++ b/src/www/firewall_nat_edit.php @@ -553,13 +553,13 @@ $( document ).ready(function() { @@ -879,7 +879,7 @@ $( document ).ready(function() { - + - @@ -926,7 +926,7 @@ $( document ).ready(function() { - - + - @@ -955,7 +955,7 @@ $( document ).ready(function() { - diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc index c8f6b3fd5..57354f54a 100644 --- a/src/www/guiconfig.inc +++ b/src/www/guiconfig.inc @@ -163,7 +163,7 @@ function do_input_validation($postdata, $reqdfields, $reqdfieldsn, &$input_error for ($i = 0; $i < count($reqdfields); $i++) { // why.. do you want to do this? we send data to validate and then validate something else.... // can't now for sure if any page uses this wrong behaviour, but it should die eventually. - // TODO: kill + // TODO: kill if (empty($_POST[$reqdfields[$i]]) && empty($_REQUEST[$reqdfields[$i]])) { $input_errors[] = sprintf(gettext("The field %s is required."), $reqdfieldsn[$i]); } @@ -475,7 +475,7 @@ function address_to_pconfig($adr, &$padr, &$pmask, &$pnot, &$pbeginport, &$pendp else $pmask = 32; } - + } if (isset($adr['not']))
@@ -385,10 +385,10 @@ include("head.inc"); "?> - -
- -
 
 
+ +
@@ -910,7 +910,7 @@ $( document ).ready(function() {