webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

proxy.cgi: Allow to set a hostname as upstream proxy.

Browse Source 
Fixes #10215.
This commit is contained in:
Stefan Schantl
2013-01-22 19:38:12 +01:00
parent e201b6d537
commit dcfc6334b9
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
html/cgi-bin/proxy.cgi
View File

@@ -358,12 +358,17 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
$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))

2
langs/de/cgi-bin/de.pl
View File

@@ -223,7 +223,7 @@
'advproxy errmsg invalid mac' => 'Ungültige MAC-Adresse',
'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller',
'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port',
'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy',
'advproxy errmsg invalid upstream proxy' => 'Ungültige IP/Hostname für Upstream-Proxy',
'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy',
'advproxy errmsg invalid user' => 'Benutzername existiert nicht',
'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich',

2
langs/en/cgi-bin/en.pl
View File

@@ -223,7 +223,7 @@
'advproxy errmsg invalid mac' => 'Invalid MAC address',
'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller',
'advproxy errmsg invalid proxy port' => 'Invalid proxy port',
'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP',
'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP/hostname',
'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
'advproxy errmsg invalid user' => 'Username does not exist',
'advproxy errmsg ldap base dn' => 'LDAP base DN required',