Merge v0.0.9 into main (#68)

* Adds ajax support for calculating public key if a private key is entered manually

* Introduce new function wg_status_json()

* wg_status now returns an array of current wg status, wg_status_json is a wrapper for wg_status

* Refinements to API and status page

* Working on new status page

* More work on cleaning up some UI code

* Status page work

* Status page tweaks

* Status page tweaks

* Status page tweaking

* Accidently broke the tunnel edit page, fixed.

* Small UI changes

* Small change to UI

* Testing UI work

* Testing

* backing out some fubar code

* more status-fu (#49)

* more status-fu

* change icon

Co-authored-by: R. Christian McDonald <rcmcdonald91@gmail.com>

* Some cleanup

* Moving GUI related backend to a new include file

* Trying to work around pfSense menu bug

* Testing

* Settling on a workaround, status menu renamed to "WireGuard " (with a space)

* Testing

* Testing

* Test

* Cleaning up

* Fix string escaping

* syntax bug

* Fixed typo

* Fix

* Cleanup

* Typo

* Testing

* Add addressess popup everywhere

* Enabled links on addresses popups to relevant pages

* Add hover tooltip on status icons

* Syntax error on new tooltip definitions

* All address popups are now links to either a tunnel or a peer.

* Syntax fix

* Ensure wg_status includes a peer array, even if empty.

* Bunk logic on the latest fix, now fixed for real

* Refinements

* Working on upgrading xml structure for addresses and allowedips

* Working on modifying address xml tree

* Working on modifying address xml structure

* Syntax bug

* Working on xml upgrade

* More work on upgrading XML

* Cosmetic

* popup fix due to restructure

* Working on new address xml structure reading and writing

* Working on new address xml structure

* Working on new xml structure for addresses

* Syntax bug

* More work on xml address structure

* Tweaked css/html on popover

* More work on xml

* Cleaning up some bits

* Syntax fix

* Cleaning up

* Working xml upgrade routines

* Fixed incorrect logic

* More work on new XML structure for addresses

* Added a delete tunnel button to tunnel edit page

* Should be usepost

* Reverting from the previous commit

* Now working on peers

* slight tweaks

* Another tweak

* More cleanups and testing

* Syntax bug

* Tweaked the peer edit page, now hides address entry if allowing all ipv4 and ipv6

* UI improvements

* UI Improvements

* UI Improvements

* Some more UI cleanups

* Fix toggle icon generator rewrite

* Cleanups

* Syntax bug fix

* More UI cleanups

* Fixed input field id

* This should restore config file generation after the latest changes to the XML structure

* Should fix allowed ip popup on status page

* Fix conf generation

* This should be moved up to count peers properly

* Fixes allowedips on tunnel edit peer list

* add routes

* add routes again

* update status output to match new xml format

* change update interfval and remove all the older code

* fix javascript clone bug

* Fix allowed ips list on peers

* Add wg_foot.inc shim for fixing some javascript bugs

* Fix pkglist to include foot shim

* More UI refinements

* More UI refinements

* Counting the wrong array

* Tweaks

* Typo

* sort address to be shown, consistency

* check for assigned interface if no address items are assinged to the wg tunnel

* oops left in var_dump

* oops left in var_dump (#63)

* add back sort

* move to builins from preg_match

* roll this back

* move to builtin from preg_match

* Merge backend rewrite into devel (#66)

- Replaces wg-quick with native tools like `wg` , `ifconfig`, and pfSense built-ins
- Updates package dependencies to remove `bash` and replace `wireguard-tools` with `wireguard-tools-lite`
- Fixes issues with services like dpinger and frr not working correctly with tunnel interfaces after system startup
- Lots of additional code improvements and cleanups

* Fix peer re-saving with same public key

* Improved earlyshellcmd handling

* Rewriting some install/deinstall routines for robustness

* Switched to using pfSense builtins for kernel muting

* Destroy tunnels as deinstall

* Working on kmod unloading at deinstall

* Working on kmod unloading at deinstall

Co-authored-by: vajonam <152501+vajonam@users.noreply.github.com>
Co-authored-by: Manojav Sridhar <manojav@manojav.com>

Author: rcmcdonald91

src/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	pfSense-pkg-WireGuard
-PORTVERSION=	0.0.8
+PORTVERSION=	0.0.9
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -11,9 +11,8 @@ COMMENT=	pfSense package WireGuard
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	bash>0:shells/bash \
-		wireguard-kmod>0:net/wireguard-kmod \
-		wireguard-tools>0:net/wireguard-tools
+RUN_DEPENDS=	wireguard-kmod>0:net/wireguard-kmod \
+		wireguard-tools-lite>0:net/wireguard-tools-lite
 
 NO_BUILD=	yes
 NO_MTREE=	yes
@@ -27,10 +26,12 @@ do-extract:
 do-install:
 	${MKDIR} ${STAGEDIR}/etc/inc/priv
 
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc
+
 	${MKDIR} ${STAGEDIR}${PREFIX}/pkg/wireguard
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/shortcuts
-	${MKDIR} ${STAGEDIR}${PREFIX}/www/wg
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/wg/js
 
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
@@ -40,6 +41,9 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard.xml \
 		${STAGEDIR}${PREFIX}/pkg
 
+	${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/etc/rc.* \
+		${STAGEDIR}${PREFIX}/etc
+
 	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/wireguard/*.inc \
 		${STAGEDIR}${PREFIX}/pkg/wireguard
 
@@ -49,6 +53,9 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/wg/*.php \
 		${STAGEDIR}${PREFIX}/www/wg
 
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/wg/js/*.js \
+		${STAGEDIR}${PREFIX}/www/wg/js
+
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
 

src/files/usr/local/etc/rc.reload_wireguard

@@ -0,0 +1,70 @@
+#!/usr/local/bin/php-cgi -f
+<?php
+/*
+ * rc.reload_wireguard
+ *
+ * part of pfSense (https://www.pfsense.org)
+ * Copyright (c) 2021 R. Christian McDonald
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// pfSense includes
+require_once('globals.inc');
+require_once('service-utils.inc');
+require_once('util.inc');
+
+// WireGuard includes
+require_once('wireguard/wg.inc');
+
+global $wgg, $g;
+
+wg_globals();
+
+// This is a hack to get text onto the console during booting
+function print_message($message) {
+
+	$message = gettext($message);
+
+    	$message = escapeshellarg($message);
+
+	mwexec("printf {$message} >&2");
+
+}
+
+$booting = platform_booting();
+
+if ($booting) {
+
+	print_message("Configuring WireGuard tunnels...");
+
+	mute_kernel_msgs();
+
+}
+
+//wg_resync_all();
+
+service_control_restart('unbound', null);
+
+service_control_restart('dpinger', null);
+
+if ($booting) {
+
+	unmute_kernel_msgs();
+
+	print_message("done. \n");
+
+}
+
+?>

src/files/usr/local/pkg/wireguard.xml

@@ -37,19 +37,25 @@
 		<url>/wg/vpn_wg_tunnels.php</url>
 	</menu>
 	<menu>
-		<name>WireGuard Status</name>
+		<name>WireGuard </name>
 		<section>Status</section>
 		<url>/wg/status_wireguard.php</url>
 	</menu>
 	<custom_php_install_command>
+		<![CDATA[
 		wg_install();
+		]]>
 	</custom_php_install_command>
 	<custom_php_pre_deinstall_command>
+		<![CDATA[
 		wg_deinstall();
+		]]>
 	</custom_php_pre_deinstall_command>
 	<custom_php_validation_command>
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
-		wg_resync();
+		<![CDATA[
+		wg_resync_all();
+		]]>
 	</custom_php_resync_config_command>
-</packagegui>
+</packagegui>