From bce53c6e169cb94e1c751e5760984eb0f0d1ade1 Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Wed, 30 Sep 2020 12:48:01 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BA=BF=E9=98=B3=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=A4=84=E7=BD=AEIP=E6=98=AF=E5=90=A6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/impl/YiYangAbilityImpl.java       | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java b/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java
index 874382ab..add867c9 100644
--- a/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java
+++ b/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java
@@ -4,6 +4,7 @@ import com.dispose.ability.DisposeAbility;
 import com.dispose.common.DisposeCapacityType;
 import com.dispose.common.DisposeObjectType;
 import com.dispose.common.ErrorCode;
+import com.dispose.common.Helper;
 import com.dispose.common.IpAddrType;
 import com.dispose.common.NetflowDirection;
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
@@ -12,6 +13,8 @@ import com.dispose.pojo.vo.DeviceFirewareInfo;
 import com.dispose.yiyang.dispose.common.YiYangDisposeAbilityRsp;
 import com.dispose.yiyang.dispose.common.YiYangLoginRsp;
 import com.dispose.yiyang.dispose.protocol.YiYangInterface;
+import inet.ipaddr.IPAddress;
+import inet.ipaddr.IPAddressString;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -229,7 +232,34 @@ public class YiYangAbilityImpl implements DisposeAbility {
      */
     @Override
     public boolean isCarryProtectIp(String ipAddr) {
-        return true;
+        boolean ret = false;
+        IPAddress addr = new IPAddressString(ipAddr).getAddress();
+        synchronized (this) {
+            if (addr.isIPv4()) {
+                ret = protectIpV4.stream().anyMatch(v -> Helper.ipInRange(v, ipAddr));
+            }
+
+            if (addr.isIPv6()) {
+                ret = protectIpV6.stream().anyMatch(v -> Helper.ipInRange(v, ipAddr));
+            }
+        }
+
+        if (!ret) {
+            // 更新设备防护IP
+            getDisposeDeviceProtectObject();
+
+            synchronized (this) {
+                if (addr.isIPv4()) {
+                    ret = protectIpV4.stream().anyMatch(v -> Helper.ipInRange(v, ipAddr));
+                }
+
+                if (addr.isIPv6()) {
+                    ret = protectIpV6.stream().anyMatch(v -> Helper.ipInRange(v, ipAddr));
+                }
+            }
+        }
+
+        return ret;
     }
 
     /**