From 00aa2ea8d922099019e6e37382437033d0e8f47e Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Mon, 25 Jun 2018 09:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9ipClientRangeList?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=B8=BAipClientRangeList=20***?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/CompileVal.java | 88 +++++++++++++++++++--- 1 file changed, 76 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/nis/util/CompileVal.java b/src/main/java/com/nis/util/CompileVal.java index de110be..eb5bc0b 100644 --- a/src/main/java/com/nis/util/CompileVal.java +++ b/src/main/java/com/nis/util/CompileVal.java @@ -390,7 +390,7 @@ public class CompileVal { } if (!isUpdate && Constants.SERVICE_VALIDATE) { - String serviceIpRegionVal = serviceIpRegionVal(ipRegion, compileId); + String serviceIpRegionVal = serviceIpClientRegionVal(ipRegion, compileId); if (!serviceIpRegionVal.equals("ok")) { return serviceIpRegionVal; } @@ -651,52 +651,116 @@ public class CompileVal { return "ok"; } - public static String serviceIpRegionVal(IpRegion ipRegion, Long compileId) { + public static String serviceIpClientRegionVal(IpRegion ipRegion, Long compileId) { if (!BasicProvingUtil.isIpOrIpMask(ipRegion.getSrcIp(), ipRegion.getAddrType())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置srcIp的格式不正确或与addrType不一致"; } if (!BasicProvingUtil.isIpOrIpMask(ipRegion.getMaskSrcIp(), ipRegion.getAddrType())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置maskSrcIp的格式不正确或与addrType不一致"; } if (!BasicProvingUtil.isIpOrIpMask(ipRegion.getDstIp(), ipRegion.getAddrType())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置dstIp的格式不正确或与addrType不一致"; } if (!BasicProvingUtil.isIpOrIpMask(ipRegion.getMaskDstIp(), ipRegion.getAddrType())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置maskDstIp的格式不正确或与addrType不一致"; } if (!BasicProvingUtil.isPortOrPortMask(ipRegion.getSrcPort())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + "的域配置srcPort的格式不正确"; + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置srcPort的格式不正确"; } if (!BasicProvingUtil.isPortOrPortMask(ipRegion.getMaskSrcPort())) { // if (!BasicProvingUtil.isIntType(ipRegion.getMaskSrcPort())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置maskSrcPort的格式不正确"; } if (!BasicProvingUtil.isPortOrPortMask(ipRegion.getDstPort())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + "的域配置dstPort的格式不正确"; + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置dstPort的格式不正确"; } if (!BasicProvingUtil.isPortOrPortMask(ipRegion.getMaskDstPort())) { // if (!BasicProvingUtil.isIntType(ipRegion.getMaskDstPort())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置maskDstPort的格式不正确"; } if (ipRegion.getSrcIp().equals(ipRegion.getDstIp())) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置srcIp和dstIp不能相同"; } if (ipRegion.getDirection() != 1 && ipRegion.getDirection() != 0) { - return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + ipRegion.getRegionId() + "的域配置direction的值不正确,只能是0或1"; } + // zdx protocol验证？ + // if (ipRegion.getTableName().toLowerCase().equals("dj_ip_port")) { + // if (ipRegion.getProtocol() < 0 || ipRegion.getProtocol() > 255) { + // return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + + // ipRegion.getRegionId() + // + "的域配置tableName为dj_ip_port时,protocol的取值范围只能是0-255"; + // } + // } else { + // if (ipRegion.getProtocol() != 0) { + // return "编译配置id为" + compileId + "的配置中ipClientRangeList中regionId为" + + // ipRegion.getRegionId() + "的域配置tableName为" + // + ipRegion.getTableName() + "时,protocol的值只能是0"; + // } + // + // } + return "ok"; + } + + public static String serviceIpRegionVal(IpRegion ipRegion, Long compileId) { + if (!BasicProvingUtil.isIpOrIpMask(ipRegion.getSrcIp(), ipRegion.getAddrType())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + + "的域配置srcIp的格式不正确或与addrType不一致"; + } + if (!BasicProvingUtil.isIpOrIpMask(ipRegion.getMaskSrcIp(), ipRegion.getAddrType())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + + "的域配置maskSrcIp的格式不正确或与addrType不一致"; + } + if (!BasicProvingUtil.isIpOrIpMask(ipRegion.getDstIp(), ipRegion.getAddrType())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + + "的域配置dstIp的格式不正确或与addrType不一致"; + } + if (!BasicProvingUtil.isIpOrIpMask(ipRegion.getMaskDstIp(), ipRegion.getAddrType())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + + "的域配置maskDstIp的格式不正确或与addrType不一致"; + } + + if (!BasicProvingUtil.isPortOrPortMask(ipRegion.getSrcPort())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + "的域配置srcPort的格式不正确"; + } + + if (!BasicProvingUtil.isPortOrPortMask(ipRegion.getMaskSrcPort())) { + // if (!BasicProvingUtil.isIntType(ipRegion.getMaskSrcPort())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + + "的域配置maskSrcPort的格式不正确"; + } + if (!BasicProvingUtil.isPortOrPortMask(ipRegion.getDstPort())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + "的域配置dstPort的格式不正确"; + } + + if (!BasicProvingUtil.isPortOrPortMask(ipRegion.getMaskDstPort())) { + // if (!BasicProvingUtil.isIntType(ipRegion.getMaskDstPort())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + + "的域配置maskDstPort的格式不正确"; + } + + if (ipRegion.getSrcIp().equals(ipRegion.getDstIp())) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + + "的域配置srcIp和dstIp不能相同"; + } + if (ipRegion.getDirection() != 1 && ipRegion.getDirection() != 0) { + return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + + "的域配置direction的值不正确,只能是0或1"; + } + // zdx protocol验证？ // if (ipRegion.getTableName().toLowerCase().equals("dj_ip_port")) { // if (ipRegion.getProtocol() < 0 || ipRegion.getProtocol() > 255) {