###############################################################################
# #
# 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 #
$proxysettings{'CACHE_POLICY'} = 'LRU';
$proxysettings{'L1_DIRS'} = '16';
$proxysettings{'OFFLINE_MODE'} = 'off';
+$proxysettings{'CACHE_DIGESTS'} = 'off';
$proxysettings{'CLASSROOM_EXT'} = 'off';
$proxysettings{'SUPERVISOR_PASSWORD'} = '';
$proxysettings{'NO_PROXY_LOCAL'} = 'off';
$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 (!($proxysettings{'FILEDESCRIPTORS'} =~ /^\d+/) ||
- ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 16384))
+ ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 65536))
{
$errormessage = $Lang::tr{'proxy errmsg filedescriptors'};
goto ERROR;
}
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'}))
{
$checked{'OFFLINE_MODE'}{'off'} = '';
$checked{'OFFLINE_MODE'}{'on'} = '';
$checked{'OFFLINE_MODE'}{$proxysettings{'OFFLINE_MODE'}} = "checked='checked'";
+$checked{'CACHE_DIGESTS'}{'off'} = '';
+$checked{'CACHE_DIGESTS'}{'on'} = '';
+$checked{'CACHE_DIGESTS'}{$proxysettings{'CACHE_DIGESTS'}} = "checked='checked'";
$checked{'LOGGING'}{'off'} = '';
$checked{'LOGGING'}{'on'} = '';
<td class='base'>$Lang::tr{'advproxy offline mode'}:</td>
<td><input type='checkbox' name='OFFLINE_MODE' $checked{'OFFLINE_MODE'}{'on'} /></td>
</tr>
+<tr>
+ <td class='base'>$Lang::tr{'advproxy cache-digest'}:</td>
+ <td><input type='checkbox' name='CACHE_DIGESTS' $checked{'CACHE_DIGESTS'}{'on'} /></td>
+</tr>
</table>
<hr size='1'>
<table width='100%'>
END
;
+
+ # Include file with user defined settings.
+ if (-e "/etc/squid/squid.conf.pre.local") {
+ print FILE "include /etc/squid/squid.conf.pre.local\n\n";
+ }
+
print FILE "http_port $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}";
if ($proxysettings{'TRANSPARENT'} eq 'on') { print FILE " transparent" }
if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " no-connection-auth" }
print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n";
if ($proxysettings{'OFFLINE_MODE'} eq 'on') { print FILE "offline_mode on\n\n"; }
-
+ if ($proxysettings{'CACHE_DIGESTS'} eq 'on') { print FILE "digest_generation on\n\n"; } else { print FILE "digest_generation off\n\n"; }
+
if ((!($proxysettings{'MEM_POLICY'} eq 'LRU')) || (!($proxysettings{'CACHE_POLICY'} eq 'LRU')))
{
if (!($proxysettings{'MEM_POLICY'} eq 'LRU'))
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