suricata: Change midstream policy to "pass-flow"

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / proxy.cgi

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 8faf4490cac295c9dc5f35721a2755806d86a73c..c8e3576dfe2b2226b8e5e59a6159f336668dcb0d 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -1421,9 +1421,6 @@ print <<END
 <tr>
        <td colspan="4">&nbsp;</td>
 </tr>
-<tr>
-       <td colspan="4">$Lang::tr{'advproxy wpad notice'}</td>
-</tr>
 </table>
 
 <hr size='1'>
@@ -2506,6 +2503,7 @@ sub check_acls
                if ($_)
                {
                        if (/^\./) { $_ = '*'.$_; }
+                       unless (&General::validwildcarddomainname($_)) { $errormessage = $Lang::tr{'advproxy errmsg invalid url'} . ": " . &Header::escape($_); }
                        $proxysettings{'DST_NOCACHE'} .= $_."\n";
                }
        }
@@ -2604,6 +2602,7 @@ sub check_acls
                        if ($_)
                        {
                                        if (/^\./) { $_ = '*'.$_; }
+                                       unless (&General::validwildcarddomainname($_)) { $errormessage = $Lang::tr{'advproxy errmsg invalid url'} . ": " . &Header::escape($_); }
                                        $proxysettings{'DST_NOPROXY_URL'} .= $_."\n";
                        }
        }
@@ -2987,6 +2986,7 @@ END
                        foreach my $network (@networks) {
                                my ($vpnip, $vpnsub) = split("/", $network);
                                $vpnsub = &Network::convert_prefix2netmask($vpnsub) || $vpnsub;
+                               next if ($vpnip eq "0.0.0.0" || $vpnsub eq "0.0.0.0");
                                print FILE "     (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n";
                        }
                }
@@ -2997,6 +2997,8 @@ END
                        my @networks = split(/\|/, $ovpnconfig{$key}[11]);
                        foreach my $network (@networks) {
                                my ($vpnip, $vpnsub) = split("/", $network);
+                               $vpnsub = &Network::convert_prefix2netmask($vpnsub) || $vpnsub;
+                               next if ($vpnip eq "0.0.0.0" || $vpnsub eq "0.0.0.0");
                                print FILE "     (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n";
                        }
                }
@@ -3606,7 +3608,7 @@ END
 
                print ASNBLFILE<<END
 TESTDATA = (10.0.0.1, 0) (127.0.0.1, 0) (fe80::1, 0)
-ACTIVE_ASNBLS = 
+ACTIVE_ASNBLS =
 END
 ;