Skip to content

O
OpnSense
Commit b9f42f82 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner
Browse files
Options

(legacy) refactor services_dhcpv6_relay.php 

(cherry picked from commit 719c1e92)
parent 1d6e6a93
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 178 deletions
src/www/services_dhcpv6_relay.php
View file @ b9f42f82
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com>. Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com>.
Copyright (C) 2010 Ermal Luçi Copyright (C) 2010 Ermal Luçi
Copyright (C) 2010 Seth Mos Copyright (C) 2010 Seth Mos
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc"); require_once("services.inc");
$pconfig['enable'] = isset($config['dhcrelay6']['enable']);
if (empty($config['dhcrelay6']['interface']))
$pconfig['interface'] = array();
else
$pconfig['interface'] = explode(",", $config['dhcrelay6']['interface']);
$pconfig['server'] = $config['dhcrelay6']['server'];
$pconfig['agentoption'] = isset($config['dhcrelay6']['agentoption']);
$iflist = get_configured_interface_with_descr(); if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['enable'] = isset($config['dhcrelay6']['enable']);
if (empty($config['dhcrelay6']['interface'])) {
$pconfig['interface'] = array();
} else {
$pconfig['interface'] = explode(",", $config['dhcrelay6']['interface']);
}
if (empty($config['dhcrelay6']['server'])) {
$pconfig['server'] = "";
} else {
$pconfig['server'] = $config['dhcrelay6']['server'];
}
$pconfig['agentoption'] = isset($config['dhcrelay6']['agentoption']);
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
$input_errors = array();
$pconfig = $_POST;
/* input validation */
$reqdfields = explode(" ", "server interface");
$reqdfieldsn = array(gettext("Destination Server"), gettext("Interface"));
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
if (!empty($pconfig['server'])) {
$checksrv = explode(",", $pconfig['server']);
foreach ($checksrv as $srv) {
if (!is_ipaddrv6($srv)) {
$input_errors[] = gettext("A valid Destination Server IPv6 address must be specified.");
}
}
}
if (count($input_errors) == 0) {
$config['dhcrelay6']['enable'] = !empty($pconfig['enable']);
$config['dhcrelay6']['interface'] = implode(",", $pconfig['interface']);
$config['dhcrelay6']['agentoption'] = !empty($pconfig['agentoption']);
$config['dhcrelay6']['server'] = $pconfig['server'];
write_config();
// reconfigure
services_dhcrelay6_configure();
header("Location: services_dhcpv6_relay.php");
exit;
}
}
/* set the enabled flag which will tell us if DHCP server is enabled /* set the enabled flag which will tell us if DHCP server is enabled
* on any interface. We will use this to disable dhcp-relay since * on any interface. We will use this to disable dhcp-relay since
...@@ -49,45 +85,11 @@ $iflist = get_configured_interface_with_descr(); ...@@ -49,45 +85,11 @@ $iflist = get_configured_interface_with_descr();
*/ */
$dhcpd_enabled = false; $dhcpd_enabled = false;
if (is_array($config['dhcpdv6'])) { if (is_array($config['dhcpdv6'])) {
foreach($config['dhcpdv6'] as $dhcp) foreach($config['dhcpdv6'] as $dhcp) {
if (isset($dhcp['enable'])) if (isset($dhcp['enable'])) {
$dhcpd_enabled = true; $dhcpd_enabled = true;
} }
}
if ($_POST) {
unset($input_errors);
$pconfig = $_POST;
/* input validation */
if ($_POST['enable']) {
$reqdfields = explode(" ", "server interface");
$reqdfieldsn = array(gettext("Destination Server"), gettext("Interface"));
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
if ($_POST['server']) {
$checksrv = explode(",", $_POST['server']);
foreach ($checksrv as $srv) {
if (!is_ipaddrv6($srv))
$input_errors[] = gettext("A valid Destination Server IPv6 address must be specified.");
}
}
}
if (!$input_errors) {
$config['dhcrelay6']['enable'] = $_POST['enable'] ? true : false;
$config['dhcrelay6']['interface'] = implode(",", $_POST['interface']);
$config['dhcrelay6']['agentoption'] = $_POST['agentoption'] ? true : false;
$config['dhcrelay6']['server'] = $_POST['server'];
write_config();
$retval = 0;
$retval = services_dhcrelay6_configure();
$savemsg = get_std_save_message();
}
} }
$service_hook = 'dhcrelay6'; $service_hook = 'dhcrelay6';
...@@ -98,111 +100,87 @@ include("head.inc"); ...@@ -98,111 +100,87 @@ include("head.inc");
<body> <body>
<script type="text/javascript">
//<![CDATA[
function enable_change(enable_over) {
if (document.iform.enable.checked || enable_over) {
document.iform.server.disabled = 0;
document.iform.interface.disabled = 0;
document.iform.agentoption.disabled = 0;
} else {
document.iform.server.disabled = 1;
document.iform.interface.disabled = 1;
document.iform.agentoption.disabled = 1;
}
}
//]]>
</script>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main">
<section class="page-content-main"> <div class="container-fluid">
<div class="row">
<div class="container-fluid"> <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<?php if (isset($savemsg)) print_info_box($savemsg); ?>
<div class="row"> <section class="col-xs-12">
<div class="content-box">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?> <form method="post" name="iform" id="iform">
<?php if (isset($savemsg)) print_info_box($savemsg); ?> <?php if ($dhcpd_enabled): ?>
<p><?= gettext('DHCPv6 Server is currently enabled. Cannot enable the DHCPv6 Relay service while the DHCPv6 Server is enabled on any interface.') ?></p>
<section class="col-xs-12"> <?php else: ?>
<header class="content-box-head container-fluid">
<div class="content-box"> <h3><?=gettext("DHCPv6 Relay configuration"); ?></h3>
</header>
<form action="services_dhcpv6_relay.php" method="post" name="iform" id="iform"> <div class="content-box-main ">
<div class="table-responsive">
<?php if ($dhcpd_enabled): ?> <table class="table table-striped">
<p><?= gettext('DHCPv6 Server is currently enabled. Cannot enable the DHCPv6 Relay service while the DHCPv6 Server is enabled on any interface.') ?></p> <tr>
<?php else: ?> <td width="22%"><i class="fa fa-info-circle text-muted"></i> <?= gettext('Enable') ?></td>
<td width="78%">
<header class="content-box-head container-fluid"> <input name="enable" type="checkbox" value="yes" <?=!empty($pconfig['enable']) ? "checked=\"checked\"" : ""; ?>/>
<h3><?=gettext("DHCPv6 Relay configuration"); ?></h3> <strong><?=gettext("Enable DHCPv6 relay on interface");?></strong>
</header> </td>
</tr>
<div class="content-box-main "> <tr>
<div class="table-responsive"> <td><a id="help_for_interface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('Interface(s)') ?></td>
<table class="table table-striped table-sort"> <td>
<select name="interface[]" multiple="multiple" class="selectpicker">
<tr> <?php
<td width="22%" valign="top" class="vncellreq"><?= gettext('Enable') ?></td> $iflist = get_configured_interface_with_descr();
<td width="78%" class="vtable"> foreach ($iflist as $ifent => $ifdesc):
<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" /> if (!is_ipaddrv6(get_interface_ipv6($ifent))) {
<strong><?php printf(gettext("Enable DHCPv6 relay on interface"));?></strong> continue;
</td> }?>
</tr>
<tr> <option value="<?=$ifent;?>" <?=!empty($pconfig['interface']) && in_array($ifent, $pconfig['interface']) ? " selected=\"selected\"" : "";?> >
<td width="22%" valign="top" class="vncellreq"><?= gettext('Interface(s)') ?></td> <?=$ifdesc;?>
<td width="78%" class="vtable"> </option>
<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3"> <?php
<?php endforeach;?>
foreach ($iflist as $ifent => $ifdesc) { </select>
if (!is_ipaddrv6(get_interface_ipv6($ifent))) <div class="hidden" for="help_for_interface">
continue; <?=gettext("Interfaces without an IPv6 address will not be shown."); ?>
echo "<option value=\"{$ifent}\""; </div>
if (!empty($pconfig['interface']) && in_array($ifent, $pconfig['interface'])) </td>
echo " selected=\"selected\""; </tr>
echo ">{$ifdesc}</option>\n"; <tr>
} <td><a id="help_for_agentoption" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Append circuit ID");?></td>
?> <td>
</select> <input name="agentoption" type="checkbox" value="yes" <?=!empty($pconfig['agentoption']) ? "checked=\"checked\"" : ""; ?> />
<br /><?=gettext("Interfaces without an IPv6 address will not be shown."); ?> <div class="hidden" for="help_for_agentoption">
</td> <?php printf(gettext("If this is checked, the DHCPv6 relay will append the circuit ID (%s interface number) and the agent ID to the DHCPv6 request."), $g['product_name']); ?>
</tr> </div>
<tr> </td>
<td width="22%" valign="top" class="vtable">&nbsp;</td> </tr>
<td width="78%" class="vtable"> <tr>
<input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked=\"checked\""; ?> /> <td><a id="help_for_server" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Destination server");?></td>
<strong><?=gettext("Append circuit ID and agent ID to requests"); ?></strong><br /> <td>
<?php printf(gettext("If this is checked, the DHCPv6 relay will append the circuit ID (%s interface number) and the agent ID to the DHCPv6 request."), $g['product_name']); ?></td> <input name="server" type="text" value="<?=!empty($pconfig['server']) ? htmlspecialchars($pconfig['server']):"";?>" />
</tr> <div class="hidden" for="help_for_server">
<tr> <?=gettext("This is the IPv6 address of the server to which DHCPv6 requests are relayed. You can enter multiple server IPv6 addresses, separated by commas. ");?>
<td width="22%" valign="top" class="vncell"><?=gettext("Destination server");?></td> </div>
<td width="78%" class="vtable"> </td>
<input name="server" type="text" class="formfld unknown" id="server" size="20" value="<?=htmlspecialchars($pconfig['server']);?>" /> </tr>
<br /> <tr>
<?=gettext("This is the IPv6 address of the server to which DHCPv6 requests are relayed. You can enter multiple server IPv6 addresses, separated by commas. ");?> <td></td>
</td> <td>
</tr> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" />
<tr> </td>
<td width="22%" valign="top">&nbsp;</td> </tr>
<td width="78%"> </table>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" onclick="enable_change(true)" /> </div>
</td> </div>
</tr> <?php
</table> endif; ?>
</div> </form>
</div> </div>
<?php endif; ?> </section>
</form> </div>
</div> </div>
</section> </section>
</div>
</div>
</section>
<script type="text/javascript">
//<![CDATA[
enable_change(false);
//]]>
</script>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
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