Skip to content

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

(legacy) openvpn, fix kill client + some cleanups, closes... 

(legacy) openvpn, fix kill client + some cleanups, closes https://github.com/opnsense/core/issues/687
parent fd4ad209
Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 257 deletions
src/www/status_openvpn.php
View file @ 20197cab
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2010 Jim Pingle Copyright (C) 2010 Jim Pingle
Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2008 Shrew Soft Inc.
Copyright (C) 2005 Scott Ullrich, Colin Smith Copyright (C) 2005 Scott Ullrich, Colin Smith
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,54 +35,55 @@ require_once("services.inc"); ...@@ -35,54 +35,55 @@ require_once("services.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
function kill_client($port, $remipp) { function kill_client($port, $remipp) {
global $g; global $g;
$tcpsrv = "unix:///var/etc/openvpn/{$port}.sock"; $tcpsrv = "unix:///var/etc/openvpn/{$port}.sock";
$errval; $errval;
$errstr; $errstr;
/* open a tcp connection to the management port of each server */ /* open a tcp connection to the management port of each server */
$fp = @stream_socket_client($tcpsrv, $errval, $errstr, 1); $fp = @stream_socket_client($tcpsrv, $errval, $errstr, 1);
$killed = -1; $killed = -1;
if ($fp) { if ($fp) {
stream_set_timeout($fp, 1); stream_set_timeout($fp, 1);
fputs($fp, "kill {$remipp}\n"); fputs($fp, "kill {$remipp}\n");
while (!feof($fp)) { while (!feof($fp)) {
$line = fgets($fp, 1024); $line = fgets($fp, 1024);
$info = stream_get_meta_data($fp); $info = stream_get_meta_data($fp);
if ($info['timed_out']) if ($info['timed_out']) {
break; break;
}
/* parse header list line */ /* parse header list line */
if (strpos($line, "INFO:") !== false) if (strpos($line, "INFO:") !== false) {
continue; continue;
if (strpos($line, "SUCCESS") !== false) { }
$killed = 0; if (strpos($line, "SUCCESS") !== false) {
} $killed = 0;
break; }
} break;
fclose($fp); }
} fclose($fp);
return $killed; }
return $killed;
} }
$service_hook = 'openvpn'; $service_hook = 'openvpn';
if ($_SERVER['REQUEST_METHOD'] === 'GET') { if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$vpnid = 0; $vpnid = 0;
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (isset($_POST['action']) && $_POST['action'] == 'kill') { if (isset($_POST['action']) && $_POST['action'] == 'kill') {
$port = escapeshellarg($_POST['port']); $port = $_POST['port'];
$remipp = escapeshellarg($_POST['remipp']); $remipp = $_POST['remipp'];
if (!empty($port) and !empty($remipp)) { if (!empty($port) && !empty($remipp)) {
$retval = kill_client($port, $remipp); $retval = kill_client($port, $remipp);
echo htmlentities("|{$port}|{$remipp}|{$retval}|"); echo htmlentities("|{$port}|{$remipp}|{$retval}|");
} else { } else {
echo gettext("invalid input"); echo gettext("invalid input");
} }
exit; exit;
} }
} }
$servers = openvpn_get_active_servers(); $servers = openvpn_get_active_servers();
...@@ -101,209 +102,219 @@ include("head.inc"); ?> ...@@ -101,209 +102,219 @@ include("head.inc"); ?>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
$( document ).ready(function() { $( document ).ready(function() {
// link kill buttons // link kill buttons
$(".act_kill_client").click(function(){ $(".act_kill_client").click(function(event){
var port = $(this).attr("data-client-port"); event.preventDefault();
var ip = $(this).attr("data-client-ip"); var port = $(this).data("client-port");
$.post(window.location, {action: 'kill', port:port,remipp:ip}, function(data) { var ip = $(this).data("client-ip");
location.reload(); $.post(window.location, {action: 'kill', port:port,remipp:ip}, function(data) {
}); location.reload();
}); });
// link show/hide routes });
$(".act_show_routes").click(function(){ // link show/hide routes
$("*[for='" + $(this).attr('id') + "']").toggleClass("hidden show"); $(".act_show_routes").click(function(){
}); $("*[for='" + $(this).attr('id') + "']").toggleClass("hidden show");
});
// minimize all buttons, some pf the buttons come from the shared service // minimize all buttons, some of the buttons come from the shared service
// functions, which outputs large buttons. // functions, which outputs large buttons.
$(".btn").each(function(){ $(".btn").each(function(){
$(this).addClass("btn-xs"); $(this).addClass("btn-xs");
}); });
}); });
//]]> //]]>
</script> </script>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<section class="col-xs-12"> <section class="col-xs-12">
<header class="content-box-head container-fluid"> <h3><?=gettext("OpenVPN Status");?></h3> <header class="content-box-head container-fluid"> <h3><?=gettext("OpenVPN Status");?></h3>
</header> </header>
<div class="content-box-main col-xs-12"> <div class="content-box-main col-xs-12">
<form action="status_openvpn.php" method="get" name="iform"> <form action="status_openvpn.php" method="get" name="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<?php $i = 0; ?> <?php
<?php foreach ($servers as $server): ?> $i = 0;
<tr> foreach ($servers as $server): ?>
<td colspan="8" class="listtopic"> <tr>
<b><?=$server['name'];?> <?=gettext("Client connections"); ?></b> <td colspan="8" class="listtopic">
</td> <b><?=$server['name'];?> <?=gettext("Client connections"); ?></b>
</tr> </td>
<tr> </tr>
<td><?=gettext("Common Name"); ?></td> <tr>
<td><?=gettext("Real Address"); ?></td> <td><?=gettext("Common Name"); ?></td>
<td><?=gettext("Virtual Address"); ?></td> <td><?=gettext("Real Address"); ?></td>
<td><?=gettext("Connected Since"); ?></td> <td><?=gettext("Virtual Address"); ?></td>
<td><?=gettext("Bytes Sent"); ?></td> <td><?=gettext("Connected Since"); ?></td>
<td><?=gettext("Bytes Received"); ?></td> <td><?=gettext("Bytes Sent"); ?></td>
<td></td> <td><?=gettext("Bytes Received"); ?></td>
<td></td> <td></td>
</tr> <td></td>
<?php foreach ($server['conns'] as $conn): ?> </tr>
<tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>"> <?php
<td><?=$conn['common_name'];?></td> foreach ($server['conns'] as $conn): ?>
<td><?=$conn['remote_host'];?></td> <tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>">
<td><?=$conn['virtual_addr'];?></td> <td><?=$conn['common_name'];?></td>
<td><?=$conn['connect_time'];?></td> <td><?=$conn['remote_host'];?></td>
<td><?=format_bytes($conn['bytes_sent']);?></td> <td><?=$conn['virtual_addr'];?></td>
<td><?=format_bytes($conn['bytes_recv']);?></td> <td><?=$conn['connect_time'];?></td>
<td></td> <td><?=format_bytes($conn['bytes_sent']);?></td>
<td> <td><?=format_bytes($conn['bytes_recv']);?></td>
<a data-client-port="<?=$server['mgmt'];?>" <td></td>
data-client-ip="<?=$conn['remote_host'];?>" <td>
title="<?=gettext("Kill client connection from"). " ". $conn['remote_host'] ; ?>" <button data-client-port="<?=$server['mgmt'];?>"
class="act_kill_client btn btn-default"> data-client-ip="<?=$conn['remote_host'];?>"
<span class="glyphicon glyphicon-remove"></span> title="<?=gettext("Kill client connection from"). " ". $conn['remote_host'] ; ?>"
</a> class="act_kill_client btn btn-default">
</td> <span class="glyphicon glyphicon-remove"></span>
</tr> </button>
<?php endforeach; ?> </td>
<tr> </tr>
<td colspan="2"> <?php
<?php $ssvc = find_service_by_openvpn_vpnid($server['vpnid']); ?> endforeach; ?>
<?= get_service_status_icon($ssvc, true, true); ?> <tr>
<?= get_service_control_links($ssvc, true); ?> <td colspan="2">
</td> <?php $ssvc = find_service_by_openvpn_vpnid($server['vpnid']); ?>
<td colspan="6">&nbsp;</td> <?= get_service_status_icon($ssvc, true, true); ?>
</tr> <?= get_service_control_links($ssvc, true); ?>
<?php if (isset($server['routes']) && count($server['routes'])): ?> </td>
<tr> <td colspan="6">&nbsp;</td>
<td colspan="8"> </tr>
<button class="btn btn-default act_show_routes" type="button" id="showroutes_<?=$i?>"><i class="fa fa-info"></i> <?php
<?php echo gettext("Show/Hide Routing Table"); ?> if (isset($server['routes']) && count($server['routes'])): ?>
</button> <tr>
<div class="hidden" for="showroutes_<?=$i?>"> <td colspan="8">
<small> <button class="btn btn-default act_show_routes" type="button" id="showroutes_<?=$i?>"><i class="fa fa-info"></i>
<?=$server['name'];?> <?=gettext("Routing Table"); ?> <?=gettext("Show/Hide Routing Table"); ?>
</small> </button>
<table class="table table-striped table-bordered"> <div class="hidden" for="showroutes_<?=$i?>">
<thead> <small>
<tr> <?=$server['name'];?> <?=gettext("Routing Table"); ?>
<th><?=gettext("Common Name"); ?></th> </small>
<th><?=gettext("Real Address"); ?></th> <table class="table table-striped table-bordered">
<th><?=gettext("Target Network"); ?></th> <thead>
<th><?=gettext("Last Used"); ?></th> <tr>
</tr> <th><?=gettext("Common Name"); ?></th>
</thead> <th><?=gettext("Real Address"); ?></th>
<tbody> <th><?=gettext("Target Network"); ?></th>
<?php foreach ($server['routes'] as $conn): ?> <th><?=gettext("Last Used"); ?></th>
<tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>"> </tr>
<td><?=$conn['common_name'];?></td> </thead>
<td><?=$conn['remote_host'];?></td> <tbody>
<td><?=$conn['virtual_addr'];?></td> <?php
<td><?=$conn['last_time'];?></td> foreach ($server['routes'] as $conn): ?>
</tr> <tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>">
<?php endforeach; ?> <td><?=$conn['common_name'];?></td>
<tfoot> <td><?=$conn['remote_host'];?></td>
<tr> <td><?=$conn['virtual_addr'];?></td>
<td colspan="6"><?= gettext("An IP address followed by C indicates a host currently connected through the VPN.") ?></td> <td><?=$conn['last_time'];?></td>
</tr> </tr>
</tfoot> <?php
</tbody> endforeach; ?>
</table> </tbody>
</div> <tfoot>
</td> <tr>
</tr> <td colspan="6"><?= gettext("An IP address followed by C indicates a host currently connected through the VPN.") ?></td>
<?php endif; ?> </tr>
<?php $i++; ?> </tfoot>
<?php endforeach; ?> </table>
</div>
<?php if (!empty($sk_servers)) { ?> </td>
<tr> </tr>
<td colspan="8" class="listtopic"> <?php
<b><?=gettext("Peer to Peer Server Instance Statistics"); ?></b> endif;
</td> $i++;
</tr> endforeach;
<tr> if (!empty($sk_servers)): ?>
<td><?=gettext("Name"); ?></td> <tr>
<td><?=gettext("Remote Host"); ?></td> <td colspan="8" class="listtopic">
<td><?=gettext("Virtual Addr"); ?></td> <b><?=gettext("Peer to Peer Server Instance Statistics"); ?></b>
<td><?=gettext("Connected Since"); ?></td> </td>
<td><?=gettext("Bytes Sent"); ?></td> </tr>
<td><?=gettext("Bytes Received"); ?></td> <tr>
<td><?=gettext("Status"); ?></td> <td><?=gettext("Name"); ?></td>
<td></td> <td><?=gettext("Remote Host"); ?></td>
</tr> <td><?=gettext("Virtual Addr"); ?></td>
<?php foreach ($sk_servers as $sk_server): ?> <td><?=gettext("Connected Since"); ?></td>
<tr id="<?php echo "r:{$sk_server['port']}:{$sk_server['vpnid']}"; ?>"> <td><?=gettext("Bytes Sent"); ?></td>
<td><?=$sk_server['name'];?></td> <td><?=gettext("Bytes Received"); ?></td>
<td><?=$sk_server['remote_host'];?></td> <td><?=gettext("Status"); ?></td>
<td><?=$sk_server['virtual_addr'];?></td> <td></td>
<td><?=$sk_server['connect_time'];?></td> </tr>
<td><?=format_bytes($sk_server['bytes_sent']);?></td> <?php
<td><?=format_bytes($sk_server['bytes_recv']);?></td> foreach ($sk_servers as $sk_server): ?>
<td><?=$sk_server['status'];?></td> <tr id="<?php echo "r:{$sk_server['port']}:{$sk_server['vpnid']}"; ?>">
<td> <td><?=$sk_server['name'];?></td>
<div> <td><?=$sk_server['remote_host'];?></td>
<?php $ssvc = find_service_by_openvpn_vpnid($sk_server['vpnid']); ?> <td><?=$sk_server['virtual_addr'];?></td>
<?= get_service_status_icon($ssvc, false, true); ?> <td><?=$sk_server['connect_time'];?></td>
<?= get_service_control_links($ssvc, true); ?> <td><?=format_bytes($sk_server['bytes_sent']);?></td>
</div> <td><?=format_bytes($sk_server['bytes_recv']);?></td>
</td> <td><?=$sk_server['status'];?></td>
</tr> <td>
<?php endforeach; ?> <div>
<?php <?php $ssvc = find_service_by_openvpn_vpnid($sk_server['vpnid']); ?>
} ?> <?= get_service_status_icon($ssvc, false, true); ?>
<?= get_service_control_links($ssvc, true); ?>
</div>
</td>
</tr>
<?php
endforeach;
endif; ?>
<?php if (!empty($clients)) { ?> <?php
<tr> if (!empty($clients)):?>
<tr> <tr>
<td colspan="8" class="listtopic"> <tr>
<b><?=gettext("Client Instance Statistics"); ?><b> <td colspan="8" class="listtopic">
</td> <b><?=gettext("Client Instance Statistics"); ?><b>
</tr> </td>
<tr> </tr>
<td><?=gettext("Name"); ?></td> <tr>
<td><?=gettext("Connected Since"); ?></td> <td><?=gettext("Name"); ?></td>
<td><?=gettext("Virtual Addr"); ?></td> <td><?=gettext("Connected Since"); ?></td>
<td><?=gettext("Remote Host"); ?></td> <td><?=gettext("Virtual Addr"); ?></td>
<td><?=gettext("Bytes Sent"); ?></td> <td><?=gettext("Remote Host"); ?></td>
<td><?=gettext("Bytes Rcvd"); ?></td> <td><?=gettext("Bytes Sent"); ?></td>
<td><?=gettext("Status"); ?></td> <td><?=gettext("Bytes Rcvd"); ?></td>
<td></td> <td><?=gettext("Status"); ?></td>
</tr> <td></td>
<?php foreach ($clients as $client): ?> </tr>
<tr id="<?php echo "r:{$client['port']}:{$client['vpnid']}"; ?>"> <?php
<td><?=$client['name'];?></td> foreach ($clients as $client): ?>
<td><?=$client['connect_time'];?></td> <tr id="<?php echo "r:{$client['port']}:{$client['vpnid']}"; ?>">
<td><?=$client['virtual_addr'];?></td> <td><?=$client['name'];?></td>
<td><?=$client['remote_host'];?></td> <td><?=$client['connect_time'];?></td>
<td><?=format_bytes($client['bytes_sent']);?></td> <td><?=$client['virtual_addr'];?></td>
<td><?=format_bytes($client['bytes_recv']);?></td> <td><?=$client['remote_host'];?></td>
<td><?=$client['status'];?></td> <td><?=format_bytes($client['bytes_sent']);?></td>
<td> <td><?=format_bytes($client['bytes_recv']);?></td>
<div> <td><?=$client['status'];?></td>
<?php $ssvc = find_service_by_openvpn_vpnid($client['vpnid']); ?> <td>
<?= get_service_status_icon($ssvc, false, true); ?> <div>
<?= get_service_control_links($ssvc, true); ?> <?php $ssvc = find_service_by_openvpn_vpnid($client['vpnid']); ?>
</div> <?= get_service_status_icon($ssvc, false, true); ?>
</td> <?= get_service_control_links($ssvc, true); ?>
</tr> </div>
<?php endforeach; ?> </td>
</table> </tr>
</div> <?php
<?php endforeach; ?>
} </table>
if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) { </div>
echo gettext("No OpenVPN instance defined"); <?php
} endif;
?> if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) {
</form> echo gettext("No OpenVPN instance defined");
</div> }?>
</section> </form>
</div> </div>
</div> </section>
</div>
</div>
</section> </section>
......
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