]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/ovpnmain.cgi
projects / people / teissler / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ipsec: change status display in cgi's for charon.
[people/teissler/ipfire-2.x.git] / html / cgi-bin / ovpnmain.cgi
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 8a8390a8f7f5430cf432ecc30583b836d10d210c..c99e7beaebd0d0890a55d84cfa3f6f6c32bd264f 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -70,6 +70,8 @@ $cgiparams{'DHCP_DOMAIN'} = '';
 $cgiparams{'DHCP_DNS'} = '';
 $cgiparams{'DHCP_WINS'} = '';
 $cgiparams{'DCOMPLZO'} = 'off';
+$cgiparams{'MSSFIX'} = '';
+
 &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
 
 # prepare openvpn config file
@@ -320,6 +322,7 @@ sub writeserverconf {
     print CONF "proto $sovpnsettings{'DPROTOCOL'}\n";
     print CONF "port $sovpnsettings{'DDEST_PORT'}\n";
     print CONF "script-security 3 system\n";
+    print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n";
     print CONF "tls-server\n";
     print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n";
     print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n";
@@ -331,6 +334,12 @@ sub writeserverconf {
     if ($sovpnsettings{CLIENT2CLIENT} eq 'on') {
        print CONF "client-to-client\n";
     }
+    if ($sovpnsettings{MSSFIX} eq 'on') {
+       print CONF "mssfix\n";
+    }
+    if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
+       print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
+    }
     if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {  
        print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n";
     }  
@@ -357,8 +366,7 @@ sub writeserverconf {
     
     if ($sovpnsettings{DHCP_WINS} eq '') {
        print CONF "max-clients 100\n";
-    }  
-    
+    }
     if ($sovpnsettings{DHCP_WINS} ne '') {
        print CONF "max-clients $sovpnsettings{MAX_CLIENTS}\n";
     }  
@@ -448,6 +456,21 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
     $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'};
     $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'};
     
+    if ($cgiparams{'FRAGMENT'} eq '') {
+       delete $vpnsettings{'FRAGMENT'};
+    } else {
+       if ($cgiparams{'FRAGMENT'} !~ /^[0-9]+$/) { 
+           $errormessage = "Incorrect value, please insert only numbers.";
+        goto ADV_ERROR;
+               } else {
+                       $vpnsettings{'FRAGMENT'} = $cgiparams{'FRAGMENT'};
+       }
+    }
+    if ($cgiparams{'MSSFIX'} ne 'on') {
+       delete $vpnsettings{'MSSFIX'};
+    } else {
+       $vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'};
+    }
     if ($cgiparams{'DHCP_DOMAIN'} ne ''){
        unless (&General::validfqdn($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) {
                $errormessage = $Lang::tr{'invalid input for dhcp domain'};
@@ -1379,7 +1402,13 @@ END
     }
     print CLIENTCONF "verb 3\r\n";
     print CLIENTCONF "ns-cert-type server\r\n";
-    print CLIENTCONF "tls-remote $vpnsettings{ROOTCERT_HOSTNAME}\r\n";
+    print CLIENTCONF "tls-remote $vpnsettings{ROOTCERT_HOSTNAME}\r\n"; 
+    if ($vpnsettings{MSSFIX} eq 'on') {
+       print CLIENTCONF "mssfix\r\n";
+    }
+    if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' ) {
+       print CLIENTCONF "fragment $vpnsettings{'FRAGMENT'}\r\n";
+    }
     close(CLIENTCONF);
     $zip->addFile( "$tempdir/$clientovpn", $clientovpn) or die "Can't add file $clientovpn\n";
     my $status = $zip->writeToFileNamed($zippathname);
@@ -1499,6 +1528,10 @@ ADV_ERROR:
     $checked{'REDIRECT_GW_DEF1'}{'off'} = '';
     $checked{'REDIRECT_GW_DEF1'}{'on'} = '';
     $checked{'REDIRECT_GW_DEF1'}{$cgiparams{'REDIRECT_GW_DEF1'}} = 'CHECKED';
+    $selected{'ENGINES'}{$cgiparams{'ENGINES'}} = 'SELECTED';
+    $checked{'MSSFIX'}{'off'} = '';
+    $checked{'MSSFIX'}{'on'} = '';
+    $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED';
     $selected{'LOG_VERB'}{'1'} = '';
     $selected{'LOG_VERB'}{'2'} = '';
     $selected{'LOG_VERB'}{'3'} = '';
@@ -1512,6 +1545,8 @@ ADV_ERROR:
     $selected{'LOG_VERB'}{'11'} = '';
     $selected{'LOG_VERB'}{'0'} = '';
     $selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} = 'SELECTED';
+
+
     
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'status ovpn'}, 1, '');
@@ -1551,7 +1586,7 @@ ADV_ERROR:
        <td class'base'><b>$Lang::tr{'misc-options'}</b></td>
     </tr>
     <tr>
-       <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td width='30%'></td>
+       <td width='20%'></td> <td width='15%'> </td><td width='15%'> </td><td width='50%'></td>
     </tr>
     <tr>
        <td class='base'>Client-To-Client</td>
@@ -1563,20 +1598,50 @@ ADV_ERROR:
     </tr>
     <tr>       
         <td class='base'>Max-Clients</td>
-        <td><input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' size='30' /></td>
+        <td><input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' size='10' /></td>
     </tr>      
-       <td class='base'>Keppalive (ping/ping-restart)</td>     
-       <td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' size='30' /></td>
-       <td><input type='TEXT' name='KEEPALIVE_2' value='$cgiparams{'KEEPALIVE_2'}' size='30' /></td>
+       <tr>
+         <td class='base'>Keppalive <br />
+           (ping/ping-restart)</td>
+         <td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' size='10' /></td>
+         <td><input type='TEXT' name='KEEPALIVE_2' value='$cgiparams{'KEEPALIVE_2'}' size='10' /></td>
+    </tr>
+       <tr>
+         <td class='base'>fragment <br></td>
+         <td><input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' size='10' /></td>
+         <td>Default: <span class="base">1300</span></td>
+         </tr>
+       <tr>
+         <td class='base'>mssfix</td>
+         <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td>
+         <td>Default: on</td>
+         </tr> 
+</table>
+
+<!--
+<hr size='1'>
+    <table width='100%'>
+    <tr>
+ <td class'base'><b>Crypto-Engines</b></td>
+    </tr>
+    <tr>
+       <td width='15%'></td> <td width='30%'> </td><td width='25%'> </td><td width='30%'></td>
     </tr>      
+    <tr><td class='base'>Engines:</td>        
+        <td><select name='ENGINES'><option value="none" $selected{'ENGINES'}{'none'}>none</option>
+                                   <option value="cryptodev" $selected{'ENGINES'}{'cryptodev'}>cryptodev</option>
+                                   <option value="padlock" $selected{'ENGINES'}{'padlock'}>padlock</option>
+                       </select>
+               </td>   
 </table>
+-->
 <hr size='1'>
     <table width='100%'>
     <tr>
        <td class'base'><b>$Lang::tr{'log-options'}</b></td>
     </tr>
     <tr>
-       <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td width='30%'></td>
+       <td width='15%'></td> <td width='30%'> </td><td width='25%'> </td><td width='30%'></td>
     </tr>      
        
     <tr><td class='base'>VERB</td>        
@@ -1797,35 +1862,6 @@ END
     } else {
        $errormessage = $Lang::tr{'invalid key'};
     }
-#test33
-
-###
-### Choose between adding a host-net or net-net connection
-###
-} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') {
-       &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings);
-       &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-       &Header::openbigbox('100%', 'LEFT', '', '');
-       &Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'});
-       print <<END
-           <b>$Lang::tr{'connection type'}:</b><br />
-           <table><form method='post'>
-           <tr><td><input type='radio' name='TYPE' value='host' checked /></td>
-               <td class='base'>$Lang::tr{'host to net vpn'}</td></tr>
-           <tr><td><input type='radio' name='TYPE' value='net' disabled='disabled' /></td>
-               <td class='base'>$Lang::tr{'net to net vpn'}</td></tr>
-           <tr><td align='center' colspan='2'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr>
-           </form></table>
-END
-       ;
-       &Header::closebox();
-       &Header::closebigbox();
-       &Header::closepage();
-       exit (0);
-###
-### Adding a new connection
-###
 } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) ||
         ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) ||
         ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) {
@@ -1839,9 +1875,10 @@ END
            $errormessage = $Lang::tr{'invalid key'};
            goto VPNCONF_END;
        }
+
        $cgiparams{'ENABLED'}   = $confighash{$cgiparams{'KEY'}}[0];
        $cgiparams{'NAME'}      = $confighash{$cgiparams{'KEY'}}[1];
-       $cgiparams{'TYPE'}      = $confighash{$cgiparams{'KEY'}}[3];
+       $cgiparams{'TYPE'}      = 'host';
        $cgiparams{'AUTH'}      = $confighash{$cgiparams{'KEY'}}[4];
        $cgiparams{'PSK'}       = $confighash{$cgiparams{'KEY'}}[5];
        $cgiparams{'SIDE'}      = $confighash{$cgiparams{'KEY'}}[6];
@@ -1881,11 +1918,6 @@ END
            goto VPNCONF_ERROR;
        }
 
-#      if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) {
-#          $errormessage = $Lang::tr{'ipfire side is invalid'};
-#          goto VPNCONF_ERROR;
-#      }
-
        # Check if there is no other entry with this name
        if (! $cgiparams{'KEY'}) {
            foreach my $key (keys %confighash) {
@@ -1896,11 +1928,6 @@ END
            }
        }
 
-       if (($cgiparams{'TYPE'} eq 'net') && (! $cgiparams{'REMOTE'})) {
-           $errormessage = $Lang::tr{'invalid input for remote host/ip'};
-           goto VPNCONF_ERROR;
-       }
-
        if ($cgiparams{'REMOTE'}) {
            if (! &General::validip($cgiparams{'REMOTE'})) {
                if (! &General::validfqdn ($cgiparams{'REMOTE'}))  {
@@ -1929,10 +1956,6 @@ END
                }
            }
        }
-       if (($cgiparams{'TYPE'} eq 'net') && (! &General::validipandmask($cgiparams{'REMOTE_SUBNET'}))) {
-                $errormessage = $Lang::tr{'remote subnet is invalid'};
-               goto VPNCONF_ERROR;
-       }
 
        if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) {
            $errormessage = $Lang::tr{'invalid input'};
@@ -2056,6 +2079,9 @@ END
                goto VPNCONF_ERROR;
            }
        } elsif ($cgiparams{'AUTH'} eq 'certgen') {
+       
+           $cgiparams{'CERT_NAME'} =~ s/ //g;
+       
            if ($cgiparams{'KEY'}) {
                $errormessage = $Lang::tr{'cant change certificates'};
                goto VPNCONF_ERROR;
@@ -2214,17 +2240,13 @@ END
        if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') {
            $confighash{$key}[2] = $cgiparams{'CERT_NAME'};
        }
-       $confighash{$key}[3] = $cgiparams{'TYPE'};
+       $confighash{$key}[3] = 'host';
        if ($cgiparams{'AUTH'} eq 'psk') {
            $confighash{$key}[4] = 'psk';
            $confighash{$key}[5] = $cgiparams{'PSK'};
        } else {
            $confighash{$key}[4] = 'cert';
        }
-       if ($cgiparams{'TYPE'} eq 'net') {
-           $confighash{$key}[6] = $cgiparams{'SIDE'};
-           $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'};
-       }
        $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'};
        $confighash{$key}[10] = $cgiparams{'REMOTE'};
        $confighash{$key}[25] = $cgiparams{'REMARK'};
@@ -2311,7 +2333,7 @@ END
        }
 
        print "<form method='post' enctype='multipart/form-data'>";
-       print "<input type='hidden' name='TYPE' value='$cgiparams{'TYPE'}' />";
+       print "<input type='hidden' name='TYPE' value='host' />";
 
        if ($cgiparams{'KEY'}) {
            print "<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />";
@@ -2321,7 +2343,6 @@ END
        &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:");
        print "<table width='100%'>\n";
        print "<tr><td width='25%' class='boldbase'>$Lang::tr{'name'}:</td>";
-       if ($cgiparams{'TYPE'} eq 'host') {
            if ($cgiparams{'KEY'}) {
                print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>\n";
            } else {
@@ -2337,42 +2358,6 @@ END
 #          print "<option value='ORANGE' $selected{'INTERFACE'}{'ORANGE'}>ORANGE</option>";
 #          print "</select></td></tr>";
 #          print <<END
-       } else {
-           print "<input type='hidden' name='INTERFACE' value='red' />";
-           if ($cgiparams{'KEY'}) {
-               print "<td width='25%' class='base' nowrap='nowrap'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>";
-           } else {
-               print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' /></td>";
-           }
-           print <<END
-                   <td width='25%'>&nbsp;</td>
-                   <td width='25%'>&nbsp;</td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td>
-                   <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>OpenVPN Server</option>
-                                           <option value='client' $selected{'SIDE'}{'client'}>OpenVPN Client</option></select></td>
-                   <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td>
-                   <td><input type='TEXT' name='REMOTE' value='$cgiparams{'REMOTE'}' /></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td>
-                   <td><input type='TEXT' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' /></td>
-                   <td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td>
-                   <td><input type='text' name='REMOTE_SUBNET' value='$cgiparams{'REMOTE_SUBNET'}' /></td></tr>
-ttt
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}</td>
-                   <td><input type='TEXT' name='OVPN_SUBNET' value='$cgiparams{'OVPN_SUBNET'}' /></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td>
-                   <td><select name='PROTOCOL'><option value='udp' $selected{'PROTOCOL'}{'udp'}>UDP</option>
-                                               <option value='tcp' $selected{'PROTOCOL'}{'tcp'}>TCP</option></select></td>
-                   <td class='boldbase'>$Lang::tr{'destination port'}:</td>
-                   <td><input type='TEXT' name='DEST_PORT' value='$cgiparams{'DEST_PORT'}' size='5' /></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td>
-                   <td><input type='checkbox' name='COMPLZO' $checked{'COMPLZO'}{'on'} /></td>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;<img src='/blob.gif' /></td>
-                   <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></TD>
-                                   
-
-END
-           ;
-       }
        print "<tr><td class='boldbase'>$Lang::tr{'remark title'}&nbsp;<img src='/blob.gif' /></td>";
        print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr>";
        
@@ -2454,6 +2439,11 @@ END
            print <<END
            </select></td></tr>
            <tr><td>&nbsp;</td>
+               
+               <td class='base'>$Lang::tr{'valid till'} (days):</td>
+               <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr>            
+               
+               <tr><td>&nbsp;</td>
                <td class='base'>$Lang::tr{'pkcs12 file password'}:</td>
                <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr>
            <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td>
@@ -2603,7 +2593,8 @@ END
        <td class='boldbase' nowrap='nowrap' colspan='2'>$Lang::tr{'ovpn subnet'}<br /><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' size='30' /></td></tr>
     <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn device'}</td>
         <td><select name='DDEVICE' ><option value='tun' $selected{'DDEVICE'}{'tun'}>TUN</option>
-                                           <option value='tap' $selected{'DDEVICE'}{'tap'}>TAP</option></select></td>                              
+                                       <!-- this is still not working
+                                           <option value='tap' $selected{'DDEVICE'}{'tap'}>TAP</option></select>--> </td>                                  
     <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td>
         <td><select name='DPROTOCOL'><option value='udp' $selected{'DPROTOCOL'}{'udp'}>UDP</option>
                                            <option value='tcp' $selected{'DPROTOCOL'}{'tcp'}>TCP</option></select></td>                                    
Timo's tree of IPFire 2.x