gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ip导入ip范围校验调整，去掉必须输入C段IP限制

Browse Source
This commit is contained in:
wangxin
2018-10-29 13:07:57 +08:00
parent 462e49317a
commit dc86b90a99
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -2062,10 +2062,18 @@ public class BaseController {
Properties prop = this.getMsgProp();
String prefix = ip.split("-")[0];
String subfix = ip.split("-")[1];
if (Integer.parseInt(prefix.split("\\.")[0]) < 192 || Integer.parseInt(prefix.split("\\.")[0]) > 223
|| Integer.parseInt(subfix.split("\\.")[0]) < 192 || Integer.parseInt(subfix.split("\\.")[0]) > 223) {
errInfo.append(prop.get(ipName) + " " + prop.get("ip_range_in_c") + ";");
if ((Integer.parseInt(prefix.split("\\.")[0])<128&&Integer.parseInt(subfix.split("\\.")[0])<128)
||(Integer.parseInt(prefix.split("\\.")[0])>127&&Integer.parseInt(subfix.split("\\.")[0])>127&&Integer.parseInt(prefix.split("\\.")[0])<192&&Integer.parseInt(subfix.split("\\.")[0])<192)
||(Integer.parseInt(prefix.split("\\.")[0])>191&&Integer.parseInt(subfix.split("\\.")[0])>191&&Integer.parseInt(prefix.split("\\.")[0])<224&&Integer.parseInt(subfix.split("\\.")[0])<224)
||(Integer.parseInt(prefix.split("\\.")[0])>223&&Integer.parseInt(subfix.split("\\.")[0])>223&&Integer.parseInt(prefix.split("\\.")[0])<240&&Integer.parseInt(subfix.split("\\.")[0])<240)
||(Integer.parseInt(prefix.split("\\.")[0])>239&&Integer.parseInt(subfix.split("\\.")[0])>239&&Integer.parseInt(prefix.split("\\.")[0])<256&&Integer.parseInt(subfix.split("\\.")[0])<256)) {
}else {
errInfo.append(prop.get(ipName) + " " + prop.get("ip_range_in_the_same") + ";");
}
// if (Integer.parseInt(prefix.split("\\.")[0]) < 192 || Integer.parseInt(prefix.split("\\.")[0]) > 223
// || Integer.parseInt(subfix.split("\\.")[0]) < 192 || Integer.parseInt(subfix.split("\\.")[0]) > 223) {
// errInfo.append(prop.get(ipName) + " " + prop.get("ip_range_in_c") + ";");
// }
if (!prefix.split("\\.")[0].equals(subfix.split("\\.")[0])
|| !prefix.split("\\.")[1].equals(subfix.split("\\.")[1])
|| !prefix.split("\\.")[2].equals(subfix.split("\\.")[2])) {