Skip to content

Commit

Permalink
Bump to v0.0.6_2 and prepare for PR with Netgate (#30)
Browse files Browse the repository at this point in the history 
* Working on improving interface bootstrap

* Testing bootstrapper rewrite

* Fix syntax error

* Working on bootstrapper

* Testing another option

* Working on a few things

* Fixed syntax problem

* Testing

* Working on improvements to startup

* Removed some code that might not be needed anymore if we change the interface prefix to tun_

* Removed reference to function

* Make sure to configure hard during bootup

* Working on startup code

* Installation update status cosmetic change

* Looks like an rcfile might be the best way to get things going at startup

* Fix syntax error

* Fix glob string

* write_rcfile should use config.xml for truth not the conf path

* Need to create the pseudoservice definition in wireguard.xml

* Fix incorrect variable in wg_write_rcfile

* Working on rc startup code

* Syntax fix in write_rcfile

* This build is likely broken, I'm working on improvements

* Yep things are broken, still working

* Makefile fix

* Another makefile bug

* Still testing out different startup mechanisms

* More testing

* Cosmetic change during install and resync

* Remove pseudoservice definition

* Candidate for v0.0.6 bump

* Remove keep extra secrets setting, no longer required

* Comment clarity

* More tweaks to startup

* Still working on startup code

* Remove lingering blurring code

* Cleaned up some globals defines that are no longer needed

* Cleaning up some obsolete global defines

* Implementing proper deinstall handling of configuration data

* Syntax error

* Syntax error

* Not confident in configuration removal code at this point, will reevaluate later.

* Need to bump to 0.0.6_1 because I sent an early build to some insiders

* Some minor changes to interface handling, working on an edge case

* Bump to 0.0.6_2 beause of last commit

* Typo fix on include

* Removed boilerplate for logging facilities...will address this later.

* Testing some improements to the code

* Remove references to old include file

* fix syntax error

* Fix another syntax bug

* Another syntax bug

* More cleanup and testing

* More cleanup

* Cosmetic changes to install/deinstall update status

* Working on deinstall script

* More improvements

* Cosmetic

* Another cosmetic fix.
  • Loading branch information
@rcmcdonald91
rcmcdonald91 authored Apr 20, 2021
1 parent a6b6e63 commit 2b650b9
Show file tree
Hide file tree
Showing 13 changed files with 165 additions and 179 deletions.
4 changes: 1 addition & 3 deletions src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= pfSense-pkg-WireGuard
PORTVERSION= 0.0.6
PORREVISION= 1
PORREVISION= 2
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down Expand Up @@ -54,8 +54,6 @@ do-install:
${STAGEDIR}${PREFIX}/pkg/wireguard
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/wg_install.inc \
${STAGEDIR}${PREFIX}/pkg/wireguard
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/wg_extras.inc \
${STAGEDIR}${PREFIX}/pkg/wireguard
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/wg_validate.inc \
${STAGEDIR}${PREFIX}/pkg/wireguard

Expand Down
1 change: 1 addition & 0 deletions src/files/etc/inc/priv/wireguard.priv.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ $priv_list['page-vpn-wireguard']['match'] = array();

$priv_list['page-vpn-wireguard']['match'][] = "wg/vpn_wg.php";
$priv_list['page-vpn-wireguard']['match'][] = "wg/vpn_wg_edit.php";
$priv_list['page-vpn-wireguard']['match'][] = "wg/vpn_wg_settings.php";

$priv_list['page-status-wireguard'] = array();
$priv_list['page-status-wireguard']['name'] = "WebCfg - Status: WireGuard Status";
Expand Down
144 changes: 59 additions & 85 deletions src/files/usr/local/pkg/wireguard/wg.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,11 @@ require_once('util.inc');
require_once('wg_api.inc');
require_once('wg_globals.inc');
require_once('wg_install.inc');
require_once('wg_extras.inc');
require_once('wg_validate.inc');

// Setup WireGuard tunnel
function wg_configure_if($tunnel, $conf_hard = true, $verbose = false) {
global $config, $wgg;

$verbose_pipe = ($verbose ? "" : " > /dev/null 2>&1");

// Should we perform a hard reconfiguration
if ($conf_hard) {
Expand All @@ -59,7 +56,18 @@ function wg_configure_if($tunnel, $conf_hard = true, $verbose = false) {
wg_syncconf($tunnel);

// Add the interface to the interface group (i.e. WireGuard)
exec("{$wgg['ifconfig']} {$tunnel['name']} group {$wgg['ifgroupentry']['ifname']}" . $verbose_pipe);
exec("{$wgg['ifconfig']} {$tunnel['name']} group {$wgg['ifgroupentry']['ifname']}" . verbose_pipe($verbose));

// Get the tunnel interface friendly name if assigned
$if_fname = convert_real_interface_to_friendly_interface_name($tunnel['name']);

if(isset($if_fname)) {

interface_reconfigure($if_fname);

system_routing_configure($if_fname);

}

}

Expand All @@ -85,15 +93,17 @@ function wg_destroy_if($tunnel, $verbose = false) {
function wg_delete_tunnel($tunidx) {
global $config, $wgg;

if ($config['installedpackages']['wireguard']['tunnel'][$tunidx]) {
wg_globals();

if ($wgg['tunnels'][$tunidx]) {

unset($ifname);

unset($conf_path);

if (isset($config['installedpackages']['wireguard']['tunnel'][$tunidx]['name'])) {
if (isset($wgg['tunnels'][$tunidx]['name'])) {

$ifname = $config['installedpackages']['wireguard']['tunnel'][$tunidx]['name'];
$ifname = $wgg['tunnels'][$tunidx]['name'];

}

Expand All @@ -104,7 +114,7 @@ function wg_delete_tunnel($tunidx) {
}

// Delete the tunnel configuration entry
unset($config['installedpackages']['wireguard']['tunnel'][$tunidx]);
unset($wgg['tunnels'][$tunidx]);

write_config("[WireGuard] tunnel {$index} updated.");

Expand All @@ -125,13 +135,13 @@ function wg_delete_tunnel($tunidx) {
function wg_do_post($post) {
global $config, $wgg;

init_config_arr(array('installedpackages', 'wireguard', 'tunnel'));
wg_globals();

$input_errors = array();

$index = $post['index'];

$pconfig = &$config['installedpackages']['wireguard']['tunnel'][$index];
$pconfig = $wgg['tunnels'][$index];

if (empty($pconfig['name'])) {

Expand Down Expand Up @@ -193,8 +203,11 @@ function wg_do_post($post) {
$input_errors = wg_validate_post($pconfig);

if (!$input_errors) {
$config['installedpackages']['wireguard']['tunnel'][$index] = $pconfig;

$wgg['tunnels'][$index] = $pconfig;

write_config("[WireGuard] Tunnel {$pconfig['name']} (Index {$index}) updated.");

}

return(array('input_errors' => $input_errors, 'pconfig' => $pconfig));
Expand All @@ -203,6 +216,9 @@ function wg_do_post($post) {
function wg_resync($verbose = false) {
global $config, $g, $wgg;

// Read latest settings
wg_globals();

// Write out configuration files to disk
wg_create_config_files();

Expand All @@ -215,24 +231,18 @@ function wg_resync($verbose = false) {

}

// Get a list of configured tunnels
$wg_tunnels = $config['installedpackages']['wireguard']['tunnel'];
if (is_array($wgg['tunnels'])) {

if (is_array($wg_tunnels)) {

foreach ($wg_tunnels as $tunnel) {
foreach ($wgg['tunnels'] as $tunnel) {

if (isset($tunnel['enabled']) && $tunnel['enabled'] == 'yes') {

// Determine if we should configure hard or soft
$conf_hard = (!is_wg_tunnel_assigned($tunnel) || !does_interface_exist($tunnel['name']));

// Attempt to create the WireGuard tunnel
wg_configure_if($tunnel, $conf_hard, $verbose);

$if_friendly = convert_real_interface_to_friendly_interface_name($tunnel['name']);

interface_reconfigure($if_friendly);

} else {

// Attempt to destroy the WireGuard tunnel
Expand All @@ -248,7 +258,7 @@ function wg_resync($verbose = false) {

if ($g['wireguard_installing']) {

update_status("done.\n");
update_status(" done.\n");

// We are no longer installing
unset($g['wireguard_installing']);
Expand All @@ -260,10 +270,10 @@ function wg_resync($verbose = false) {
function wg_create_config_files($clean = true) {
global $config, $wgg;

$wg_tunnels = $config['installedpackages']['wireguard']['tunnel'];
wg_globals();

// We've got some tunnels to configure
if (is_array($wg_tunnels)) {
if (is_array($wgg['tunnels'])) {

// Create configuration path if it is missing
if (!file_exists($wgg['conf_path'])) {
Expand All @@ -283,7 +293,7 @@ function wg_create_config_files($clean = true) {

}

foreach ($wg_tunnels as $tunnel) {
foreach ($wgg['tunnels'] as $tunnel) {

if (!empty($tunnel['enabled']) && $tunnel['enabled'] == 'yes') {

Expand All @@ -298,12 +308,35 @@ function wg_create_config_files($clean = true) {
}

/*
* Remove all wg config files from the conf directory
* Remove all wg config files from any potential conf directory
*/
function wg_delete_config_files() {
global $wgg;

unlink_if_exists("{$wgg['conf_path']}/*.conf");
// Loop through each potential conf path and delete all .conf files
foreach ($wgg['conf_paths_to_clean'] as $confpath) {

unlink_if_exists("{$confpath}/*.conf");

}

}

/*
* Removes any configuration xml paths as defined by $wgg['xml_conf_tags']
*/
function wg_remove_config_settings() {
global $config, $wgg;

foreach ($wgg['xml_conf_tags'] as $conf_tag) {

if (isset($config['installedpackages'][$conf_tag])) {

unset($config['installedpackages'][$conf_tag]);

}

}

}

Expand Down Expand Up @@ -380,63 +413,4 @@ function make_wg_conf($tunnel) {
chmod($wgg['conf_path'] . "/" . $tunnel['name'] . ".conf", 0600);
}

// Return WireGuard tunnel networks for a given address family
function wg_get_tunnel_networks($family = 'both') {
global $config;
$wg_tunnel_networks = array();
init_config_arr(array('installedpackages', 'wireguard', 'tunnel'));
if (is_wg_enabled()) {
foreach ($config['installedpackages']['wireguard']['tunnel'] as $wg) {
if (empty($wg['enabled']) ||
empty($wg['interface']['address'])) {
continue;
}
foreach(explode(',', $wg['interface']['address']) as $wga) {
list($wgnet, $wgmask) = explode('/', trim($wga));
if ((is_ipaddrv6($wgnet) && ($family == 'ipv4')) ||
(is_ipaddrv4($wgnet) && ($family == 'ipv6'))) {
continue;
}
$network = gen_subnet($wgnet, $wgmask);
$wg_tunnel_networks[] = "{$network}/{$wgmask}";
}
}
}
return $wg_tunnel_networks;
}

// Locate a viable remote gateway address for a WireGuard tunnel
// Fall back to using the tunnel address itself.
// https://redmine.pfsense.org/issues/11300
function wg_find_tunnel_gw($tunnel, $addr) {
list($ip, $mask) = explode("/", trim($addr));
// Loop through peers looking for a viable remote gateway address
if (is_array($tunnel['peers']) &&
is_array($tunnel['peers']['wgpeer']) &&
count($tunnel['peers']['wgpeer']) > 0) {
foreach ($tunnel['peers']['wgpeer'] as $peer) {
// If this peer has no configured Peer WireGuard Address, skip it.
if (empty($peer['peerwgaddr'])) {
continue;
}
// Check each Peer WireGuard Address entry
foreach (explode(',', $peer['peerwgaddr']) as $pwga) {
// Ensure the address family of this entry matches the one we're seeking
if (is_v4($ip) !== is_v4($pwga)) {
continue;
}
// If there is a subnet mask, ditch it.
list($pip, $pmask) = explode('/', trim($pwga));
// Check that this address is in the desired subnet
if (ip_in_subnet($pip, trim($addr))) {
// We found a good candidate, return it
return $pip;
}
}
}
}
// If no viable candidate is found, return the tunnel address
return $ip;
}

?>
Loading

0 comments on commit 2b650b9

Please sign in to comment.