Skip to content

O
OpnSense
Commit 99f780c8 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner
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

(cherry picked from commit c3135f5f)
parent 73bf50d3
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 120 deletions
src/opnsense/service/conf/actions.d/actions_ipsec.conf
View file @ 99f780c8
[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 @ 99f780c8
...@@ -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 @ 99f780c8
<?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.
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,73 +35,92 @@ require_once("interfaces.inc"); ...@@ -35,73 +35,92 @@ 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">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<div class="content-box">
<?php
if (count($ipsec_leases) > 0):
foreach($ipsec_leases as $pool => $pool_data): ?>
<div class="content-box-main ">
<div class="table-responsive">
<table class="table table-striped table-condensed">
<thead>
<tr>
<th></th>
<th colspan="3">
<?=gettext("Pool: ");?> <?=$pool;?>
<?=gettext("usage: ");?> <?=$pool_data['usage'];?>
<?=gettext("online: ");?> <?=$pool_data['online'];?>
</th>
<th></th>
</tr>
<tr>
<th></th>
<th><?=gettext("User");?></th>
<th><?=gettext("Host");?></th>
<th><?=gettext("Status");?></th>
<th></th>
</tr>
</thead>
<tbody>
<?php
if (count($pool_data['items']) > 0):?>
<?php
foreach ($pool_data['items'] as $lease): ?>
<tr>
<td></td>
<td><?=htmlspecialchars($lease['user']);?></td>
<td><?=htmlspecialchars($lease['address']);?></td>
<td>
<span class='glyphicon glyphicon-transfer text-<?=$lease['status'] == 'online' ? "success" : "danger";?>'></span>
(<?=htmlspecialchars($lease['status']);?>)
</td>
<td></td>
</tr>
<?php
endforeach;
else: ?>
<tr>
<td></td>
<td colspan="3">
<?=gettext("No leases from this pool yet.");?>
</td>
<td></td>
</tr>
<?php
endif; ?>
</tbody>
</table>
</div>
</div>
<section class="page-content-main"> <?php
<div class="container-fluid"> endforeach;
<div class="row"> else: ?>
<div class="content-box-main ">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?> <div class="table-responsive">
<table class="table table-striped">
<section class="col-xs-12"> <thead>
<div class="tab-content content-box col-xs-12"> <tr>
<div class="container-fluid"> <th><?=gettext("No IPsec pools.");?></th>
</tr>
<div class="table-responsive"> </thead>
</table>
</div>
<?php if (isset($mobile['pool']) && is_array($mobile['pool'])): ?> </div>
<?php foreach($mobile['pool'] as $pool): ?> <?php
<table class="table table-striped table-sort"> endif; ?>
<tr> </div>
<td colspan="4" valign="top" class="listtopic"> </section>
<?php </div>
echo gettext("Pool: ") . $pool['name']; </div>
echo ' ' . gettext("usage: ") . $pool['usage']; </section>
echo ' ' . gettext("online: ") . $pool['online'];
?>
</td>
</tr>
<?php if (is_array($pool['lease']) && count($pool['lease']) > 0): ?>
<tr>
<td class="listhdrr nowrap"><?=gettext("ID");?></td>
<td class="listhdrr nowrap"><?=gettext("Host");?></td>
<td class="listhdrr nowrap"><?=gettext("Status");?></td>
<td class="list nowrap"></td>
</tr>
<?php foreach ($pool['lease'] as $lease): ?>
<tr>
<td class="listlr"><?=htmlspecialchars($lease['id']);?></td>
<td class="listr"><?=htmlspecialchars($lease['host']);?></td>
<td class="listr"><?=htmlspecialchars($lease['status']);?></td>
<td class="list nowrap">
</td>
</tr>
<?php endforeach;
else: ?>
<tr>
<td>
<p><strong><?=gettext("No leases from this pool yet.");?></strong></p>
</td>
</tr>
<?php endif; ?>
</table>
<?php endforeach; ?>
<?php else: ?>
<p><strong><?=gettext("No IPsec pools.");?></strong></p>
<?php endif; ?>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
src/www/widgets/widgets/ipsec.widget.php
View file @ 99f780c8
<?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>.
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.
*/ */
$nocsrf = true; $nocsrf = true;
...@@ -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