upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-06-09 00:42:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/relayd: add session timeout; closes #120

Browse source
This commit is contained in:
Frank Brendel 2017-04-13 10:23:26 +02:00 committed by Franco Fichtner
parent 2260041016
commit 30c8286fe3
3 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/relayd/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= relayd
PLUGIN_VERSION= 1.0
PLUGIN_VERSION= 1.1
PLUGIN_DEPENDS= relayd
PLUGIN_COMMENT= Relayd Load Balancer
PLUGIN_MAINTAINER= franco@opnsense.org

9
net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
View file

@ -284,6 +284,11 @@ function relayd_configure_do($kill_first = false)
if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0 && ($vs_a[$i]['relay_protocol'] != 'dns')) {
$conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n";
}
if (isset($vs_a[$i]['sessiontimeout'])) {
$conf .= " session timeout {$vs_a[$i]['sessiontimeout']} \n";
}
$conf .= "}\n";
} else {
// redirect mode
@ -300,6 +305,10 @@ function relayd_configure_do($kill_first = false)
$conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$check_a[$pools[$vs_a[$i]['sitedown']]['monitor']]} \n";
}
if (isset($vs_a[$i]['sessiontimeout'])) {
$conf .= " session timeout {$vs_a[$i]['sessiontimeout']} \n";
}
$conf .= "}\n";
}
}

26
net/relayd/src/www/load_balancer_virtual_server_edit.php
View file

@ -41,7 +41,7 @@ if (empty($config['load_balancer']['virtual_server']) || !is_array($config['load
$a_vs = &$config['load_balancer']['virtual_server'];
$copy_fields=array('name', 'descr', 'poolname', 'port', 'sitedown', 'ipaddr', 'mode', 'relay_protocol');
$copy_fields=array('name', 'descr', 'poolname', 'port', 'sitedown', 'ipaddr', 'mode', 'relay_protocol', 'sessiontimeout');
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (isset($_GET['id']) && !empty($a_vs[$_GET['id']])) {
$id = $_GET['id'];
@ -100,16 +100,27 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$input_errors[] = gettext("You cannot select a Fall Back Pool when using the DNS relay protocol.");
}
if (isset($pconfig['sessiontimeout']) && $pconfig['sessiontimeout'] !== '' &&
((string)((int)$pconfig['sessiontimeout']) != $pconfig['sessiontimeout'] ||
$pconfig['sessiontimeout'] < 1 || $pconfig['sessiontimeout'] > 2147483647)) {
$input_errors[] = gettext('The session timeout must be a number greater than zero or left blank.');
}
if (count($input_errors) == 0) {
$vsent = array();
foreach ($copy_fields as $fieldname) {
$vsent[$fieldname] = $pconfig[$fieldname];
}
if ($vsent['sitedown'] == "") {
if ($vsent['sitedown'] == '') {
unset($vsent['sitedown']);
}
if ($vsent['sessiontimeout'] == '') {
unset($vsent['sessiontimeout']);
} else {
$vsent['sessiontimeout'] = (int)$vsent['sessiontimeout'];
}
if ($vsent['mode'] != 'relay'){
// relay protocol only applies to relay
/* relay protocol only applies to relay */
unset($vsent['relay_protocol']);
}
@ -314,6 +325,15 @@ include("head.inc");
</td>
</tr>
<tr>
<tr>
<td><a id="help_for_sessiontimeout" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Session Timeout"); ?></td>
<td>
<input type="text" name="sessiontimeout" id="sessiontimeout" value="<?=$pconfig['sessiontimeout'];?>" />
<div class="hidden" for="help_for_sessiontimeout">
<?= sprintf(gettext('This is the timeout in seconds for idle sessions. The default timeout is %s, the maximum is %s (%s years).'), 600, 2147483647, (int)(2147483647 / 60 / 60 / 24 / 365)) ?>
</div>
</td>
</tr>
<td>&nbsp;</td>
<td>
<input name="Save" type="submit" class="btn btn-primary" value="<?=gettext("Submit"); ?>" />