From 488263b335a19a2062c305ca249bd1e69de06b62 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sun, 11 Aug 2019 09:12:45 +0200
Subject: [PATCH] net/wireguard: add gateway support for PBR via PF (#1443)

---
 net/wireguard/Makefile                              |  2 +-
 net/wireguard/pkg-descr                             | 13 +++++++++++++
 .../Wireguard/forms/dialogEditWireguardServer.xml   |  7 +++++++
 .../mvc/app/models/OPNsense/Wireguard/Server.xml    | 12 ++++++++++++
 .../OPNsense/Wireguard/wireguard-server.conf        |  4 ++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index 2e882561a..6af950a80 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		wireguard
-PLUGIN_VERSION=		1.0
+PLUGIN_VERSION=		1.1
 PLUGIN_COMMENT=		WireGuard VPN service
 PLUGIN_DEPENDS=		wireguard
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/wireguard/pkg-descr b/net/wireguard/pkg-descr
index 898043d41..fb5515de4 100644
--- a/net/wireguard/pkg-descr
+++ b/net/wireguard/pkg-descr
@@ -12,3 +12,16 @@ most secure, easiest to use, and simplest VPN solution in
 the industry.
 
 WWW: https://www.wireguard.com/
+
+Changelog
+---------
+
+1.1
+
+* Allow adding interface route for PBR
+
+1.0
+
+* Support for most features like S2S, Roadwarror
+* DNS, MTU, PSK
+* Allow to disable setting routes for PBR
diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
index 06cff45cb..9354e8abf 100644
--- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
+++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
@@ -71,4 +71,11 @@
         <type>checkbox</type>
         <help>This will prevent installing routes. Usually you only enable this to do own routing decisions via a local gateway and gateway rules.</help>
     </field>
+    <field>
+        <id>server.gateway</id>
+        <label>Gateway</label>
+        <type>text</type>
+        <advanced>true</advanced>
+        <help>Set the gateway IP here when using Disable Routes feature. You also have to add this as a gateway in OPNsense.</help>
+    </field>
 </form>
diff --git a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
index 1ee749514..01bae7884 100644
--- a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
+++ b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
@@ -50,7 +50,19 @@
                 <disableroutes type="BooleanField">
                     <default>0</default>
                     <Required>Y</Required>
+                    <Constraints>
+                        <check001>
+                            <ValidationMessage>You have to enable Disable Routes option.</ValidationMessage>
+                            <type>DependConstraint</type>
+                            <addFields>
+                                <field1>gateway</field1>
+                            </addFields>
+                        </check001>
+                    </Constraints>
                 </disableroutes>
+                <gateway type="NetworkField">
+                    <Required>N</Required>
+                </gateway>
                 <peers type="ModelRelationField">
                     <Model>
                         <template>
diff --git a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
index 2cbde517d..f3452f629 100644
--- a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
+++ b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
@@ -17,6 +17,10 @@ PrivateKey = {{ server_list.privkey }}
 {%         if server_list.disableroutes == '1' %}
 Table = off
 {%         endif %}
+{%         if server_list.disableroutes == '1' and server_list.gateway|default('') != '' %}
+PostUp = route add {{ server_list.gateway }} -iface %i
+PostDown = route del {{ server_list.gateway }} -iface %i
+{%         endif %}
 {%         if server_list.peers|default('') != '' %}
 {%           for peerlist in server_list.peers.split(",") %}
 {%             set peerlist2_data = helpers.getUUID(peerlist) %}