lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 02:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

firewall: fix more glitches in outbound alias target

Browse Source
This commit is contained in:
Franco Fichtner 2018-08-16 10:35:39 +02:00
parent 3ddea146e3
commit 5810cc7a31
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opnsense/mvc/app/library/OPNsense/Firewall/SNatRule.php
View File

@ -91,7 +91,7 @@ class SNatRule extends Rule
$rule['target'] = $rule['targetip'] . '/' . $rule['targetip_subnet'];
} elseif (!empty($rule['target']) && Util::isAlias($rule['target'])) {
$rule['target'] = "$".$rule['target'];
if (empty($rule['poolopts']) || substr($rule['poolopts'], 0, 11) != 'round-robin') {
if (!empty($rule['poolopts']) && substr($rule['poolopts'], 0, 11) != 'round-robin') {
// wrong pool type on alias, disable rule
$this->log('SNAT / pool type not round-robin');
$rule['disabled'] = true;

9
src/www/firewall_nat_out_edit.php
View File

@ -134,6 +134,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['ipprotocol'] = 'inet';
}
}
if (empty($pconfig['targetip'])) {
$pconfig['targetip'] = $pconfig['target'];
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
$input_errors = array();
$pconfig = $_POST;
@ -186,7 +189,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$input_errors[] = gettext("A valid target IP address must be specified.");
}
/* Verify Pool Options */
if (!empty($pconfig['targetip']) && is_alias($pconfig['targetip']) && substr($pconfig['poolopts'], 0, 11) != 'round-robin') {
if (!empty($pconfig['targetip']) && is_alias($pconfig['targetip']) && !empty($pconfig['poolopts']) && substr($pconfig['poolopts'], 0, 11) != 'round-robin') {
$input_errors[] = gettext("Only Round Robin pool options may be chosen when selecting an alias.");
}
@ -642,9 +645,9 @@ include("head.inc");
<td>
<select name="targetip" id="targetip" class="selectpicker" data-live-search="true" data-size="5" data-width="auto">
<option value="" <?= empty($pconfig['targetip']) ? "selected=\"selected\"" : "";?> > <?=gettext("Interface address");?> </option>
<option data-other=true value="<?=$pconfig['targetip'];?>" <?= !empty($pconfig['target']) && !array_key_exists($pconfig['targetip'], formTranslateAddresses() ) ? "selected=\"selected\"" : "";?>><?=gettext("Single host or Network"); ?></option>
<option data-other=true value="<?=$pconfig['targetip'];?>" <?= !empty($pconfig['targetip']) && !array_key_exists($pconfig['targetip'], formTranslateAddresses() ) ? "selected=\"selected\"" : "";?>><?=gettext("Single host or Network"); ?></option>
<?php foreach (formTranslateAddresses() as $optKey => $optValue): ?>
<option value="<?=$optKey;?>" <?= $pconfig['target'] == $optKey ? "selected=\"selected\"" : ""; ?>>
<option value="<?=$optKey;?>" <?= $pconfig['targetip'] == $optKey ? "selected=\"selected\"" : ""; ?>>
<?=$optValue;?>
</option>
<?php endforeach; ?>