aherman
/
the-bastion
mirror of https://github.com/ovh/the-bastion
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: simplify checks wanted variables

Browse Source 
Co-authored-by: Stéphane Lesimple <speed47_github@speed47.net>
pull/592/head
Jonah 1 week ago committed by GitHub
parent 1eb96e4f20
commit 741b675d3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File

18
lib/perl/OVH/Bastion/allowdeny.inc
Unescape View File

@ -300,14 +300,10 @@ sub is_access_way_granted {
}
# check proxy IP match
if (defined $wantedProxyIp) {
next if (!defined $entry->{'proxyIp'} || $entry->{'proxyIp'} ne $wantedProxyIp);
}
next if ($entry->{'proxyIp'} ne $wantedProxyIp);
# check proxy port match
if (defined $wantedProxyPort) {
next if (!defined $entry->{'proxyPort'} || $entry->{'proxyPort'} ne $wantedProxyPort);
}
next if ($entry->{'proxyPort'} ne $wantedProxyPort);
}
# Case 2: no proxy requested, but entry has proxy info - should not match
elsif (defined $entry->{'proxyIp'} || defined $entry->{'proxyPort'}) {
@ -347,16 +343,10 @@ sub is_access_way_granted {
}
else {
# check proxy IP match
if (defined $wantedProxyIp) {
$proxyMatches = 0
if (!defined $entry->{'proxyIp'} || $entry->{'proxyIp'} ne $wantedProxyIp);
}
$proxyMatches = 0 if ($entry->{'proxyIp'} ne $wantedProxyIp);
# check proxy port match
if (defined $wantedProxyPort && $proxyMatches) {
$proxyMatches = 0
if (!defined $entry->{'proxyPort'} || $entry->{'proxyPort'} ne $wantedProxyPort);
}
$proxyMatches = 0 if ($proxyMatches && $entry->{'proxyPort'} ne $wantedProxyPort);
}
}
# Case 2: no proxy requested, but entry has proxy info - should not match

Write Preview
Loading…
Cancel
Save