From 20d887b88ea0a3a2ba167a5eefdce6523511c63a Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Wed, 19 Sep 2018 09:18:40 +0200
Subject: [PATCH] security/openconnect: allow @ in username (#848)

(cherry picked from commit 8b4d7732246dfbe8d961ab8250ba6e80237269ae)
---
 security/openconnect/Makefile                                 | 2 +-
 .../opnsense/mvc/app/models/OPNsense/Openconnect/General.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 1c777209f..50d7f87cd 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		openconnect
-PLUGIN_VERSION=		1.1
+PLUGIN_VERSION=		1.2
 PLUGIN_COMMENT=		OpenConnect Client
 PLUGIN_DEPENDS=		openconnect
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
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 2a70b9bfc..6dd42fcdf 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
@@ -16,8 +16,8 @@
         <user type="TextField">
             <default>user</default>
             <Required>Y</Required>
-            <mask>/^[a-z0-9._-]{1,32}$/</mask>
-            <ValidationMessage>Please provide a valid username. Allowed characters are a-z0-9._- and it has to be 1-32 characters long.</ValidationMessage>
+            <mask>/^[a-z0-9.\@_-]{1,32}$/</mask>
+            <ValidationMessage>Please provide a valid username. Allowed characters are a-z0-9._-@ and it has to be 1-32 characters long.</ValidationMessage>
         </user>
         <password type="TextField">
             <default>password</default>