From 78f2488fe97271a5ea2491c0c1676b0bd29b8229 Mon Sep 17 00:00:00 2001 From: az Date: Sat, 9 Dec 2023 21:41:14 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=89=E5=85=A8=E7=BB=84=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E6=94=BE?= =?UTF-8?q?=E8=A1=8C=E7=B1=BB=E5=9E=8B=202=E3=80=81=E6=B7=BB=E5=8A=A0TCP?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=92=8CUDP=E5=8D=8F=E8=AE=AE=E7=9A=84?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=BB=84=E5=88=A4=E6=96=AD=E5=9C=A8=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E6=97=B6=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=94=BE=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/system/securityGroup.vue | 2 +- .../src/views/system/securityRule.vue | 6 +++--- .../req/system/SecurityGroupUpdateReq.java | 4 ---- .../controller/req/system/SecurityRuleCreateReq.java | 2 +- .../server/dal/entity/SecurityRuleDO.java | 2 +- .../server/proxy/core/TcpVisitorChannelHandler.java | 8 ++++++++ .../server/proxy/core/UdpVisitorChannelHandler.java | 12 ++++++++++-- .../server/service/SecurityGroupService.java | 6 +++++- 8 files changed, 29 insertions(+), 13 deletions(-) diff --git a/neutrino-proxy-admin/src/views/system/securityGroup.vue b/neutrino-proxy-admin/src/views/system/securityGroup.vue index 7bf3413f..1c94dbb7 100644 --- a/neutrino-proxy-admin/src/views/system/securityGroup.vue +++ b/neutrino-proxy-admin/src/views/system/securityGroup.vue @@ -81,7 +81,7 @@ - + diff --git a/neutrino-proxy-admin/src/views/system/securityRule.vue b/neutrino-proxy-admin/src/views/system/securityRule.vue index e85a7d37..17b162b8 100644 --- a/neutrino-proxy-admin/src/views/system/securityRule.vue +++ b/neutrino-proxy-admin/src/views/system/securityRule.vue @@ -106,9 +106,9 @@ - +
@@ -175,7 +175,7 @@ import LinkPopover from '../../components/Link/linkPopover' name: [{ required: true, message: '安全组名称必填', trigger: 'blur' }], rule: [{ required: true, message: '规则内容必填', trigger: 'blur' }], // passType: [{ required: true, message: '放行类型必选', trigger: 'blur' }], - priority: [{ required: true, message: '优先级必填', trigger: 'blur' }] + // priority: [{ required: true, message: '优先级必填', trigger: 'blur' }] }, downloadLoading: false, checkBoxData:[], //表单勾选的行 diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupUpdateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupUpdateReq.java index 6dc8ffe1..ae05c0d4 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupUpdateReq.java @@ -18,8 +18,4 @@ public class SecurityGroupUpdateReq { */ private String description; - /** - * 通过类型 - */ - private SecurityRulePassTypeEnum defaultPassType; } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityRuleCreateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityRuleCreateReq.java index 95285858..34c4b81b 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityRuleCreateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityRuleCreateReq.java @@ -52,6 +52,6 @@ public class SecurityRuleCreateReq { /** * 优先级，数字越小，优先级越高 */ - private Integer priority; + private Integer priority = 1; } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/SecurityRuleDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/SecurityRuleDO.java index 9a9ff45a..24a72d6e 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/SecurityRuleDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/SecurityRuleDO.java @@ -60,7 +60,7 @@ public class SecurityRuleDO { /** * 优先级，数字越小，优先级越高 */ - private Integer priority; + private Integer priority = 1; /** * 用户id diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/TcpVisitorChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/TcpVisitorChannelHandler.java index d9aa25a9..5dcc535c 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/TcpVisitorChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/TcpVisitorChannelHandler.java @@ -52,6 +52,14 @@ public class TcpVisitorChannelHandler extends SimpleChannelInboundHandler>>{}", ctx.channel().id().asLongText()); + Channel visitorChannel = ctx.channel(); + InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress(); + + // 判断IP是否在该端口绑定的安全组允许的规则内 + if (!securityGroupService.judgeAllow(IpUtil.getRemoteIp(ctx), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) { + // 不在安全组规则放行范围内 + ctx.channel().close(); + return; + } + byte[] bytes = new byte[datagramPacket.content().readableBytes()]; datagramPacket.content().readBytes(bytes); datagramPacket.content().resetReaderIndex(); @@ -86,8 +96,6 @@ public class UdpVisitorChannelHandler extends SimpleChannelInboundHandler