diff --git a/src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java b/src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java index 52eb142b..651bd522 100644 --- a/src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java @@ -9,6 +9,8 @@ import com.dispose.pojo.vo.DeviceFirewareInfo; import com.haohan.dispose.common.HaoHanStartCleanResp; import com.haohan.dispose.common.HaoHanStopCleanResp; import com.haohan.dispose.protocol.RestfulInterface; +import inet.ipaddr.IPAddress; +import inet.ipaddr.IPAddressString; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -71,7 +73,7 @@ public class HaoHanAbilityImpl implements DisposeAbility { } HaoHanStartCleanResp resp = restfulInterface.startClean(this.urlRootPath, ip, Math.max(duration.intValue(), 0), - DISPOSE_PLATFORM_NAME); + DISPOSE_PLATFORM_NAME); if (resp == null) { log.error("----Error Haohan start clean {} server return error", ip); @@ -109,7 +111,7 @@ public class HaoHanAbilityImpl implements DisposeAbility { } HaoHanStopCleanResp resp = restfulInterface.stopClean(this.urlRootPath, taskId.intValue(), - DISPOSE_PLATFORM_NAME); + DISPOSE_PLATFORM_NAME); if (resp == null) { log.error("----Error Haohan stop task{} server return error", taskId); @@ -139,18 +141,18 @@ public class HaoHanAbilityImpl implements DisposeAbility { @Override public MulReturnType getAbilityDeviceFireware() { return new MulReturnType<>(ErrorCode.ERR_OK, - DeviceFirewareInfo.builder() - .vendor("HaoHan") - .model("Unknown") - .firmware("Unknown") - .os("Linux Server") - .kernel("Linux") - .arch("x86_64") - .version("Unknown") - .memory(-1) - .freeMemory(-1) - .cpuUsed(-1) - .build()); + DeviceFirewareInfo.builder() + .vendor("HaoHan") + .model("Unknown") + .firmware("Unknown") + .os("Linux Server") + .kernel("Linux") + .arch("x86_64") + .version("Unknown") + .memory(-1) + .freeMemory(-1) + .cpuUsed(-1) + .build()); } /** @@ -179,6 +181,7 @@ public class HaoHanAbilityImpl implements DisposeAbility { */ @Override public boolean isCarryProtectIp(String ipAddr) { - return true; + IPAddress addr = new IPAddressString(ipAddr).getAddress(); + return addr.isIPv4(); } } diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java index 766f0481..bddd4a5b 100644 --- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java @@ -62,7 +62,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager { if (tDev.getStatus() == ObjectStatus.DELETED) { // 重置状态 tDev.setStatus(ObjectStatus.NORMAL); - return upgradeDisposeDevice(tDev); + return upgradeDisposeDevice(dev); } return new MulReturnType<>(ErrorCode.ERR_DEVICEEXISTS, tDev.getId()); diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java index 984800e9..f409db51 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java @@ -29,7 +29,7 @@ public class P2TaskList { private static final QATestItem[] testItemArray = new QATestItem[]{ QATestItem.builder() .id(BASE_P2_TASK_LIST_ID) - .name("获取第二页20个设备信息") + .name("获取第二页20个处置任务信息") .priority(TestPriority.P2_PRIORITY) .urlPath("/task/taskList") .method(RequestMethod.POST) diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java index e7086400..366a4df7 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java @@ -93,7 +93,7 @@ public class P2TaskStart { .priority(TestPriority.P2_PRIORITY) .urlPath("/task/start") .method(RequestMethod.POST) - .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":1," + + .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":2," + "\"disposeIp\":\"192.168.50.3\",\"disposeTime\":10,\"flowDirection\":2," + "\"attackType\":[-1]}}") .rspClass(TaskStartRsp.class) @@ -108,7 +108,7 @@ public class P2TaskStart { .priority(TestPriority.P2_PRIORITY) .urlPath("/task/start") .method(RequestMethod.POST) - .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":2," + + .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":1," + "\"disposeIp\":\"192.168.50.2\",\"disposeTime\":10,\"flowDirection\":2," + "\"attackType\":[-1]}}") .rspClass(TaskStartRsp.class) diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java index d2a3992a..7d23e2c3 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java @@ -30,7 +30,7 @@ public class P2TaskStartMulIp { private static final QATestItem[] testItemArray = new QATestItem[]{ QATestItem.builder() .id(BASE_P2_TASK_START_MUL_ID) - .name("对一个IP全部攻击类型进行清洗") + .name("对多个IP指定攻击类型进行清洗") .priority(TestPriority.P2_PRIORITY) .urlPath("/task/startMulIp") .method(RequestMethod.POST) @@ -173,7 +173,7 @@ public class P2TaskStartMulIp { .priority(TestPriority.P2_PRIORITY) .urlPath("/task/startMulIp") .method(RequestMethod.POST) - .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":1," + + .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":2," + "\"mulDisposeIp\":[\"192.168.50.4\",\"192.168.50.3\"],\"disposeTime\":10," + "\"flowDirection\":2,\"attackType\":[-1]}}") .rspClass(TaskStartMulRsp.class) @@ -190,7 +190,7 @@ public class P2TaskStartMulIp { .priority(TestPriority.P2_PRIORITY) .urlPath("/task/startMulIp") .method(RequestMethod.POST) - .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":2," + + .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":1," + "\"mulDisposeIp\":[\"192.168.50.4\",\"192.168.50.3\"],\"disposeTime\":10," + "\"flowDirection\":2,\"attackType\":[-1]}}") .rspClass(TaskStartMulRsp.class) diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStop.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStop.java index 559fd634..57d23944 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStop.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStop.java @@ -50,7 +50,6 @@ public class P2TaskStop { Assert.assertNotEquals(k.getDisposeIp().length(), 0); Assert.assertNotNull(k.getLeftTime()); } - }); })