Skip to content

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

(legacy) refactor services_dnsmasq_domainoverride_edit.php 

(cherry picked from commit 62b75c1a)
parent 7374549f
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 162 deletions
src/www/services_dnsmasq_domainoverride_edit.php
View file @ eb8fb248
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
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");
...@@ -35,153 +35,157 @@ require_once("pfsense-utils.inc"); ...@@ -35,153 +35,157 @@ require_once("pfsense-utils.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php'); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
if (!is_array($config['dnsmasq']['domainoverrides'])) { if (empty($config['dnsmasq']['domainoverrides']) || !is_array($config['dnsmasq']['domainoverrides'])) {
$config['dnsmasq']['domainoverrides'] = array(); $config['dnsmasq']['domainoverrides'] = array();
} }
$a_domainOverrides = &$config['dnsmasq']['domainoverrides']; $a_domainOverrides = &$config['dnsmasq']['domainoverrides'];
if (is_numericint($_GET['id'])) if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$id = $_GET['id']; if (isset($_GET['id']) && !empty($a_domainOverrides[$_GET['id']])) {
if (isset($_POST['id']) && is_numericint($_POST['id'])) $id = $_GET['id'];
$id = $_POST['id']; }
$pconfig = array();
if (isset($id) && $a_domainOverrides[$id]) {
$pconfig['domain'] = $a_domainOverrides[$id]['domain']; $pconfig['domain'] = isset($id) && !empty($a_domainOverrides[$id]['domain']) ? $a_domainOverrides[$id]['domain'] : null;
if (is_ipaddr($a_domainOverrides[$id]['ip']) && ($a_domainOverrides[$id]['ip'] != '#')) { $pconfig['descr'] = !empty($a_domainOverrides[$id]['descr']) ? $a_domainOverrides[$id]['descr'] : null;
$pconfig['ip'] = $a_domainOverrides[$id]['ip']; if (!isset($id) || empty($a_domainOverrides[$id]['ip'])) {
} $pconfig['ip'] = null;
else { $pconfig['dnssrcip'] = null;
$dnsmasqpieces = explode('@', $a_domainOverrides[$id]['ip'], 2); } elseif (!empty($a_domainOverrides[$id]['ip']) && is_ipaddr($a_domainOverrides[$id]['ip']) && ($a_domainOverrides[$id]['ip'] != '#')) {
$pconfig['ip'] = $dnsmasqpieces[0]; $pconfig['ip'] = $a_domainOverrides[$id]['ip'];
$pconfig['dnssrcip'] = $dnsmasqpieces[1]; $pconfig['dnssrcip'] = null;
} } else {
$pconfig['descr'] = $a_domainOverrides[$id]['descr']; $dnsmasqpieces = explode('@', $a_domainOverrides[$id]['ip'], 2);
$pconfig['ip'] = !empty($dnsmasqpieces[0]) ? $dnsmasqpieces[0] : null;
$pconfig['dnssrcip'] = !empty($dnsmasqpieces[1]) ? $dnsmasqpieces[1] : null;
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (isset($_GET['id']) && !empty($a_domainOverrides[$_POST['id']])) {
$id = $_POST['id'];
}
$input_errors= array();
$pconfig = $_POST;
/* input validation */
$reqdfields = explode(" ", "domain ip");
$reqdfieldsn = array(gettext("Domain"),gettext("IP address"));
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
if (!empty($pconfig['domain']) && substr($pconfig['domain'], 0, 6) == '_msdcs') {
$subdomainstr = substr($pconfig['domain'], 7);
if ($subdomainstr && !is_domain($subdomainstr)) {
$input_errors[] = gettext("A valid domain must be specified after _msdcs.");
}
} elseif (!empty($pconfig['domain']) && !is_domain($_POST['domain'])) {
$input_errors[] = gettext("A valid domain must be specified.");
}
if (!empty($pconfig['ip']) && !is_ipaddr($pconfig['ip']) && ($pconfig['ip'] != '#') && ($pconfig['ip'] != '!')) {
$input_errors[] = gettext("A valid IP address must be specified, or # for an exclusion or ! to not forward at all.");
}
if (!empty($pconfig['dnssrcip']) && !in_array($pconfig['dnssrcip'], get_configured_ip_addresses())) {
$input_errors[] = gettext("An interface IP address must be specified for the DNS query source.");
}
if (count($input_errors) == 0) {
$doment = array();
$doment['domain'] = $pconfig['domain'];
if (empty($pconfig['dnssrcip'])) {
$doment['ip'] = $pconfig['ip'];
} else {
$doment['ip'] = $pconfig['ip'] . "@" . $pconfig['dnssrcip'];
}
$doment['descr'] = $pconfig['descr'];
if (isset($id)) {
$a_domainOverrides[$id] = $doment;
} else {
$a_domainOverrides[] = $doment;
}
services_dnsmasq_configure();
write_config();
header("Location: services_dnsmasq.php");
exit;
}
} }
if ($_POST) {
unset($input_errors);
$pconfig = $_POST;
/* input validation */
$reqdfields = explode(" ", "domain ip");
$reqdfieldsn = array(gettext("Domain"),gettext("IP address"));
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
function String_Begins_With($needle, $haystack) {
return (substr($haystack, 0, strlen($needle))==$needle);
}
if (String_Begins_With(_msdcs, $_POST['domain'])) {
$subdomainstr = substr($_POST['domain'], 7);
if ($subdomainstr && !is_domain($subdomainstr)) {
$input_errors[] = gettext("A valid domain must be specified after _msdcs.");
}
}
elseif ($_POST['domain'] && !is_domain($_POST['domain'])) {
$input_errors[] = gettext("A valid domain must be specified.");
}
if ($_POST['ip'] && !is_ipaddr($_POST['ip']) && ($_POST['ip'] != '#') && ($_POST['ip'] != '!')) {
$input_errors[] = gettext("A valid IP address must be specified, or # for an exclusion or ! to not forward at all.");
}
if ($_POST['dnssrcip'] && !in_array($_POST['dnssrcip'], get_configured_ip_addresses())) {
$input_errors[] = gettext("An interface IP address must be specified for the DNS query source.");
}
if (!$input_errors) {
$doment = array();
$doment['domain'] = $_POST['domain'];
if (empty($_POST['dnssrcip']))
$doment['ip'] = $_POST['ip'];
else
$doment['ip'] = $_POST['ip'] . "@" . $_POST['dnssrcip'];
$doment['descr'] = $_POST['descr'];
if (isset($id) && $a_domainOverrides[$id])
$a_domainOverrides[$id] = $doment;
else
$a_domainOverrides[] = $doment;
$retval = services_dnsmasq_configure();
write_config();
header("Location: services_dnsmasq.php");
exit;
}
}
$service_hook = 'dnsmasq'; $service_hook = 'dnsmasq';
legacy_html_escape_form_data($pconfig);
include("head.inc"); include("head.inc");
?> ?>
<body> <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="row">
<div class="container-fluid"> <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<div class="row"> <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">
<div class="table-responsive">
<section class="col-xs-12"> <table class="table table-striped">
<tr>
<div class="content-box"> <td width="22%"><strong><?=gettext("Edit Domain Override entry");?></strong></td>
<td width="78%" align="right">
<form action="services_dnsmasq_domainoverride_edit.php" method="post" name="iform" id="iform"> <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>
<div class="table-responsive"> </td>
<table class="table table-striped table-sort"> </tr>
<tr>
<td width="22%"><a id="help_for_domain" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Domain");?></td>
<tr> <td width="78%">
<td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td> <input name="domain" type="text" value="<?=$pconfig['domain'];?>" />
<td width="78%" class="vtable"> <div class="hidden" for="help_for_domain">
<input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" /> <?=gettext("Domain to override (NOTE: this does not have to be a valid TLD!)"); ?><br />
<br /> <span class="vexpl"><?=gettext("Domain to override (NOTE: this does not have to be a valid TLD!)"); ?><br /> <?=gettext("e.g."); ?> <em><?=gettext("test"); ?></em> <?=gettext("or"); ?> <em>mycompany.localdomain</em> <?=gettext("or"); ?> <em>1.168.192.in-addr.arpa</em>
<?=gettext("e.g."); ?> <em><?=gettext("test"); ?></em> <?=gettext("or"); ?> <em>mycompany.localdomain</em> <?=gettext("or"); ?> <em>1.168.192.in-addr.arpa</em> </span></td> </div>
</tr> </td>
<tr> </tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td> <tr>
<td width="78%" class="vtable"> <td><a id="help_for_ip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IP address");?></td>
<input name="ip" type="text" class="formfld unknown" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>" /> <td>
<br /> <span class="vexpl"><?=gettext("IP address of the authoritative DNS server for this domain"); ?><br /> <input name="ip" type="text" value="<?=$pconfig['ip'];?>" />
<?=gettext("e.g."); ?> <em>192.168.100.100</em><br /><?=gettext("Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override."); ?><br /><?=gettext("Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere."); ?></span></td> <div class="hidden" for="help_for_ip">
</tr> <?=gettext("IP address of the authoritative DNS server for this domain"); ?><br />
<tr> <?=gettext("e.g."); ?> <em>192.168.100.100</em><br /><?=gettext("Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override."); ?><br /><?=gettext("Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere."); ?>
<td width="22%" valign="top" class="vncell"><?=gettext("Source IP");?></td> </div>
<td width="78%" class="vtable"> </td>
<input name="dnssrcip" type="text" class="formfld unknown" id="dnssrcip" size="40" value="<?=htmlspecialchars($pconfig['dnssrcip']);?>" /> </tr>
<br /> <span class="vexpl"><?=gettext("Source IP address for queries to the DNS server for the override domain."); ?><br /> <tr>
<?=gettext("Leave blank unless your DNS server is accessed through a VPN tunnel."); ?></span></td> <td><a id="help_for_dnssrcip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Source IP");?></td>
</tr> <td>
<tr> <input name="dnssrcip" type="text" value="<?=$pconfig['dnssrcip'];?>" />
<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <div class="hidden" for="help_for_dnssrcip">
<td width="78%" class="vtable"> <?=gettext("Source IP address for queries to the DNS server for the override domain."); ?><br />
<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" /> <?=gettext("Leave blank unless your DNS server is accessed through a VPN tunnel."); ?>
<br /> <span class="vexpl"><?=gettext("You may enter a description here". </div>
" for your reference (not parsed).");?></span></td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top">&nbsp;</td> <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
<td width="78%"> <td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" /> <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" /> <div class="hidden" for="help_for_descr">
<?php if (isset($id) && $a_domainOverrides[$id]): ?> <?=gettext("You may enter a description here"." for your reference (not parsed).");?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" /> </div>
<?php endif; ?> </td>
</td> </tr>
</tr> <tr>
</table> <td>&nbsp;</td>
</div> <td>
</form> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" />
</div> <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
</section> <?php if (isset($id)): ?>
</div> <input name="id" type="hidden" value="<?=$id;?>" />
</div> <?php endif; ?>
</section> </td>
</tr>
</table>
</div>
</form>
</div>
</section>
</div>
</div>
</section>
<?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