tor.cgi: Check for valid accounting limit.

[people/teissler/ipfire-2.x.git] / html / cgi-bin / tor.cgi

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 6b4d9cc1b25b370905d5331f30c231dc70acd7c2..28d8bf7ef15f71b92f8ba9d2ac21b311b56b35d4 100644 (file)
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -51,8 +51,7 @@ my @bandwidth_limits = (
               1024, # 1M
                512,
                256,
-               128,
-                64
+               160
 );
 my @accounting_periods = ('daily', 'weekly', 'monthly');
 
@@ -74,7 +73,10 @@ if (&Header::blue_used()) {
 
 $settings{'TOR_RELAY_ENABLED'} = 'off';
 $settings{'TOR_RELAY_MODE'} = 'exit';
+$settings{'TOR_RELAY_ADDRESS'} = '';
 $settings{'TOR_RELAY_PORT'} = 9001;
+$settings{'TOR_RELAY_NICKNAME'} = '';
+$settings{'TOR_RELAY_CONTACT_INFO'} = '';
 $settings{'TOR_RELAY_NOADVERTISE'} = 'off';
 $settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0;
 $settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0;
@@ -88,9 +90,6 @@ my $warnmessage = '';
 
 &Header::showhttpheaders();
 
-# Load settings from file.
-&General::readhash("${General::swroot}/tor/settings", \%settings);
-
 # Get GUI values.
 &Header::getcgihash(\%settings);
 
@@ -99,6 +98,28 @@ our $torctrl = &TorConnect();
 
 # Toggle enable/disable field.
 if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
+       if ($settings{'TOR_RELAY_NICKNAME'} !~ /^[a-zA-Z0-9]+$/) {
+               $errormessage = "$Lang::tr{'tor errmsg invalid relay name'}: $settings{'TOR_RELAY_NICKNAME'}";
+       }
+
+       if (!&General::validport($settings{'TOR_SOCKS_PORT'})) {
+               $errormessage = "$Lang::tr{'tor errmsg invalid socks port'}: $settings{'TOR_SOCKS_PORT'}";
+       }
+
+       if (!&General::validport($settings{'TOR_RELAY_PORT'})) {
+               $errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}";
+       }
+
+       if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
+               if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) {
+                       $errormessage = "$Lang::tr{'tor errmsg invalid relay address'}: $settings{'TOR_RELAY_ADDRESS'}";
+               }
+       }
+
+       if ($settings{'TOR_RELAY_ACCOUNTING_LIMIT'} !~ /^\d+$/) {
+               $errormessage = "$Lang::tr{'tor errmsg invalid accounting limit'}: $settings{'TOR_RELAY_ACCOUNTING_LIMIT'}";
+       }
+
        my @temp = split(/[\n,]/,$settings{'TOR_ALLOWED_SUBNETS'});
        $settings{'TOR_ALLOWED_SUBNETS'} = "";
        foreach (@temp) {
@@ -120,6 +141,14 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                }
        }
 
+       # Burst bandwidth must be less or equal to bandwidth rate.
+       if ($settings{'TOR_RELAY_BANDWIDTH_RATE'} == 0) {
+               $settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0;
+
+       } elsif ($settings{'TOR_RELAY_BANDWIDTH_BURST'} < $settings{'TOR_RELAY_BANDWIDTH_RATE'}) {
+               $settings{'TOR_RELAY_BANDWIDTH_BURST'} = $settings{'TOR_RELAY_BANDWIDTH_RATE'};
+       }
+
        if ($errormessage eq '') {
                # Write configuration settings to file.
                &General::writehash("${General::swroot}/tor/settings", \%settings);
@@ -127,9 +156,9 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                # Update configuration files.
                &BuildConfiguration();
        }
-
-       # Reset ACTION.
-       $settings{'ACTION'} = '';
+} else {
+       # Load settings from file.
+       &General::readhash("${General::swroot}/tor/settings", \%settings);
 }
 
 &showMainBox();
@@ -171,21 +200,19 @@ sub showMainBox() {
                        </tr>
                        <tr>
                                <td width='25%' class='base'>$Lang::tr{'tor enabled'}:</td>
-                               <td width='20%'><input type='checkbox' name='TOR_ENABLED' $checked{'TOR_ENABLED'}{'on'} /></td>
-                               <td width='25%' class='base'></td>
-                               <td width='30%'></td>
+                               <td width='30%'><input type='checkbox' name='TOR_ENABLED' $checked{'TOR_ENABLED'}{'on'} /></td>
+                               <td width='25%' class='base'>$Lang::tr{'tor socks port'}:</td>
+                               <td width='20%'><input type='text' name='TOR_SOCKS_PORT' value='$settings{'TOR_SOCKS_PORT'}' size='5' /></td>
                        </tr>
                        <tr>
                                <td width='25%' class='base'>$Lang::tr{'tor relay enabled'}:</td>
-                               <td width='20%'><input type='checkbox' name='TOR_RELAY_ENABLED' $checked{'TOR_RELAY_ENABLED'}{'on'} /></td>
+                               <td width='30%'><input type='checkbox' name='TOR_RELAY_ENABLED' $checked{'TOR_RELAY_ENABLED'}{'on'} /></td>
                                <td width='25%' class='base'></td>
-                               <td width='30%'></td>
+                               <td width='20%'></td>
                        </tr>
                </table>
 END
 
-       &Header::closebox();
-
        if ($settings{'TOR_ENABLED'} eq 'on') {
                my @temp = split(",", $settings{'TOR_ALLOWED_SUBNETS'});
                $settings{'TOR_ALLOWED_SUBNETS'} = join("\n", @temp);
@@ -193,18 +220,10 @@ END
                @temp = split(",", $settings{'TOR_USE_EXIT_NODES'});
                $settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp);
 
-               &Header::openbox('100%', 'left', $Lang::tr{'tor configuration'});
-
                print <<END;
-                       <table width='100%'>
-                               <tr>
-                                       <td width='25%' class='base'>$Lang::tr{'tor socks port'}:</td>
-                                       <td width='30%'><input type='text' name='TOR_SOCKS_PORT' value='$settings{'TOR_SOCKS_PORT'}' size='5' /></td>
-                                       <td width='50%' class='base' colspan='2'></td>
-                               </tr>
-                       </table>
-
+                       <br>
                        <hr size='1'>
+                       <br>
 
                        <table width='100%'>
                                <tr>
@@ -224,7 +243,9 @@ END
                                </tr>
                        </table>
 
+                       <br>
                        <hr size='1'>
+                       <br>
 
                        <table width='100%'>
                                <tr>
@@ -250,16 +271,17 @@ END
                print <<END;
                                                </select>
                                        </td>
-                                       <td colspan='2'>
+                                       <td width='50%' colspan='2'>
                                                <textarea name='TOR_USE_EXIT_NODES' cols='32' rows='3' wrap='off'>$settings{'TOR_USE_EXIT_NODES'}</textarea>
                                        </td>
                                </tr>
                        </table>
+                       <br><br>
 END
-
-               &Header::closebox();
        }
 
+       &Header::closebox();
+
        if ($settings{'TOR_RELAY_ENABLED'} eq 'on') {
                $checked{'TOR_RELAY_NOADVERTISE'}{'on'} = '';
                $checked{'TOR_RELAY_NOADVERTISE'}{'off'} = '';
@@ -516,10 +538,12 @@ END
 
                my @nodes = &TorORConnStatus($torctrl);
                if (@nodes) {
+                       my $nodes_length = scalar @nodes;
                        print <<END;
                                <table width='100%'>
                                        <tr>
-                                               <td colspan='3' class='base'><b>$Lang::tr{'tor connected relays'}</b></td>
+                                               <td width='40%' class='base'><b>$Lang::tr{'tor connected relays'}</b></td>
+                                               <td width='60%' colspan='2'>($nodes_length)</td>
                                        </tr>
 END
 
@@ -678,9 +702,9 @@ sub BuildConfiguration() {
 
        # Restart the service.
        if (($settings{'TOR_ENABLED'} eq 'on') || ($settings{'TOR_RELAY_ENABLED'} eq 'on')) {
-               system("/usr/local/bin/torctrl restart");
+               system("/usr/local/bin/torctrl restart &>/dev/null");
        } else {
-               system("/usr/local/bin/torctrl stop");
+               system("/usr/local/bin/torctrl stop &>/dev/null");
        }
 }