Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2708 → Rev 2709

/CHANGELOG
9,6 → 9,7
 
ACC
- Add the DHCP relay configuration in ACC.
- Add the DNS internal configuration in ACC.
 
CHANGES
- Do not perform LDAP query for authentication of trusted authorized equipment.
/alcasar.sh
623,8 → 623,8
echo "EXT_DHCP_IP=" >> $CONF_FILE
echo "RELAY_DHCP_IP=" >> $CONF_FILE
echo "RELAY_DHCP_PORT=" >> $CONF_FILE
echo "INT_DNS_DOMAIN=none" >> $CONF_FILE
echo "INT_DNS_IP=none" >> $CONF_FILE
echo "INT_DNS_DOMAIN=" >> $CONF_FILE
echo "INT_DNS_IP=" >> $CONF_FILE
echo "INT_DNS_ACTIVE=off" >> $CONF_FILE
# network default
[ -e /etc/sysconfig/network.default ] || cp /etc/sysconfig/network /etc/sysconfig/network.default
/web/acc/admin/network.php
67,7 → 67,9
$l_del = "Supprimer de la liste";
$l_add_to_list = "Ajouter";
$l_apply = "Appliquer les changements";
$l_dns_title = "Service DNS";
$l_local_dns = "Résolution local de nom";
$l_dns_internal = "Serveur DNS interne";
$l_import_cert = "Import de certificat";
$l_private_key = "Clé privée (.key) :";
$l_certificate = "Certificat (.crt) :";
126,7 → 128,9
$l_del = "Delete from list";
$l_add_to_list = "Add";
$l_apply = "Apply changes";
$l_dns_title = "DNS service";
$l_local_dns = "Local name resolution";
$l_dns_internal = "DNS internal";
$l_import_cert = "Certificate import";
$l_private_key = "Private key (.key) :";
$l_certificate = "Certificate (.crt) :";
271,6 → 275,18
header('Location: '.$_SERVER['PHP_SELF']);
exit();
 
case 'dns_internal': // Internal DNS
// TODO : check @IP / domain before apply? (can break DNS server and shut down the Internet!)
file_put_contents(CONF_FILE, str_replace('INT_DNS_IP='.$conf['INT_DNS_IP'], 'INT_DNS_IP='.trim($_POST['dns_internal_ip']), file_get_contents(CONF_FILE)));
file_put_contents(CONF_FILE, str_replace('INT_DNS_DOMAIN='.$conf['INT_DNS_DOMAIN'], 'INT_DNS_DOMAIN='.trim($_POST['dns_internal_domain']), file_get_contents(CONF_FILE)));
if ($_POST['dns_internal_active'] === 'on') {
exec('sudo /usr/local/bin/alcasar-dns-local.sh --on');
} else {
exec('sudo /usr/local/bin/alcasar-dns-local.sh --off');
}
header('Location: '.$_SERVER['PHP_SELF']);
exit();
 
case 'default_cert': // Restore default certificate
exec('sudo alcasar-importcert.sh -d');
break;
785,6 → 801,97
<br>
 
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr><th><?= $l_dns_title ?></th></tr>
<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
</table>
<table width="100%" cellspacing="0" cellpadding="5" border="1">
<tr><td colspan="2" align="center"><?= $l_local_dns ?></td></tr>
<tr>
<td width="50%" align="center">
<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
<table cellspacing="2" cellpadding="3" border="1">
<tr><th><?= $l_ip_address ?></th><th><?= $l_host_name ?></th><th><?= $l_del ?></th></tr>
<?php
// Read the "dns_local" file
$line_exist = false;
$tab = file(DNS_LOCAL_FILE);
if ($tab) { // not empty
foreach ($tab as $line) {
if (preg_match ('/^\d+/', $line)) { # begin with one or several digit
$line_exist = true;
$field = preg_split("/\s+/",$line); # split with one or several whitespace (or tab)
$ip_addr = $field[0];
$host_name = $field[1];
echo "<tr><td>$ip_addr</td>";
echo "<td>$host_name</td>";
if (($ip_addr == "127.0.0.1")|($host_name == "alcasar")) {
echo "<td>";}
else {
echo "<td><input type=\"checkbox\" name=\"$ip_addr|$host_name\">";
}
echo "</td></tr>";
}
}
}
if (!$line_exist) {
echo '<tr><td colspan="3" style="text-align: center;font-style: italic;">'.$l_empty.'</td></tr>';
}
?>
</table>
<?php if ($line_exist): ?>
<input type="hidden" name="choix" value="del_host">
<input type="submit" value="<?= $l_apply ?>">
<?php endif; ?>
</form>
</td>
<td width="50%" valign="middle" align="center">
<form name="new_host" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
<table cellspacing="2" cellpadding="3" border="1">
<tr>
<th><?= $l_ip_address ?></th><th><?= $l_host_name ?></th><td></td>
</tr>
<tr>
<td>Ex. : 192.168.182.10</td><td>Ex. : my_nas</td><td></td>
</tr>
<tr>
<td><input type="text" name="add_ip" size="10"><input type="hidden" name="choix" value="new_host"></td>
<td><input type="text" name="add_host" size="17"></td>
<td><input type=submit class=button value="<?= $l_add_to_list ?>"></td>
</tr>
</table>
</form>
</td>
</tr>
<tr><td colspan="2" align="center"><?= $l_dns_internal ?></td></tr>
<tr>
<td colspan="2" align="center">
<form name="new_host" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
<table cellspacing="2" cellpadding="3" border="1">
<tr>
<th><?= $l_enabled ?></th>
<td>
<select name="dns_internal_active">
<option value="on"<?= (($conf['INT_DNS_ACTIVE'] === 'on') ? ' selected' : '') ?>><?= $l_yes ?></option>
<option value="off"<?= (($conf['INT_DNS_ACTIVE'] === 'off') ? ' selected' : '') ?>><?= $l_no ?></option>
</select>
</td>
</tr>
<tr>
<th><?= $l_ip_address ?></th><td><input type="text" name="dns_internal_ip" value="<?= $conf['INT_DNS_IP'] ?>" size="32"></td>
</tr>
<tr>
<th><?= $l_host_name ?></th><td><input type="text" name="dns_internal_domain" value="<?= $conf['INT_DNS_DOMAIN'] ?>" size="32"></td>
</tr>
</table>
<input type="hidden" name="choix" value="dns_internal">
<input type="submit" value="<?= $l_apply ?>">
</form>
</td>
</tr>
</table>
<br>
 
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr><th><?= $l_ssl_title ?></th></tr>
<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
</table>