Skip to content

O
OpnSense
Commit 673903cc authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

cleanup ipsec status page and remove custom hooks (which aren't used)

parent 64f5d6b1
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 175 deletions
src/www/diag_ipsec.php
View file @ 673903cc
...@@ -90,19 +90,15 @@ $status = ipsec_smp_dump_status(); ...@@ -90,19 +90,15 @@ $status = ipsec_smp_dump_status();
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th class="listhdrr nowrap"><?php echo gettext("Description");?></th> <th class="listhdrr nowrap"><?php echo gettext("Description");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Local ID");?></th> <th class="listhdrr nowrap"><?php echo gettext("Local ID");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Local IP");?></th> <th class="listhdrr nowrap"><?php echo gettext("Local IP");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Remote ID");?></th> <th class="listhdrr nowrap"><?php echo gettext("Remote ID");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Remote IP");?></th> <th class="listhdrr nowrap"><?php echo gettext("Remote IP");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Role");?></th> <th class="listhdrr nowrap"><?php echo gettext("Role");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Reauth");?></th> <th class="listhdrr nowrap"><?php echo gettext("Status");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Algo");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Status");?></th>
<td class="list nowrap"></td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -122,138 +118,115 @@ $status = ipsec_smp_dump_status(); ...@@ -122,138 +118,115 @@ $status = ipsec_smp_dump_status();
} }
?> ?>
<tr> <tr>
<td class="listlr"> <td class="listr"><?php echo htmlspecialchars(ipsec_get_descr($con_id));?></td>
<?php echo htmlspecialchars(ipsec_get_descr($con_id));?> <td class="listr">
</td> <?php if (!is_array($ikesa['local'])) {
<td class="listr"> echo "Unknown";
<?php if (!is_array($ikesa['local'])) } else {
echo "Unknown"; if (!empty($ikesa['local']['identification'])) {
else { if ($ikesa['local']['identification'] == '%any')
if (!empty($ikesa['local']['identification'])) { echo 'Any identifier';
if ($ikesa['local']['identification'] == '%any') else
echo 'Any identifier'; echo htmlspecialchars($ikesa['local']['identification']);
else } else {
echo htmlspecialchars($ikesa['local']['identification']); echo 'Unknown';
} else }
echo 'Unknown'; }
} ?>
?>
</td> </td>
<td class="listr"> <td class="listr">
<?php if (!is_array($ikesa['local'])) <?php if (!is_array($ikesa['local'])) {
echo "Unknown"; echo "Unknown";
else { } else {
if (!empty($ikesa['local']['address'])) if (!empty($ikesa['local']['address'])) {
echo htmlspecialchars($ikesa['local']['address']) . '<br/>Port:' . htmlspecialchars($ikesa['local']['port']); echo htmlspecialchars($ikesa['local']['address']) . '<br/>Port:' . htmlspecialchars($ikesa['local']['port']);
else } else {
echo 'Unknown'; echo 'Unknown';
if ($ikesa['local']['nat'] != 'false') }
echo " NAT-T"; if ($ikesa['local']['nat'] != 'false') {
} echo " NAT-T";
?> }
}
?>
</td> </td>
<td class="listr"> <td class="listr">
<?php if (!is_array($ikesa['remote'])) <?php if (!is_array($ikesa['remote'])) {
echo "Unknown"; echo "Unknown";
else {
$identity = "";
if (!empty($ikesa['remote']['identification'])) {
if ($ikesa['remote']['identification'] == '%any')
$identity = 'Any identifier';
else
$identity = htmlspecialchars($ikesa['remote']['identification']);
} }
else {
$identity = "";
if (!empty($ikesa['remote']['identification'])) {
if ($ikesa['remote']['identification'] == '%any') {
$identity = 'Any identifier';
} else {
$identity = htmlspecialchars($ikesa['remote']['identification']);
}
}
if (is_array($ikesa['remote']['auth']) && !empty($ikesa['remote']['auth'][0]['identity'])) { if (is_array($ikesa['remote']['auth']) && !empty($ikesa['remote']['auth'][0]['identity'])) {
echo htmlspecialchars($ikesa['remote']['auth'][0]['identity']); echo htmlspecialchars($ikesa['remote']['auth'][0]['identity']);
echo "<br/>{$identity}"; echo "<br/>{$identity}";
} else { } else {
if (empty($identity)) if (empty($identity)) {
echo "Unknown"; echo "Unknown";
else } else {
echo $identity; echo $identity;
}
}
} }
} ?>
?>
</td> </td>
<td class="listr"> <td class="listr">
<?php if (!is_array($ikesa['remote'])) <?php if (!is_array($ikesa['remote'])) {
echo "Unknown"; echo "Unknown";
else { } else {
if (!empty($ikesa['remote']['address'])) if (!empty($ikesa['remote']['address'])) {
echo htmlspecialchars($ikesa['remote']['address']) . '<br/>Port:' . htmlspecialchars($ikesa['remote']['port']); echo htmlspecialchars($ikesa['remote']['address']) . '<br/>Port:' . htmlspecialchars($ikesa['remote']['port']);
else } else {
echo 'Unknown'; echo 'Unknown';
if ($ikesa['remote']['nat'] != 'false') }
echo " NAT-T"; if ($ikesa['remote']['nat'] != 'false') {
} echo " NAT-T";
?> }
}
?>
</td> </td>
<td class="listr"> <td class="listr">
IKEv<?php echo htmlspecialchars($ikesa['version']);?>
<br/>
<?php echo htmlspecialchars($ikesa['role']);?> <?php echo htmlspecialchars($ikesa['role']);?>
</td> </td>
<td class="listr"> <td class="listr">
<?php echo htmlspecialchars($ikesa['reauth']);?>
</td>
<td class="listr">
<?php
echo htmlspecialchars($ikesa['encalg']);
echo "<br/>";
echo htmlspecialchars($ikesa['intalg']);
echo "<br/>";
echo htmlspecialchars($ikesa['prfalg']);
echo "<br/>";
echo htmlspecialchars($ikesa['dhgroup']);
?>
</td>
<td class="listr">
<center>
<span class="<?php echo $icon; ?>" title="<?php echo $ikesa['status']; ?>" alt=""></span> <span class="<?php echo $icon; ?>" title="<?php echo $ikesa['status']; ?>" alt=""></span>
<br/><?php echo htmlspecialchars($ikesa['status']);?> <small><?php echo htmlspecialchars($ikesa['status']);?></small>
<br/><?php echo htmlspecialchars($ikesa['established']);?>
</center>
</td> </td>
<td > <td >
<?php if ($icon != "glyphicon glyphicon-play text-success"): ?> <?php if ($icon != "glyphicon glyphicon-play text-success"): ?>
<center> <a href="diag_ipsec.php?act=connect&amp;ikeid=<?php echo $con_id; ?>">
<a href="diag_ipsec.php?act=connect&amp;ikeid=<?php echo $con_id; ?>"> <span class="glyphicon glyphicon-play text-default" alt="Connect VPN" title="Connect VPN"></span>
<span class="glyphicon glyphicon-play text-default" alt="Connect VPN" title="Connect VPN"></span> </a>
</a>
</center>
<?php else: ?> <?php else: ?>
<center> <a href="diag_ipsec.php?act=ikedisconnect&amp;ikeid=<?php echo $con_id; ?>">
<a href="diag_ipsec.php?act=ikedisconnect&amp;ikeid=<?php echo $con_id; ?>"> <span class="glyphicon glyphicon-stop text-default" alt="Disconnect VPN" title="Disconnect VPN"></span>
<span class="glyphicon glyphicon-stop text-default" alt="Disconnect VPN" title="Disconnect VPN"></span> </a>
</a> <a href="diag_ipsec.php?act=ikedisconnect&amp;ikeid=<?php echo $con_id; ?>&amp;ikesaid=<?php echo $ikesa['id']; ?>">
<a href="diag_ipsec.php?act=ikedisconnect&amp;ikeid=<?php echo $con_id; ?>&amp;ikesaid=<?php echo $ikesa['id']; ?>"> <span class="glyphicon glyphicon-remove text-default" alt="Disconnect VPN Connection" title="Disconnect VPN Connection" border="0"></span>
<span class="glyphicon glyphicon-remove text-default" alt="Disconnect VPN Connection" title="Disconnect VPN Connection" border="0"></span> </a>
</a>
</center>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td valign="middle" class="list nowrap">
<table border="0" cellspacing="0" cellpadding="1" summary="">
</table>
</td>
</tr> </tr>
<?php if (is_array($ikesa['childsalist'])): ?> <?php if (is_array($ikesa['childsalist'])): ?>
<tr> <tr>
<td class="listrborder" colspan="9"> <td class="listrborder" colspan="10">
<div id="btnchildsa-<?=$ikeid;?>"> <div id="btnchildsa-<?=$ikeid;?>">
<input type="button" onclick="show_childsa('childsa-<?=$ikeid;?>','btnchildsa-<?=$ikeid;?>');" value="+" /> - Show child SA entries <input type="button" onclick="show_childsa('childsa-<?=$ikeid;?>','btnchildsa-<?=$ikeid;?>');" value="+" /> - Show child SA entries
</div> </div>
<table class="tabcont" width="100%" height="100%" border="0" cellspacing="0" cellpadding="0" id="childsa-<?=$ikeid;?>" style="display:none" summary=""> <table class="table table-sort" id="childsa-<?=$ikeid;?>" style="display:none">
<thead> <thead>
<tr> <tr>
<th> </th>
<th class="listhdrr nowrap"><?php echo gettext("Local subnets");?></th> <th class="listhdrr nowrap"><?php echo gettext("Local subnets");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Local SPI(s)");?></th> <th class="listhdrr nowrap"><?php echo gettext("Local SPI(s)");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Remote subnets");?></th> <th class="listhdrr nowrap"><?php echo gettext("Remote subnets");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Times");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Algo");?></th>
<th class="listhdrr nowrap"><?php echo gettext("Stats");?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -262,6 +235,11 @@ $status = ipsec_smp_dump_status(); ...@@ -262,6 +235,11 @@ $status = ipsec_smp_dump_status();
foreach ($ikesa['childsalist']['childsa'] as $childsa) { foreach ($ikesa['childsalist']['childsa'] as $childsa) {
?> ?>
<tr valign="top"> <tr valign="top">
<td>
<a href="diag_ipsec.php?act=childdisconnect&amp;ikeid=<?php echo $con_id; ?>&amp;ikesaid=<?php echo $childsa['reqid']; ?>">
<span class="glyphicon glyphicon-remove text-default" alt="Disconnect Child SA" title="Disconnect Child SA"></span>
</a>
</td>
<td class="listlr nowrap"> <td class="listlr nowrap">
<?php if (is_array($childsa['local']) && is_array($childsa['local']['networks']) && is_array($childsa['local']['networks']['network'])) { <?php if (is_array($childsa['local']) && is_array($childsa['local']['networks']) && is_array($childsa['local']['networks']['network'])) {
foreach ($childsa['local']['networks']['network'] as $lnets) { foreach ($childsa['local']['networks']['network'] as $lnets) {
...@@ -288,52 +266,6 @@ $status = ipsec_smp_dump_status(); ...@@ -288,52 +266,6 @@ $status = ipsec_smp_dump_status();
echo "Unknown"; echo "Unknown";
?> ?>
</td> </td>
<td class="listr nowrap">
<?php
echo "Rekey: " . htmlspecialchars($childsa['rekey']);
echo "<br/>Life: " . htmlspecialchars($childsa['lifetime']);
echo "<br/>Install: " .htmlspecialchars($childsa['installtime']);
?>
</td>
<td class="listr nowrap">
<?php
echo htmlspecialchars($childsa['encalg']);
echo "<br/>";
echo htmlspecialchars($childsa['intalg']);
echo "<br/>";
if (!empty($childsa['prfalg'])) {
echo htmlspecialchars($childsa['prfalg']);
echo "<br/>";
}
if (!empty($childsa['dhgroup'])) {
echo htmlspecialchars($childsa['dhgroup']);
echo "<br/>";
}
if (!empty($childsa['esn'])) {
echo htmlspecialchars($childsa['esn']);
echo "<br/>";
}
echo "IPComp: " . htmlspecialchars($childsa['ipcomp']);
?>
</td>
<td class="listr nowrap">
<?php
echo "Bytes-In: " . htmlspecialchars($childsa['bytesin']) . "<br/>Packets-In: " . htmlspecialchars($childsa['packetsin']);;
echo "<br/>";
echo "Bytes-Out: " . htmlspecialchars($childsa['bytesout']) . "<br/>Packets-Out: " . htmlspecialchars($childsa['packetsout']);;
?>
</td>
<td>
<center>
<a href="diag_ipsec.php?act=childdisconnect&amp;ikeid=<?php echo $con_id; ?>&amp;ikesaid=<?php echo $childsa['reqid']; ?>">
<span class="glyphicon glyphicon-remove text-default" alt="Disconnect Child SA" title="Disconnect Child SA"></span>
</a>
</center>
</td>
<td class="list nowrap">
&nbsp;
</td>
</tr> </tr>
<?php } } ?> <?php } } ?>
<tr style="display:none;"><td></td></tr> <tr style="display:none;"><td></td></tr>
...@@ -392,29 +324,17 @@ $status = ipsec_smp_dump_status(); ...@@ -392,29 +324,17 @@ $status = ipsec_smp_dump_status();
else else
echo htmlspecialchars($ph1src); echo htmlspecialchars($ph1src);
?> ?>
</td>
<td class="listr" >
</td>
<td class="listr" >
</td> </td>
<td class="listr" > <td class="listr" >
</td> </td>
<td class="listr"> <td class="listr">
<center> <span class="glyphicon glyphicon-remove text-warning" title="Disconnected" alt=""></span>
<span class="glyphicon glyphicon-remove text-warning" title="Disconnected" alt=""></span> <small>Disconnected</small>
<small>Disconnected</small>
</center>
</td> </td>
<td > <td >
<center> <a href="diag_ipsec.php?act=connect&amp;ikeid=<?php echo $ph1ent['ikeid']; ?>">
<a href="diag_ipsec.php?act=connect&amp;ikeid=<?php echo $ph1ent['ikeid']; ?>"> <span class="glyphicon glyphicon-play text-default" alt="Connect VPN" title="Connect VPN"></span>
<span class="glyphicon glyphicon-play text-default" alt="Connect VPN" title="Connect VPN"></span> </a>
</a>
</center>
</td>
<td valign="middle" class="list nowrap">
<table border="0" cellspacing="0" cellpadding="1" summary="">
</table>
</td> </td>
</tr> </tr>
<?php <?php
...@@ -450,7 +370,7 @@ $status = ipsec_smp_dump_status(); ...@@ -450,7 +370,7 @@ $status = ipsec_smp_dump_status();
function show_childsa(id, buttonid) { function show_childsa(id, buttonid) {
document.getElementById(buttonid).innerHTML=''; document.getElementById(buttonid).innerHTML='';
aodiv = document.getElementById(id); aodiv = document.getElementById(id);
aodiv.style.display = "block"; aodiv.style.display = "";
} }
//]]> //]]>
</script> </script>
......
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