Proxy Portrange beschraenkt Port darf nicht 444 222 81 oder 53 sein und muss zwischen...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@558 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 4365de5ded603b1c77d9aaf6318d9fdc31586a02..78f925f7058c81b8f93220f49ebc2fad3ad47a1d 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -203,6 +203,21 @@ sub validport
        return 0;
 }
 
+sub validproxyport
+{
+       $_ = $_[0];
+
+       if (!/^\d+$/) {
+               return 0; }
+       if (/^0./) {
+               return 0; }
+       if ($_ == 53 || $_ == 222 || $_ == 444 || $_ == 81 ) {
+               return 0; }
+       elsif ($_ >= 1 && $_ <= 65535) {
+               return 1; }
+       return 0;
+}
+
 sub validmac
 {
        my $checkmac = $_[0];

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index e582b4e5724e82aad412cdc53651c1038ac46080..b91ec3a90f8d96d994fbf98c30c51e07f080d390 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -312,7 +312,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                $errormessage = $Lang::tr{'invalid input'};
                goto ERROR;
        } 
-       if (!(&General::validport($proxysettings{'PROXY_PORT'})))
+       if (!(&General::validproxyport($proxysettings{'PROXY_PORT'})))
        {
                $errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
                goto ERROR;