lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenVPN, save client specific overrides for non user auth types on client connect and cleanup on disconnect, this should remove the need to flush all and cleanup when a csc changes or when server changes occur and is more aligned with how the user authenticated overrides function now.

Browse Source 
The attributes.sh still looks a bit weird, kept the state reset, although it looks odd that we only do this for part of the server options.

Next step is cleanup and additional testing. for https://github.com/opnsense/core/issues/2348
This commit is contained in:
Ad Schellevis 2018-04-22 17:20:28 +02:00
parent 1cde411bb3
commit 4c97c990fb
4 changed files with 106 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -594,9 +594,14 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
switch ($settings['mode']) {
case 'server_user':
case 'server_tls_user':
$conf .= "client-connect /usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh\n";
$conf .= "client-disconnect /usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh\n";
$conf .= "client-disconnect \"/usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh {$mode_id} \"\n";
break;
case 'server_tls':
case 'p2p_tls':
// For non user auth types setup client specific overrides, user authenticated ones are commissioned
// using the auth script in option auth-user-pass-verify
$conf .= "client-connect \"/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_setup_cso.php {$mode_id}\"\n";
$conf .= "client-disconnect \"/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_cleanup_cso.php {$mode_id} \"\n";
default:
break;
}

1
src/etc/inc/plugins.inc.d/openvpn/attributes.sh
View File

@ -3,6 +3,7 @@
if [ "$script_type" = "client-disconnect" ]; then
/sbin/pfctl -k $ifconfig_pool_remote_ip
/sbin/pfctl -K $ifconfig_pool_remote_ip
/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_cleanup_cso.php $1
fi
exit 0

41
src/etc/inc/plugins.inc.d/openvpn/ovpn_cleanup_cso.php Executable file
View File

@ -0,0 +1,41 @@
#!/usr/local/bin/php
<?php
/*
* Copyright (C) 2018 Deciso B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* 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
* POSSIBILITY OF SUCH DAMAGE.
*/
$vpnid = filter_var($argv[1], FILTER_SANITIZE_NUMBER_INT);
$common_name = getenv("common_name");
$target_filename = "/var/etc/openvpn-csc/".$vpnid."/".$common_name;
openlog("openvpn", LOG_ODELAY, LOG_AUTH);
if (is_file($target_filename)) {
syslog(LOG_NOTICE, "client config removed @ {$target_filename}");
unlink($target_filename);
}
closelog();
exit(0);

57
src/etc/inc/plugins.inc.d/openvpn/ovpn_setup_cso.php Executable file
View File

@ -0,0 +1,57 @@
#!/usr/local/bin/php
<?php
/*
* Copyright (C) 2018 Deciso B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* 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
* POSSIBILITY OF SUCH DAMAGE.
*/
require_once("config.inc");
require_once("util.inc");
require_once("plugins.inc.d/openvpn.inc");
/* setup syslog logging */
openlog("openvpn", LOG_ODELAY, LOG_AUTH);
$common_name = getenv("common_name");
$vpnid = filter_var($argv[1], FILTER_SANITIZE_NUMBER_INT);
if (isset($config['openvpn']['openvpn-server'])) {
foreach ($config['openvpn']['openvpn-server'] as $server) {
if ("{$server['vpnid']}" === "$vpnid") {
$all_cso = openvpn_fetch_csc_list();
if (!empty($all_cso[$vpnid][$common_name])) {
$cso = $all_cso[$vpnid][$common_name];
} else {
$cso = array("common_name" => $common_name);
}
$cso_filename = openvpn_csc_conf_write($cso, $server);
if (!empty($cso_filename)) {
syslog(LOG_NOTICE, "client config created @ {$cso_filename}");
}
break;
}
}
}
closelog();
exit(0);