###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
$errormessage = $Lang::tr{'invalid input'};
goto ERROR;
}
- if($proxysettings{'CACHE_MEM'} > $proxysettings{'CACHE_SIZE'}){
+ if($proxysettings{'CACHE_MEM'} > $proxysettings{'CACHE_SIZE'} && $proxysettings{'CACHE_SIZE'} > 0){
$errormessage = $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{'CACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
goto ERROR;
}
$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
goto ERROR;
}
- if (!($proxysettings{'UPSTREAM_PROXY'} eq '')) {
- my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
- if (!(&General::validip($temp[0]))) {
- $errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
- goto ERROR;
- }
+ if (!($proxysettings{'UPSTREAM_PROXY'} eq ''))
+ {
+ my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
+ if (!(&General::validip($temp[0])))
+ {
+ if (!(&General::validdomainname($temp[0])))
+ {
+ $errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
+ goto ERROR;
+ }
+ }
}
if (!($proxysettings{'CACHE_SIZE'} =~ /^\d+/) ||
($proxysettings{'CACHE_SIZE'} < 10))
}
if (!&General::validip($proxysettings{'LDAP_SERVER'}))
{
- $errormessage = $Lang::tr{'advproxy errmsg ldap server'};
- goto ERROR;
+ if (!&General::validdomainname($proxysettings{'LDAP_SERVER'}))
+ {
+ $errormessage = $Lang::tr{'advproxy errmsg ldap server'};
+ goto ERROR;
+ }
}
if (!&General::validport($proxysettings{'LDAP_PORT'}))
{
cache_mem $proxysettings{'CACHE_MEM'} MB
END
;
-
- if ($proxysettings{'CACHE_SIZE'} ne '0')
- {
- print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
- }
-
print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n";
if ($proxysettings{'OFFLINE_MODE'} eq 'on') { print FILE "offline_mode on\n\n"; }
print FILE "\n";
}
+ if ($proxysettings{'CACHE_SIZE'} ne '0')
+ {
+ print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
+ }
+
if ($proxysettings{'LOGGING'} eq 'on')
{
print FILE <<END
if ($proxysettings{'NO_PROXY_LOCAL'} eq 'on')
{
- print FILE "#Prevent internal proxy access to Green\n";
- print FILE "http_access deny IPFire_green_servers !IPFire_green_network\n\n";
+ print FILE "#Prevent internal proxy access to Green except IPFire itself\n";
+ print FILE "http_access deny IPFire_green_servers !IPFire_ips !IPFire_green_network\n\n";
}
if ($proxysettings{'NO_PROXY_LOCAL_BLUE'} eq 'on')
{
- print FILE "#Prevent internal proxy access from Blue\n";
+ print FILE "#Prevent internal proxy access from Blue except IPFire itself\n";
print FILE "http_access allow IPFire_blue_network IPFire_blue_servers\n";
- print FILE "http_access deny IPFire_blue_network IPFire_servers\n\n";
+ print FILE "http_access deny IPFire_blue_network !IPFire_ips IPFire_servers\n\n";
}
print FILE <<END