diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile index 6ccfbb0c5..9296d2ffc 100644 --- a/security/openconnect/Makefile +++ b/security/openconnect/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= openconnect -PLUGIN_VERSION= 1.4.4 +PLUGIN_VERSION= 1.4.5 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 77338528c..9d18d3a10 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.5 + +* Allow ":" and "/" characters in user name + 1.4.4 * Improve compatibility via useragent="AnyConnect" 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 647d9accd..9b9560a56 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 @@ -4,33 +4,32 @@ 1.0.3 - 0 + 0 Y - server + server Y - /\S*/ + /\S*/ Please provide IP or hostname (no spaces allowed). - user + user Y - /^[a-zA-Z0-9.\@_-]{1,64}$/ - Please provide a valid username. Allowed characters are a-zA-Z0-9._-@ and it has to be 1-64 characters long. + /^[a-zA-Z0-9.\@_\-:\/]{1,64}$/ + Please provide a valid username. Allowed characters are a-zA-Z0-9.@_-:/ and it has to be 1-64 characters long. - password + password Y N - /^([a-zA-Z0-9\/\+\=]){40,64}$/u + /^([a-zA-Z0-9\/\+\=]){40,64}$/u Please provide a valid hash. - sha256 - N + sha256 Y SHA256 @@ -40,7 +39,7 @@ N - /^[() a-zA-Z0-9._-]{1,64}$/ + /^[() a-zA-Z0-9._-]{1,64}$/ Please provide a valid group name. Allowed are at most 64 characters from a-zA-Z0-9._-() and space. @@ -60,8 +59,7 @@ N - anyconnect - N + anyconnect Y Cisco AnyConnect diff --git a/security/openconnect/src/opnsense/mvc/app/views/OPNsense/Openconnect/general.volt b/security/openconnect/src/opnsense/mvc/app/views/OPNsense/Openconnect/general.volt index 2f876fdf0..5faec528a 100644 --- a/security/openconnect/src/opnsense/mvc/app/views/OPNsense/Openconnect/general.volt +++ b/security/openconnect/src/opnsense/mvc/app/views/OPNsense/Openconnect/general.volt @@ -1,35 +1,33 @@ {# + # Copyright (c) 2014-2018 Deciso B.V. + # Copyright (c) 2018 Michael Muenz + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without modification, + # are permitted provided that the following conditions are met: + # + # 1. Redistributions of source code must retain the above copyright notice, + # this list of conditions and the following disclaimer. + # + # 2. Redistributions in binary form must reproduce the above copyright notice, + # this list of conditions and the following disclaimer in the documentation + # and/or other materials provided with the distribution. + # + # THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, + # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + # AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + # AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + # OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # POSSIBILITY OF SUCH DAMAGE. + #} -OPNsense® is Copyright © 2014 – 2018 by Deciso B.V. -This file is Copyright © 2018 by Michael Muenz -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -#}
{{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}} -
-
+