From 4df8b686f527b8d4eeba584aa6e1fdbec1209ab9 Mon Sep 17 00:00:00 2001
From: Zixian Cai <2891235+caizixian@users.noreply.github.com>
Date: Fri, 22 Oct 2021 18:49:16 +1100
Subject: [PATCH] security/openconnect: support different protocols (#2512)

---
 security/openconnect/Makefile                    |  3 +--
 security/openconnect/pkg-descr                   |  4 ++++
 .../OPNsense/Openconnect/forms/general.xml       |  6 ++++++
 .../app/models/OPNsense/Openconnect/General.xml  | 16 +++++++++++++++-
 .../OPNsense/Openconnect/openconnect.conf        |  3 +++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 7dc3f6859..c8efe45d2 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		openconnect
-PLUGIN_VERSION=		1.4.0
-PLUGIN_REVISION=	2
+PLUGIN_VERSION=		1.4.1
 PLUGIN_COMMENT=		OpenConnect Client
 PLUGIN_DEPENDS=		openconnect
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/security/openconnect/pkg-descr b/security/openconnect/pkg-descr
index cba5a5c27..43b692d19 100644
--- a/security/openconnect/pkg-descr
+++ b/security/openconnect/pkg-descr
@@ -6,6 +6,10 @@ the Juniper SSL VPN which is now known as Pulse Connect Secure.
 Plugin Changelog
 ================
 
+1.4.1
+
+* Allow selection of different protocols
+
 1.4.0
 
 * Add "pin-sha256" certificate hash
diff --git a/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/forms/general.xml b/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/forms/general.xml
index 8ce430a18..847b4f3da 100644
--- a/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/forms/general.xml
+++ b/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/forms/general.xml
@@ -47,4 +47,10 @@
         <type>dropdown</type>
         <help>Select the client certificate to use.</help>
     </field>
+    <field>
+        <id>general.protocol</id>
+        <label>Protocl</label>
+        <type>dropdown</type>
+        <help>Select the protocol to use.</help>
+    </field>
 </form>
diff --git a/security/openconnect/src/opnsense/mvc/app/models/OPNsense/Openconnect/General.xml b/security/openconnect/src/opnsense/mvc/app/models/OPNsense/Openconnect/General.xml
index 73924acf6..8c09e9d66 100644
--- a/security/openconnect/src/opnsense/mvc/app/models/OPNsense/Openconnect/General.xml
+++ b/security/openconnect/src/opnsense/mvc/app/models/OPNsense/Openconnect/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/openconnect/general</mount>
     <description>Openconnect configuration</description>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -47,5 +47,19 @@
             <Type>cert</Type>
             <Required>N</Required>
         </clientcertificate>
+        <protocol type="OptionField">
+            <default>anyconnect</default>
+            <multiple>N</multiple>
+            <Required>Y</Required>
+                <OptionValues>
+                    <anyconnect>Cisco AnyConnect</anyconnect>
+                    <nc>Juniper</nc>
+                    <pulse>Pulse Connect Secure</pulse>
+                    <gp>Palo Alto Networks GlobalProtect</gp>
+                    <f5>F5 Big-IP</f5>
+                    <fortinet>Fortinet Fortigate</fortinet>
+                    <array>Array Networks AG</array>
+                </OptionValues>
+        </protocol>
     </items>
 </model>
diff --git a/security/openconnect/src/opnsense/service/templates/OPNsense/Openconnect/openconnect.conf b/security/openconnect/src/opnsense/service/templates/OPNsense/Openconnect/openconnect.conf
index d7d888caa..626091fad 100644
--- a/security/openconnect/src/opnsense/service/templates/OPNsense/Openconnect/openconnect.conf
+++ b/security/openconnect/src/opnsense/service/templates/OPNsense/Openconnect/openconnect.conf
@@ -19,4 +19,7 @@ authgroup={{ OPNsense.openconnect.general.group }}
 certificate=/usr/local/etc/openconnect_cert.pem
 sslkey=/usr/local/etc/openconnect_key.pem
 {%   endif %}
+{%   if helpers.exists('OPNsense.openconnect.general.protocol') and OPNsense.openconnect.general.protocol != '' %}
+protocol={{ OPNsense.openconnect.general.protocol }}
+{%   endif %}
 {% endif %}