From 8fe749f1bb908523d574cbcd9b11c827183b2c11 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Tue, 8 Jan 2019 09:49:04 +0100
Subject: [PATCH] security/openconnect: allow more characters to group name
 (#1122)

---
 security/openconnect/Makefile                 |  2 +-
 security/openconnect/pkg-descr                | 35 +++++++++++++++++++
 .../models/OPNsense/Openconnect/General.xml   |  4 +--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 24050b843..f313dc9ed 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		openconnect
-PLUGIN_VERSION=		1.3.2
+PLUGIN_VERSION=		1.3.3
 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 f34a11698..6338929ed 100644
--- a/security/openconnect/pkg-descr
+++ b/security/openconnect/pkg-descr
@@ -2,4 +2,39 @@ OpenConnect is an SSL VPN client initially created to support
 Cisco's AnyConnect SSL VPN. It has since been ported to support
 the Juniper SSL VPN which is now known as Pulse Connect Secure.
 
+
+Plugin Changelog
+================
+
+1.3.3
+
+* Enhance allowed characters in group name
+
+1.3.2
+
+* Reworked init script to better handle SIGINT
+
+1.3.1
+
+* Add non-inter option to config
+
+1.3
+
+* Add group separation
+* Allow client certificate based authentication
+
+1.2
+
+* Allow @ in user name
+* Allow upper case characters user name
+
+1.1
+
+* Add field to allow untrusted certificates via certificate hash string
+
+1.0
+
+* Initial release
+
+
 WWW: http://www.infradead.org/openconnect/
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 02adcf576..a698445cd 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
@@ -39,8 +39,8 @@
         </hash>
         <group type="TextField">
             <Required>N</Required>
-            <mask>/^[a-zA-Z0-9]{1,64}$/</mask>
-            <ValidationMessage>Only a-zA-Z0-9 are allowed.</ValidationMessage>
+            <mask>/^[a-zA-Z0-9._-]{1,64}$/</mask>
+            <ValidationMessage>Please provide a valid group name. Allowed characters are a-zA-Z0-9._- and it has to be 1-64 characters long.</ValidationMessage>
         </group>
         <clientcertificate type="CertificateField">
             <Type>cert</Type>