BUG10916: check comma in PSK field

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 8c44b7e93a392babefcac16380b145156e217006..4f47742cbd282031e31f2f1e1c9250dc71ec6e41 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1413,6 +1413,10 @@ END
                $errormessage = $Lang::tr{'invalid characters found in pre-shared key'};
                goto VPNCONF_ERROR;
            }
+               if ($cgiparams{'PSK'} =~ /,/) {
+                       $errormessage = $Lang::tr{'invalid characters found in pre-shared key'};
+                       goto VPNCONF_ERROR;
+               }
        } elsif ($cgiparams{'AUTH'} eq 'certreq') {
            if ($cgiparams{'KEY'}) {
                $errormessage = $Lang::tr{'cant change certificates'};