From 8120cb1fbc436c7a1f8e3c5083a829f0caaced03 Mon Sep 17 00:00:00 2001 From: Rekryt Date: Mon, 28 Oct 2024 23:51:00 +0300 Subject: [PATCH] feat: add a new CIDR6 search method --- src/Domain/Helper/IP6Helper.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Domain/Helper/IP6Helper.php b/src/Domain/Helper/IP6Helper.php index f901664..06927f4 100644 --- a/src/Domain/Helper/IP6Helper.php +++ b/src/Domain/Helper/IP6Helper.php @@ -30,14 +30,27 @@ class IP6Helper { $search = shell_exec( implode(' | ', [ - 'whois -a ' . $ip, - 'grep inet6num', + 'whois ' . $ip, + 'grep CIDR', 'grep -v "/0"', 'head -n 1', "awk '{print $2}'", + "grep -oE '^([0-9a-fA-F]{1,4}:){1,7}(:|[0-9a-fA-F]{1,4})(:[0-9a-fA-F]{1,4}){0,6}/[0-9]+$'", ]) ); + if (!$search) { + $search = shell_exec( + implode(' | ', [ + 'whois -a ' . $ip, + 'grep inet6num', + 'grep -v "/0"', + 'head -n 1', + "awk '{print $2}'", + ]) + ); + } + if (!$search) { $search = shell_exec( implode(' | ', [