OpenVPN CCD: Fix ccd filename when certificate has spaces in name. Now the filename...

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 6def979e455a1de87f11b1458e14a2da83587d69..b3c7b4847d7941ba842a3b962087549bbe39a7e4 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -3980,6 +3980,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
                        if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){
                                unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}";
                        }
+                       $confighash{$key}[2] =~ s/ /_/gi;
                        open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!";
                        print CCDRWCONF "# OpenVPN clientconfig from ccd extension by Copymaster#\n\n";
                        if($cgiparams{'CHECK1'} eq 'dynamic'){

diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert
index ac76435f6bf0742d999733252de7671a4616ac07..7aa8cf13ea42106ce2abba086b6d7ce886fcfbb9 100644 (file)
--- a/src/scripts/ovpn-ccd-convert
+++ b/src/scripts/ovpn-ccd-convert
@@ -31,6 +31,7 @@ open(FILE,"/var/ipfire/ovpn/server.conf");
 &General::readhasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig);
 foreach my $key (keys %ovpnconfig){
        if($ovpnconfig{$key}[32] eq '' && $ovpnconfig{$key}[3] eq 'host'){
+               $ovpnconfig{$key}[2] =~ s/ /_/gi;
                open ( CCDRWCONF,'>',"/var/ipfire/ovpn/ccd/$ovpnconfig{$key}[2]") or die "Unable to create clientconfigfile $!";
                print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n";
                print CCDRWCONF "#This client uses the dynamic pool\n\n";