135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#808 avoid dns for fuzzy search on IPish thing

Browse Source
This commit is contained in:
Oliver Gorwits
2021-10-06 08:28:56 +01:00
parent cfa9bb662b
commit d8a9ad9007
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -124,7 +124,7 @@ sub search_aliases {
# rough approximation of IP addresses (v4 in v6 not supported).
# this helps us avoid triggering any DNS.
my $by_ip = ($q =~ m{^(?:$RE{net}{IPv4}|$RE{net}{IPv6})$}i) ? 1 : 0;
my $by_ip = ($q =~ m{^(?:$RE{net}{IPv4}|$RE{net}{IPv6})(?:/\d+)?$}i) ? 1 : 0;
my $clause;
if ($by_ip) {
@@ -394,7 +394,9 @@ sub search_fuzzy {
my $ipbind = '255.255.255.255/32';
# but also allow prefix search
if (my $ip = NetAddr::IP::Lite->new($qc)) {
if ($qc =~ m{^(?:$RE{net}{IPv4}|$RE{net}{IPv6})(?:/\d+)?$}i
and my $ip = NetAddr::IP::Lite->new($qc)) {
$ip_clause = [
'me.ip' => { '<<=' => $ip->cidr },
'device_ips_by_address_or_name.alias' => { '<<=' => $ip->cidr },