Skip to content

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

(legacy) refactor services_unbound_host_edit.php 

(cherry picked from commit 6f417404)
parent 8b43d302
Show whitespace changes
Inline Side-by-side
Showing with 251 additions and 379 deletions
src/www/services_unbound_host_edit.php
View file @ dd59e442
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
Copyright (C) 2015 Manuel Faux <mfaux@conf.at> Copyright (C) 2015 Manuel Faux <mfaux@conf.at>
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2014 Warren Baker <warren@decoy.co.za> Copyright (C) 2014 Warren Baker <warren@decoy.co.za>
Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
All rights reserved. All rights reserved.
...@@ -33,91 +33,71 @@ require_once("guiconfig.inc"); ...@@ -33,91 +33,71 @@ require_once("guiconfig.inc");
require_once("services.inc"); require_once("services.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound_overrides.php');
function hostcmp($a, $b) function hostcmp($a, $b)
{ {
return strcasecmp($a['host'], $b['host']); return strcasecmp($a['host'], $b['host']);
} }
function hosts_sort() if (empty($config['unbound']['hosts']) || !is_array($config['unbound']['hosts'])) {
{
global $config;
if (!isset($config['unbound']['hosts'])) {
return;
}
usort($config['unbound']['hosts'], "hostcmp");
}
if (!is_array($config['unbound']['hosts']))
$config['unbound']['hosts'] = array(); $config['unbound']['hosts'] = array();
}
$a_hosts = &$config['unbound']['hosts']; $a_hosts = &$config['unbound']['hosts'];
if (is_numericint($_GET['id'])) if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (isset($_GET['id']) && !empty($a_hosts[$_GET['id']])) {
$id = $_GET['id']; $id = $_GET['id'];
if (isset($_POST['id']) && is_numericint($_POST['id'])) }
$pconfig = array();
foreach (array('rr', 'host', 'domain', 'ip', 'mxprio', 'mx', 'descr') as $fieldname) {
if (isset($id) && !empty($a_hosts[$id][$fieldname])) {
$pconfig[$fieldname] = $a_hosts[$id][$fieldname];
} else {
$pconfig[$fieldname] = null;
}
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (isset($_POST['id']) && !empty($a_hosts[$_POST['id']])) {
$id = $_POST['id']; $id = $_POST['id'];
if (isset($id) && $a_hosts[$id]) {
/* Backwards compatibility for records created before introducing different RR types. */
if (!isset($a_hosts[$id]['rr'])) {
$a_hosts[$id]['rr'] = 'A';
} }
$pconfig['host'] = $a_hosts[$id]['host']; $input_errors = array();
$pconfig['domain'] = $a_hosts[$id]['domain'];
$pconfig['rr'] = $a_hosts[$id]['rr'];
$pconfig['ip'] = $a_hosts[$id]['ip'];
$pconfig['mxprio'] = $a_hosts[$id]['mxprio'];
$pconfig['mx'] = $a_hosts[$id]['mx'];
$pconfig['descr'] = $a_hosts[$id]['descr'];
$pconfig['aliases'] = $a_hosts[$id]['aliases'];
}
if ($_POST) {
unset($input_errors);
$pconfig = $_POST; $pconfig = $_POST;
/* input validation */ /* input validation */
$reqdfields = explode(" ", "domain rr"); $reqdfields = explode(" ", "domain rr");
$reqdfieldsn = array(gettext("Domain"),gettext("Type")); $reqdfieldsn = array(gettext("Domain"),gettext("Type"));
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
if (($_POST['host'] && !is_hostname($_POST['host']))) { if (!empty($pconfig['host']) && !is_hostname($pconfig['host'])) {
$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'."); $input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
} }
if (($_POST['domain'] && !is_domain($_POST['domain']))) { if (!empty($pconfig['domain']) && !is_domain($pconfig['domain'])) {
$input_errors[] = gettext("A valid domain must be specified."); $input_errors[] = gettext("A valid domain must be specified.");
} }
switch ($_POST['rr']) { switch ($pconfig['rr']) {
case 'A': /* also: AAAA */ case 'A': /* also: AAAA */
$reqdfields = explode(" ", "ip"); $reqdfields = explode(" ", "ip");
$reqdfieldsn = array(gettext("IP address")); $reqdfieldsn = array(gettext("IP address"));
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); if (!empty($pconfig['ip']) && !is_ipaddr($pconfig['ip'])) {
if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) {
$input_errors[] = gettext("A valid IP address must be specified."); $input_errors[] = gettext("A valid IP address must be specified.");
} }
break; break;
case 'MX': case 'MX':
$reqdfields = explode(" ", "mxprio mx"); $reqdfields = explode(" ", "mxprio mx");
$reqdfieldsn = array(gettext("MX Priority"), gettext("MX Host")); $reqdfieldsn = array(gettext("MX Priority"), gettext("MX Host"));
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); if (!empty($pconfig['mxprio']) && !is_numericint($pconfig['mxprio'])) {
if (($_POST['mxprio'] && !is_numericint($_POST['mxprio']))) {
$input_errors[] = gettext("A valid MX priority must be specified."); $input_errors[] = gettext("A valid MX priority must be specified.");
} }
if (($_POST['mx'] && !is_domain($_POST['mx']))) { if (!empty($pconfig['mx']) && !is_domain($pconfig['mx'])) {
$input_errors[] = gettext("A valid MX host must be specified."); $input_errors[] = gettext("A valid MX host must be specified.");
} }
break; break;
...@@ -125,267 +105,165 @@ if ($_POST) { ...@@ -125,267 +105,165 @@ if ($_POST) {
$input_errors[] = gettext("A valid resource record type must be specified."); $input_errors[] = gettext("A valid resource record type must be specified.");
break; break;
} }
if (count($input_errors) == 0) {
/* collect aliases */
$aliases = array();
foreach ($_POST as $key => $value) {
$entry = '';
if (!substr_compare('aliashost', $key, 0, 9)) {
$entry = substr($key, 9);
$field = 'host';
}
elseif (!substr_compare('aliasdomain', $key, 0, 11)) {
$entry = substr($key, 11);
$field = 'domain';
}
elseif (!substr_compare('aliasdescription', $key, 0, 16)) {
$entry = substr($key, 16);
$field = 'description';
}
if (ctype_digit($entry)) {
$aliases[$entry][$field] = $value;
}
}
$pconfig['aliases']['item'] = $aliases;
/* validate aliases */
foreach ($aliases as $idx => $alias) {
$aliasreqdfields = array('aliasdomain' . $idx);
$aliasreqdfieldsn = array(gettext("Alias Domain"));
var_dump(array('fields' => $aliasreqdfields, 'names' => $aliasreqdfieldsn, 'alias' => $alias));
do_input_validation($_POST, $aliasreqdfields, $aliasreqdfieldsn, $input_errors);
if (($alias['host'] && !is_hostname($alias['host'])))
$input_errors[] = gettext("Hostnames in alias list can only contain the characters A-Z, 0-9 and '-'.");
if (($alias['domain'] && !is_domain($alias['domain'])))
$input_errors[] = gettext("A valid domain must be specified in alias list.");
}
if (!$input_errors) {
$hostent = array(); $hostent = array();
$hostent['host'] = $_POST['host']; $hostent['host'] = $pconfig['host'];
$hostent['domain'] = $_POST['domain']; $hostent['domain'] = $pconfig['domain'];
$hostent['rr'] = $_POST['rr'];
$hostent['ip'] = $_POST['ip'];
$hostent['mxprio'] = $_POST['mxprio'];
$hostent['mx'] = $_POST['mx'];
$hostent['descr'] = $_POST['descr'];
$hostent['aliases']['item'] = $aliases;
/* Destinguish between A and AAAA by parsing the passed IP address */ /* Destinguish between A and AAAA by parsing the passed IP address */
if ($_POST['rr'] == 'A') { $hostent['rr'] = $pconfig['rr'] == "A" && is_ipaddrv6($pconfig['ip']) ? "AAA" : $pconfig['rr'];
if (is_ipaddrv6($_POST['ip'])) { $hostent['ip'] = $pconfig['ip'];
$hostent['rr'] = 'AAAA'; $hostent['mxprio'] = $pconfig['mxprio'];
} $hostent['mx'] = $pconfig['mx'];
} $hostent['descr'] = $pconfig['descr'];
if (isset($id) && $a_hosts[$id]) if (isset($id)) {
$a_hosts[$id] = $hostent; $a_hosts[$id] = $hostent;
else } else {
$a_hosts[] = $hostent; $a_hosts[] = $hostent;
hosts_sort(); }
usort($a_hosts, "hostcmp");
mark_subsystem_dirty('unbound'); mark_subsystem_dirty('unbound');
write_config(); write_config();
header("Location: services_unbound_overrides.php"); header("Location: services_unbound_overrides.php");
exit; exit;
} }
} }
$service_hook = 'unbound'; $service_hook = 'unbound';
legacy_html_escape_form_data($pconfig);
include("head.inc"); include("head.inc");
?> ?>
<script type="text/javascript">
<body> $( document ).ready(function() {
<script type="text/javascript" src="/javascript/row_helper.js"></script> $("#rr").change(function(){
switch ($(this).val()) {
<script type="text/javascript">
//<![CDATA[
rowname[0] = "aliashost";
rowtype[0] = "textbox";
rowsize[0] = "20";
rowname[1] = "aliasdomain";
rowtype[1] = "textbox";
rowsize[1] = "20";
rowname[2] = "aliasdescription";
rowtype[2] = "textbox";
rowsize[2] = "20";
function type_change() {
switch (jQuery('#rr').val()) {
case 'A': case 'A':
jQuery('#ip').prop('disabled', false); $('#ip').prop('disabled', false);
jQuery('#mxprio').prop('disabled', true); $('#mxprio').prop('disabled', true);
jQuery('#mx').prop('disabled', true); $('#mx').prop('disabled', true);
break; break;
case 'MX': case 'MX':
jQuery('#ip').prop('disabled', true); $('#ip').prop('disabled', true);
jQuery('#mxprio').prop('disabled', false); $('#mxprio').prop('disabled', false);
jQuery('#mx').prop('disabled', false); $('#mx').prop('disabled', false);
break; break;
default: default:
jQuery('#ip').prop('disabled', false); $('#ip').prop('disabled', false);
jQuery('#mxprio').prop('disabled', false); $('#mxprio').prop('disabled', false);
jQuery('#mx').prop('disabled', false); $('#mx').prop('disabled', false);
}
} }
//]]> });
</script> // trigger initial change
$("#rr").change();
});
</script>
<body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?> <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<form method="post" name="iform" id="iform">
<form action="services_unbound_host_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped">
<tr> <tr>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit DNS Resolver entry");?></td> <td width="22%"><strong><?=gettext("Edit DNS Resolver entry");?></strong></td>
<td width="78%" align="right">
<small><?=gettext("full help"); ?> </small>
<i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i></a>
</td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Host");?></td> <td><a id="help_for_host" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Host");?></td>
<td width="78%" class="vtable"> <td>
<input name="host" type="text" class="formfld" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>" /><br /> <input name="host" type="text" value="<?=$pconfig['host'];?>" />
<span class="vexpl"><?=gettext("Name of the host, without domain part"); ?><br /> <div class="hidden" for="help_for_host">
<?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em></span> <?=gettext("Name of the host, without domain part"); ?>
<?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td> <td><a id="help_for_domain" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Domain");?></td>
<td width="78%" class="vtable"> <td>
<input name="domain" type="text" class="formfld" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" /><br /> <input name="domain" type="text" value="<?=$pconfig['domain'];?>" />
<span class="vexpl"><?=gettext("Domain of the host"); ?><br /> <div class="hidden" for="help_for_domain">
<?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em></span> <?=gettext("Domain of the host"); ?><br />
<?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Type");?></td> <td><a id="help_for_rr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Type");?></td>
<td width="78%" class="vtable"> <td>
<select name="rr" id="rr" class="formselect" onchange="type_change()"> <select name="rr" id="rr" class="selectpicker">
<?php <?php
$rrs = array("A" => gettext("A or AAAA (IPv4 or IPv6 address)"), "MX" => gettext("MX (Mail server)")); $rrs = array("A" => gettext("A or AAAA (IPv4 or IPv6 address)"), "MX" => gettext("MX (Mail server)"));
foreach ($rrs as $rr => $name) : foreach ($rrs as $rr => $name) :?>
?>
<option value="<?=$rr;?>" <?=($rr == $pconfig['rr'] || ($rr == 'A' && $pconfig['rr'] == 'AAAA')) ? "selected=\"selected\"" : "";?> > <option value="<?=$rr;?>" <?=($rr == $pconfig['rr'] || ($rr == 'A' && $pconfig['rr'] == 'AAAA')) ? "selected=\"selected\"" : "";?> >
<?=$name;?> <?=$name;?>
</option> </option>
<?php endforeach; ?> <?php
endforeach; ?>
</select> </select>
<span class="vexpl"><?=gettext("Type of resource record"); ?><br /> <div class="hidden" for="help_for_rr">
<?=gettext("e.g."); ?> <em>A</em> <?=gettext("or"); ?> <em>AAAA</em> <?=gettext("for IPv4 or IPv6 addresses"); ?></span> <?=gettext("Type of resource record"); ?>
</td> <br />
</tr> <?=gettext("e.g."); ?> <em>A</em> <?=gettext("or"); ?> <em>AAAA</em> <?=gettext("for IPv4 or IPv6 addresses"); ?>
<tr> </div>
<td width="22%" valign="top" class="vncellreq"><?=gettext("IP");?></td>
<td width="78%" class="vtable">
<input name="ip" type="text" class="formfld" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>" /><br />
<span class="vexpl"><?=gettext("IP address of the host"); ?><br />
<?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em></span>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("MX Priority");?></td>
<td width="78%" class="vtable">
<input name="mxprio" type="text" class="formfld" id="mxprio" size="6" value="<?=htmlspecialchars($pconfig['mxprio']);?>" /><br />
<span class="vexpl"><?=gettext("Priority of MX record"); ?><br />
<?=gettext("e.g."); ?> <em>10</em></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("MX Host");?></td> <td><a id="help_for_ip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IP");?></td>
<td width="78%" class="vtable"> <td>
<input name="mx" type="text" class="formfld" id="mx" size="6" value="<?=htmlspecialchars($pconfig['mx']);?>" /><br /> <input name="ip" type="text" id="ip" value="<?=$pconfig['ip'];?>" />
<span class="vexpl"><?=gettext("Host name of MX host"); ?><br /> <div class="hidden" for="help_for_ip">
<?=gettext("e.g."); ?> <em>mail.example.com</em></span> <?=gettext("IP address of the host"); ?><br />
<?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <td><a id="help_for_mxprio" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("MX Priority");?></td>
<td width="78%" class="vtable"> <td>
<input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" /><br /> <input name="mxprio" type="text" id="mxprio" value="<?=$pconfig['mxprio'];?>" />
<span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed).");?></span> <div class="hidden" for="help_for_mxprio">
<?=gettext("Priority of MX record"); ?><br />
<?=gettext("e.g."); ?> <em>10</em>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncell"><div id="addressnetworkport"><?=gettext("Aliases"); ?></div></td> <td><a id="help_for_mx" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("MX Host");?></td>
<td width="78%" class="vtable"> <td>
<table id="maintable" summary="aliases"> <input name="mx" type="text" id="mx" size="6" value="<?=$pconfig['mx'];?>" />
<tbody> <div class="hidden" for="help_for_mx">
<tr> <?=gettext("Host name of MX host"); ?><br />
<td colspan="4"> <?=gettext("e.g."); ?> <em>mail.example.com</em>
<div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp">
<?=gettext("Enter additional names for this host."); ?>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><div id="onecolumn"><?=gettext("Host");?></div></td> <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
<td><div id="twocolumn"><?=gettext("Domain");?></div></td>
<td><div id="threecolumn"><?=gettext("Description");?></div></td>
</tr>
<?php
$counter = 0;
if (isset($pconfig['aliases']['item'])):
foreach($pconfig['aliases']['item'] as $item):
$host = $item['host'];
$domain = $item['domain'];
$description = $item['description'];
?>
<tr>
<td>
<input autocomplete="off" name="aliashost<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliashost<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($host);?>" />
</td>
<td>
<input autocomplete="off" name="aliasdomain<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdomain<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($domain);?>" />
</td>
<td>
<input name="aliasdescription<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdescription<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($description);?>" />
</td>
<td> <td>
<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a> <input name="descr" type="text" id="descr" value="<?=$pconfig['descr'];?>" />
</td> <div class="hidden" for="help_for_descr">
</tr> <?=gettext("You may enter a description here for your reference (not parsed).");?>
<?php </div>
$counter++;
endforeach;
endif;
?>
</tbody>
</table>
<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
<script type="text/javascript">
//<![CDATA[
field_counter_js = 3;
rows = 1;
totalrows = <?php echo $counter; ?>;
loaded = <?php echo $counter; ?>;
//]]>
</script>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top">&nbsp;</td> <td>&nbsp;</td>
<td width="78%"> <td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" /> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" />
<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" /> <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound_overrides.php');?>'" />
<?php if (isset($id) && $a_hosts[$id]): ?> <?php if (isset($id)): ?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" /> <input name="id" type="hidden" value="<?=$id;?>" />
<?php endif; ?> <?php endif; ?>
</td> </td>
</tr> </tr>
...@@ -397,10 +275,4 @@ include("head.inc"); ...@@ -397,10 +275,4 @@ include("head.inc");
</div> </div>
</div> </div>
</section> </section>
<script type="text/javascript">
//<![CDATA[
type_change();
//]]>
</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