From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] vpnmain.cgi: Allow passing strings with double @@ as IDs Date: Thu, 13 Jun 2024 17:09:36 +0000 Message-ID: <20240613170936.3287234-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7025465352735191740==" List-Id: --===============7025465352735191740== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is required to configure a user FQDN which some VPN peers might send. This patch also allows setting a key ID using @#. Signed-off-by: Michael Tremer --- html/cgi-bin/vpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 9173a85d8..25e0f0a53 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1856,8 +1856,8 @@ END =20 # Allow nothing or a string (DN,FDQN,) beginning with @ # with no comma but slashes between RID eg @O=3DFR/C=3DParis/OU=3Dmyhome/C= N=3Dfranck - if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =3D*\/-]+|\d+\.\d+\.\d+\.= \d+)$/) || - ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =3D*\/-]+|\d+\.\d+\.\d+\.\d+= )$/) || + if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[@#]?[\w. =3D*\/-]+|\d+\.\d+\.= \d+\.\d+)$/) || + ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[@#]?[\w. =3D*\/-]+|\d+\.\d+\.\d+= \.\d+)$/) || (($cgiparams{'REMOTE_ID'} eq $cgiparams{'LOCAL_ID'}) && ($cgiparams{'LOCA= L_ID'} ne '')) ) { $errormessage =3D $Lang::tr{'invalid local-remote id'} . '
' . --=20 2.39.2 --===============7025465352735191740==--