Skip to content

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

(ipsec, legacy) add ipsec (mobile) leases to diag and widget, rename "ipsec... 

(ipsec, legacy) add ipsec (mobile) leases to diag and widget, rename "ipsec list_status" to "ipsec list status", closes https://github.com/opnsense/core/issues/139
parent 0beb30fd
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 120 deletions
src/opnsense/service/conf/actions.d/actions_ipsec.conf
View file @ c3135f5f
[list_status] [list.status]
command:/usr/local/opnsense/scripts/ipsec/list_status.py command:/usr/local/opnsense/scripts/ipsec/list_status.py
parameters: parameters:
type:script_output type:script_output
......
src/www/diag_ipsec.php
View file @ c3135f5f
...@@ -57,7 +57,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { ...@@ -57,7 +57,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
exit(0); exit(0);
} }
$ipsec_status = json_decode(configd_run("ipsec list_status"), true); $ipsec_status = json_decode(configd_run("ipsec list status"), true);
if ($ipsec_status == null) { if ($ipsec_status == null) {
$ipsec_status = array(); $ipsec_status = array();
} }
......
src/www/diag_ipsec_leases.php
View file @ c3135f5f
<?php <?php
/* /*
Copyright (C) 2014 Deciso B.V. Copyright (C) 2016 Deciso B.V.
Copyright (C) 2014 Ermal LUÇi Copyright (C) 2014 Ermal LUÇi
All rights reserved. All rights reserved.
...@@ -35,69 +35,88 @@ require_once("interfaces.inc"); ...@@ -35,69 +35,88 @@ require_once("interfaces.inc");
$shortcut_section = 'ipsec'; $shortcut_section = 'ipsec';
include("head.inc"); include("head.inc");
$ipsec_leases = json_decode(configd_run("ipsec list leases"), true);
$mobile = array(); // TODO: temporary disabled ( https://github.com/opnsense/core/issues/139 ) ipsec_dump_mobile();
?> ?>
<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="container-fluid">
<div class="row"> <div class="row">
<?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="tab-content content-box col-xs-12"> <div class="content-box">
<div class="container-fluid"> <?php
if (count($ipsec_leases) > 0):
foreach($ipsec_leases as $pool => $pool_data): ?>
<div class="content-box-main ">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-condensed">
<thead>
<?php if (isset($mobile['pool']) && is_array($mobile['pool'])): ?>
<?php foreach($mobile['pool'] as $pool): ?>
<table class="table table-striped table-sort">
<tr> <tr>
<td colspan="4" valign="top" class="listtopic"> <th></th>
<?php <th colspan="3">
echo gettext("Pool: ") . $pool['name']; <?=gettext("Pool: ");?> <?=$pool;?>
echo ' ' . gettext("usage: ") . $pool['usage']; <?=gettext("usage: ");?> <?=$pool_data['usage'];?>
echo ' ' . gettext("online: ") . $pool['online']; <?=gettext("online: ");?> <?=$pool_data['online'];?>
?> </th>
</td> <th></th>
</tr> </tr>
<?php if (is_array($pool['lease']) && count($pool['lease']) > 0): ?>
<tr> <tr>
<td class="listhdrr nowrap"><?=gettext("ID");?></td> <th></th>
<td class="listhdrr nowrap"><?=gettext("Host");?></td> <th><?=gettext("User");?></th>
<td class="listhdrr nowrap"><?=gettext("Status");?></td> <th><?=gettext("Host");?></th>
<td class="list nowrap"></td> <th><?=gettext("Status");?></th>
<th></th>
</tr> </tr>
<?php foreach ($pool['lease'] as $lease): ?> </thead>
<tbody>
<?php
if (count($pool_data['items']) > 0):?>
<?php
foreach ($pool_data['items'] as $lease): ?>
<tr> <tr>
<td class="listlr"><?=htmlspecialchars($lease['id']);?></td> <td></td>
<td class="listr"><?=htmlspecialchars($lease['host']);?></td> <td><?=htmlspecialchars($lease['user']);?></td>
<td class="listr"><?=htmlspecialchars($lease['status']);?></td> <td><?=htmlspecialchars($lease['address']);?></td>
<td class="list nowrap"> <td>
<span class='glyphicon glyphicon-transfer text-<?=$lease['status'] == 'online' ? "success" : "danger";?>'></span>
(<?=htmlspecialchars($lease['status']);?>)
</td> </td>
<td></td>
</tr> </tr>
<?php endforeach; <?php
endforeach;
else: ?> else: ?>
<tr> <tr>
<td> <td></td>
<p><strong><?=gettext("No leases from this pool yet.");?></strong></p> <td colspan="3">
<?=gettext("No leases from this pool yet.");?>
</td> </td>
<td></td>
</tr> </tr>
<?php endif; ?> <?php
endif; ?>
</tbody>
</table> </table>
<?php endforeach; ?>
<?php else: ?>
<p><strong><?=gettext("No IPsec pools.");?></strong></p>
<?php endif; ?>
</div> </div>
</div> </div>
<?php
endforeach;
else: ?>
<div class="content-box-main ">
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th><?=gettext("No IPsec pools.");?></th>
</tr>
</thead>
</table>
</div>
</div>
<?php
endif; ?>
</div> </div>
</section> </section>
</div> </div>
......
src/www/widgets/widgets/ipsec.widget.php
View file @ c3135f5f
<?php <?php
/* /*
Copyright (C) 2014 Deciso B.V. Copyright (C) 2016 Deciso B.V.
Copyright (C) 2007 Scott Dale Copyright (C) 2007 Scott Dale
Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net> Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
and Jonathan Watt <jwatt@jwatt.org>. and Jonathan Watt <jwatt@jwatt.org>.
...@@ -35,7 +35,7 @@ require_once("guiconfig.inc"); ...@@ -35,7 +35,7 @@ require_once("guiconfig.inc");
$ipsec_detail_array = array(); $ipsec_detail_array = array();
$ipsec_tunnels = array(); $ipsec_tunnels = array();
$mobile = array(); $ipsec_leases = array();
if (isset($config['ipsec']['phase1'])) { if (isset($config['ipsec']['phase1'])) {
echo "<div>&nbsp;</div>\n"; echo "<div>&nbsp;</div>\n";
...@@ -71,11 +71,10 @@ if (isset($config['ipsec']['phase1'])) { ...@@ -71,11 +71,10 @@ if (isset($config['ipsec']['phase1'])) {
echo "</div>"; echo "</div>";
} }
// TODO: temporary disabled ( https://github.com/opnsense/core/issues/139 ) $ipsec_leases = json_decode(configd_run("ipsec list leases"), true);
//$mobile = ipsec_dump_mobile();
// parse configured tunnels // parse configured tunnels
$ipsec_status = json_decode(configd_run("ipsec list_status"), true); $ipsec_status = json_decode(configd_run("ipsec list status"), true);
$activetunnels = 0; $activetunnels = 0;
if ($ipsec_status != null) { if ($ipsec_status != null) {
foreach ($ipsec_status as $status_key => $status_value) { foreach ($ipsec_status as $status_key => $status_value) {
...@@ -167,7 +166,20 @@ if (isset($config['ipsec']['phase2'])) { ...@@ -167,7 +166,20 @@ if (isset($config['ipsec']['phase2'])) {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<!-- not implemented --> <?php
foreach ($ipsec_leases as $pool => $pool_details):
foreach ($pool_details['items'] as $lease): ?>
<tr>
<td><?=htmlspecialchars($lease['user']);?></td>
<td>
<span class='glyphicon glyphicon-transfer text-<?=$lease['status'] == 'online' ? "success" : "danger";?>'></span>
</td>
<td><?=htmlspecialchars($lease['address']);?></td>
</tr>
<?php
endforeach;
endforeach;?>
</tbody> </tbody>
</table> </table>
</div> </div>
......
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