diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2015-10-28 03:27:34 +0100 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2015-10-28 03:28:03 +0100 |
| commit | 175f9c1022672ae8d47c93ad0cf31084eb868ecb (patch) | |
| tree | 75917b225847248910adcea2f686ed20b2b009c5 /Bugzilla/Config | |
| parent | f521f52eaee19967ef5898cad3c8cf1cd8b84675 (diff) | |
| download | bugzilla-175f9c1022672ae8d47c93ad0cf31084eb868ecb.tar.gz bugzilla-175f9c1022672ae8d47c93ad0cf31084eb868ecb.tar.xz | |
Bug 1217536 - allow inbound_proxy supports '*'
Diffstat (limited to 'Bugzilla/Config')
| -rw-r--r-- | Bugzilla/Config/Advanced.pm | 13 | ||||
| -rw-r--r-- | Bugzilla/Config/Common.pm | 11 |
2 files changed, 13 insertions, 11 deletions
diff --git a/Bugzilla/Config/Advanced.pm b/Bugzilla/Config/Advanced.pm index 4b57df24d..893213b02 100644 --- a/Bugzilla/Config/Advanced.pm +++ b/Bugzilla/Config/Advanced.pm @@ -47,7 +47,7 @@ use constant get_param_list => ( name => 'inbound_proxies', type => 't', default => '', - checker => \&check_ip + checker => \&check_inbound_proxies }, { @@ -108,4 +108,15 @@ use constant get_param_list => ( }, ); +sub check_inbound_proxies { + my $inbound_proxies = shift; + + return "" if $inbound_proxies eq "*"; + my @proxies = split(/[\s,]+/, $inbound_proxies); + foreach my $proxy (@proxies) { + validate_ip($proxy) || return "$proxy is not a valid IPv4 or IPv6 address"; + } + return ""; +} + 1; diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm index 35a70994b..4c9994e0e 100644 --- a/Bugzilla/Config/Common.pm +++ b/Bugzilla/Config/Common.pm @@ -48,7 +48,7 @@ use base qw(Exporter); qw(check_multi check_numeric check_regexp check_url check_group check_sslbase check_priority check_severity check_platform check_opsys check_shadowdb check_urlbase check_webdotbase - check_user_verify_class check_ip + check_user_verify_class check_mail_delivery_method check_notification check_utf8 check_bug_status check_smtp_auth check_theschwartz_available check_maxattachmentsize check_email @@ -130,15 +130,6 @@ sub check_sslbase { return ""; } -sub check_ip { - my $inbound_proxies = shift; - my @proxies = split(/[\s,]+/, $inbound_proxies); - foreach my $proxy (@proxies) { - validate_ip($proxy) || return "$proxy is not a valid IPv4 or IPv6 address"; - } - return ""; -} - sub check_utf8 { my $utf8 = shift; # You cannot turn off the UTF-8 parameter if you've already converted |