Lines 1278-1286
sub checkauth {
Link Here
|
1278 |
|
1278 |
|
1279 |
# we have to check they are coming from the right ip range |
1279 |
# we have to check they are coming from the right ip range |
1280 |
my $domain = $branches->{$branchcode}->{'branchip'} // q{}; |
1280 |
my $domain = $branches->{$branchcode}->{'branchip'} // q{}; |
1281 |
$domain =~ s|\.\*||g; |
1281 |
next unless ( $domain ); |
1282 |
$domain =~ s/\s+//g; |
1282 |
if ( ! in_iprange($domain) ) { |
1283 |
if ( $domain && $ip !~ /^$domain/ ) { |
|
|
1284 |
$cookie = $cookie_mgr->replace_in_list( |
1283 |
$cookie = $cookie_mgr->replace_in_list( |
1285 |
$cookie, |
1284 |
$cookie, |
1286 |
$query->cookie( |
1285 |
$query->cookie( |
Lines 1316-1322
sub checkauth {
Link Here
|
1316 |
|
1315 |
|
1317 |
# now we work with the treatment of ip |
1316 |
# now we work with the treatment of ip |
1318 |
my $domain = $branches->{$br}->{'branchip'}; |
1317 |
my $domain = $branches->{$br}->{'branchip'}; |
1319 |
if ( $domain && $ip =~ /^$domain/ ) { |
1318 |
next unless ( $domain ); |
|
|
1319 |
if ( in_iprange($domain) ) { |
1320 |
$branchcode = $branches->{$br}->{'branchcode'}; |
1320 |
$branchcode = $branches->{$br}->{'branchcode'}; |
1321 |
|
1321 |
|
1322 |
# new op dev : add the branchname to the cookie |
1322 |
# new op dev : add the branchname to the cookie |
Lines 1813-1819
sub check_api_auth {
Link Here
|
1813 |
|
1813 |
|
1814 |
# now we work with the treatment of ip |
1814 |
# now we work with the treatment of ip |
1815 |
my $domain = $branches->{$br}->{'branchip'}; |
1815 |
my $domain = $branches->{$br}->{'branchip'}; |
1816 |
if ( $domain && $ip =~ /^$domain/ ) { |
1816 |
next unless ( $domain ); |
|
|
1817 |
if ( in_iprange($domain) ) { |
1817 |
$branchcode = $branches->{$br}->{'branchcode'}; |
1818 |
$branchcode = $branches->{$br}->{'branchcode'}; |
1818 |
|
1819 |
|
1819 |
# new op dev : add the branchname to the cookie |
1820 |
# new op dev : add the branchname to the cookie |
Lines 2472-2478
Returns 1 if the remote address is in the provided iprange, or 0 otherwise.
Link Here
|
2472 |
|
2473 |
|
2473 |
sub in_iprange { |
2474 |
sub in_iprange { |
2474 |
my ($iprange) = @_; |
2475 |
my ($iprange) = @_; |
2475 |
my $result = 1; |
2476 |
my $result = 0; |
|
|
2477 |
# FIXME remove '*' for backwards compatibility in branchip settings |
2478 |
$iprange =~ s|\*||g; |
2476 |
my @allowedipranges = $iprange ? split( ' ', $iprange ) : (); |
2479 |
my @allowedipranges = $iprange ? split( ' ', $iprange ) : (); |
2477 |
if ( scalar @allowedipranges > 0 ) { |
2480 |
if ( scalar @allowedipranges > 0 ) { |
2478 |
my @rangelist; |
2481 |
my @rangelist; |