From b1dcf0d59e6589ae82fda03e64d9b00479683f45 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 19 Mar 2024 16:58:30 +0100 Subject: [PATCH] ovpnmain.cgi: Remove authorship comments These are not very useful. Signed-off-by: Michael Tremer --- html/cgi-bin/ovpnmain.cgi | 114 +++----------------------------------- 1 file changed, 8 insertions(+), 106 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index c71be02f8..68c4722c6 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -586,10 +586,6 @@ sub check_ccdconf return 1; } -### -# m.a.d net2net -### - sub validdotmask { my $ipdotmask = $_[0]; @@ -738,7 +734,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $errormessage = $Lang::tr{'ovpn errmsg green already pushed'}; goto ADV_ERROR; } -# a.marx ccd + my %ccdroutehash=(); &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); foreach my $key (keys %ccdroutehash) { @@ -755,8 +751,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { } } -# ccd end - $vpnsettings{'ROUTES_PUSH'} .= $tmpip."\n"; } } @@ -791,10 +785,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { &writeserverconf();#hier ok } -### -# m.a.d net2net -### - if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'server') { @@ -894,10 +884,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General } -### -# m.a.d net2net -### - if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'client') { @@ -1881,10 +1867,6 @@ END ### Enable/Disable connection ### -### -# m.a.d net2net -### - }elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); @@ -1933,10 +1915,6 @@ END my $tempdir = tempdir( CLEANUP => 1 ); my $zippath = "$tempdir/"; -### -# m.a.d net2net -### - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ my $zipname = "$confighash{$cgiparams{'KEY'}}[1]-Client.zip"; @@ -2058,10 +2036,6 @@ else my $zippathname = "$zippath$zipname"; $clientovpn = "$confighash{$cgiparams{'KEY'}}[1]-TO-IPFire.ovpn"; -### -# m.a.d net2net -### - open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; flock CLIENTCONF, 2; @@ -2293,10 +2267,6 @@ else &General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "/usr/share/openvpn/ovpn.cnf"); &General::system("/usr/bin/openssl", "ca", "-gencrl", "-out", "${General::swroot}/ovpn/crls/cacrl.pem", "-config", "/usr/share/openvpn/ovpn.cnf"); -### -# m.a.d net2net -### - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { # Stop the N2N connection before it is removed &General::system("/usr/local/bin/openvpnctrl", "-kn2n", "$confighash{$cgiparams{'KEY'}}[1]"); @@ -2314,7 +2284,7 @@ else unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); -# A.Marx CCD delete ccd files and routes + # Delete CCD files and routes if (-f "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]") { @@ -2338,7 +2308,6 @@ else &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); &writeserverconf; -# CCD end # Update collectd configuration and delete all RRD files of the removed connection &writecollectdconf(); &General::system("/usr/local/bin/openvpnctrl", "-drrd", "$confighash{$cgiparams{'KEY'}}[1]"); @@ -2734,7 +2703,7 @@ END exit(0); -# A.Marx CCD Add,delete or edit CCD net +# Add, delete or edit CCD net } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'ccd net'} || $cgiparams{'ACTION'} eq $Lang::tr{'ccd add'} || @@ -3034,10 +3003,6 @@ END $errormessage = $Lang::tr{'invalid key'}; } -### -# m.a.d net2net -### - } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') { &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &Header::showhttpheaders(); @@ -3084,10 +3049,6 @@ END &Header::closepage(); exit (0); -### -# m.a.d net2net -### - } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) && ($cgiparams{'TYPE'} eq 'net2net')){ my @firen2nconf; @@ -3159,10 +3120,6 @@ END goto N2N_ERROR; } -### -# m.a.d net2net -### - if ($cgiparams{'n2nname'} ne ''){ $uplconffilename2 = "$cgiparams{'n2nname'}.conf"; @@ -3262,10 +3219,6 @@ $n2nauth[1] =~ s/\n|\r//g; chomp ($complzoactive); chomp ($mssfixactive); -### -# m.a.d net2net -### - ### # Check if there is no other entry with this name ### @@ -3423,12 +3376,6 @@ if ($confighash{$cgiparams{'KEY'}}) { $errormessage = $Lang::tr{'invalid key'}; } - -### -# m.a.d net2net -### - - ### ### Adding a new connection ### @@ -3478,7 +3425,7 @@ if ($confighash{$cgiparams{'KEY'}}) { } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); -#A.Marx CCD check iroute field and convert it to decimal +# CCD check iroute field and convert it to decimal if ($cgiparams{'TYPE'} eq 'host') { my @temp=(); my %ccdroutehash=(); @@ -3644,9 +3591,6 @@ if ($cgiparams{'TYPE'} eq 'host') { } } -#CCD End - - if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { $errormessage = $Lang::tr{'connection type is invalid'}; if ($cgiparams{'TYPE'} eq 'net') { @@ -3685,10 +3629,6 @@ if ($cgiparams{'TYPE'} eq 'host') { goto VPNCONF_ERROR; } -### -# m.a.d net2net -### - if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { $errormessage = $Lang::tr{'openvpn destination port used'}; @@ -4323,10 +4263,6 @@ if ($cgiparams{'TYPE'} eq 'net') { close CCDRWCONF; } -### -# m.a.d n2n begin -### - if ($cgiparams{'TYPE'} eq 'net') { if (-e "/var/run/$confighash{$key}[1]n2n.pid") { @@ -4348,10 +4284,6 @@ if ($cgiparams{'TYPE'} eq 'net') { } } -### -# m.a.d n2n end -### - if ($cgiparams{'EDIT_ADVANCED'} eq 'on') { $cgiparams{'KEY'} = $key; $cgiparams{'ACTION'} = $Lang::tr{'advanced'}; @@ -4359,15 +4291,9 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_END; } else { $cgiparams{'ENABLED'} = 'on'; -### -# m.a.d n2n begin -### $cgiparams{'MSSFIX'} = 'on'; $cgiparams{'FRAGMENT'} = '1300'; - $cgiparams{'DAUTH'} = 'SHA512'; -### -# m.a.d n2n end -### + $cgiparams{'DAUTH'} = 'SHA512'; $cgiparams{'SIDE'} = 'left'; if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cgiparams{'AUTH'} = 'psk'; @@ -4639,7 +4565,6 @@ print< END -#jumper print "$Lang::tr{'remark title'}"; print ""; @@ -4648,7 +4573,7 @@ END } print"

"; -#A.Marx CCD new client + if ($cgiparams{'TYPE'} eq 'host') { print ""; my %vpnnet=(); @@ -4681,7 +4606,7 @@ if ($cgiparams{'TYPE'} eq 'host') { print "

$Lang::tr{'ccd choose net'}




"; } } -# ccd end + &Header::closebox(); if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') { @@ -4718,10 +4643,6 @@ if ($cgiparams{'TYPE'} eq 'host') { END ; -### -# m.a.d net2net -### - } else { print <$country"; } -### -# m.a.d net2net -### if ($cgiparams{'TYPE'} eq 'host') { print <
"; &Header::openbox('100%', 'LEFT', "$Lang::tr{'ccd client options'}:"); @@ -5059,11 +4968,10 @@ END $checked{'DCOMPLZO'}{'on'} = ''; $checked{'DCOMPLZO'}{$cgiparams{'DCOMPLZO'}} = 'CHECKED'; -# m.a.d $checked{'MSSFIX'}{'off'} = ''; $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; -#new settings + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', $errormessage); @@ -5229,7 +5137,6 @@ END if ( -f "${General::swroot}/ovpn/ca/cacert.pem" ) { ### -# m.a.d net2net #$Lang::tr{'remark'}
L2089 ### @@ -5328,11 +5235,6 @@ END $col1="class='status is-disabled'"; $active = "$Lang::tr{'capsclosed'}"; } else { - -### -# m.a.d net2net -### - if ($confighash{$key}[3] eq 'net') { if (-e "/var/run/$confighash{$key}[1]n2n.pid") { -- 2.39.5