From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 13 Jun 2024 17:09:36 +0000 (+0000)
Subject: vpnmain.cgi: Allow passing strings with double @@ as IDs
X-Git-Tag: v2.29-core187~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40d45a305be43fc786e648e8a441368360f0cec6;p=ipfire-2.x.git

vpnmain.cgi: Allow passing strings with double @@ as IDs

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 <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 9173a85d84..25e0f0a535 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1856,8 +1856,8 @@ END
 
 		# Allow nothing or a string (DN,FDQN,) beginning with @
 		# with no comma but slashes between RID eg @O=FR/C=Paris/OU=myhome/CN=franck
-		if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =*\/-]+|\d+\.\d+\.\d+\.\d+)$/) ||
-			($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =*\/-]+|\d+\.\d+\.\d+\.\d+)$/) ||
+		if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[@#]?[\w. =*\/-]+|\d+\.\d+\.\d+\.\d+)$/) ||
+			($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[@#]?[\w. =*\/-]+|\d+\.\d+\.\d+\.\d+)$/) ||
 			(($cgiparams{'REMOTE_ID'} eq $cgiparams{'LOCAL_ID'}) && ($cgiparams{'LOCAL_ID'} ne ''))
 		) {
 			$errormessage = $Lang::tr{'invalid local-remote id'} . '<br />' .