yeyinlaoying/neutrino-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务端直接转发，无需部署客户端待完成

Browse Source
This commit is contained in:
xiaojie
2024-03-08 17:32:28 +08:00
parent 7fb5a91f2f
commit e2c6490fae
22 changed files with 181 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neutrino-proxy-admin/src/views/proxy/domainMapping.vue
+4 -5
View File
@@ -89,7 +89,7 @@
<el-button type="primary" size="mini" @click="toModify(scope.row)">{{ $t('table.edit') }}</el-button>
<el-button v-if="scope.row.enable == '1'" size="mini" type="danger" @click="handleModifyStatus(scope.row, 2)">{{ $t('table.disable') }}</el-button>
<el-button v-if="scope.row.enable == '2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)">{{ $t('table.enable') }}</el-button>
<ButtonPopover @handleCommitClick="handleDelete(scope.row)" style="margin-left: 10px" />
<el-button size="mini" type="danger" @click="handleDelete(scope.row)">{{ $t('table.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -103,8 +103,7 @@
<el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" top="20px">
<el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="110px">
<el-form-item :label="$t('License')" prop="licenseId">
<DropdownTable v-model="temp.licenseId" :name.sync="temp.licenseName" :tableData="licenseAuthList" @selectedData="selectedFeeItem" placeholder="请选择" :width="500"
:disabled="dialogStatus === 'update'" />
<DropdownTable v-model="temp.licenseId" :name.sync="temp.licenseName" :tableData="licenseAuthList" @selectedData="selectedFeeItem" placeholder="请选择" :width="500" />
</el-form-item>
<el-form-item :label="$t('域名')" prop="domain">
<el-input v-model="temp.domain">
@@ -228,8 +227,8 @@ export default {
rules: {
licenseId: [{ required: true, message: '请选择License', trigger: 'blur,change' }],
domain: [{ required: true, message: '请输入域名', trigger: 'blur' },
{pattern: '^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$', message: '域名格式不正确，请检查后重试', trigger: 'blur' },
{ validator: this.isDomainAvailable, trigger: 'blur' }
{ pattern: '^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$', message: '域名格式不正确，请检查后重试', trigger: 'blur' },
{ validator: this.isDomainAvailable, trigger: 'blur' }
],
targetPath: [{ required: true, message: '请输入目标地址', trigger: 'blur' }],
},
neutrino-proxy-admin/src/views/proxy/license.vue
+2 -35
View File
@@ -63,12 +63,11 @@
</el-table-column>
<el-table-column align="center" :label="$t('table.actions')" width="330" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{$t('table.edit')}}</el-button>
<el-button v-if="scope.row.id != 1" type="primary" size="mini" @click="handleUpdate(scope.row)">{{$t('table.edit')}}</el-button>
<el-button size="mini" type="primary" @click="handleReset(scope.row)">{{$t('table.resetKey')}}</el-button>
<el-button v-if="scope.row.enable =='1'" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">{{$t('table.disable')}}</el-button>
<el-button v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">{{$t('table.enable')}}</el-button>
<!-- <el-button size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
<ButtonPopover @handleCommitClick="handleDelete2(scope.row)" style="margin-left: 10px"/>
<el-button v-if="scope.row.id != 1" size="mini" type="danger" @click="handleDelete(scope.row)">{{$t('table.delete')}}</el-button>
</template>
</el-table-column>
</el-table>
@@ -122,20 +121,6 @@
import { userList } from '@/api/user'
import waves from '@/directive/waves' // 水波纹指令
import { parseTime } from '@/utils'
import ButtonPopover from '../../components/Button/buttonPopover'
const calendarTypeOptions = [
{ key: 'CN', display_name: 'China' },
{ key: 'US', display_name: 'USA' },
{ key: 'JP', display_name: 'Japan' },
{ key: 'EU', display_name: 'Eurozone' }
]
// arr to obj ,such as { CN : "China", US : "USA" }
const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
acc[cur.key] = cur.display_name
return acc
}, {})
export default {
name: 'complexTable',
@@ -143,7 +128,6 @@
waves
},
components: {
ButtonPopover
},
data() {
return {
@@ -159,7 +143,6 @@
userId: null
},
importanceOptions: [1, 2, 3],
calendarTypeOptions,
userList: [],
sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
statusOptions: ['published', 'draft', 'deleted'],
@@ -214,9 +197,6 @@
}
return statusMap[status]
},
typeFilter(type) {
return calendarTypeKeyValue[type]
}
},
created() {
this.getDataList()
@@ -368,19 +348,6 @@
})
}).catch(() => {})
},
handleDelete2(row) {
deleteLicense(row.id).then(response => {
if (response.data.code === 0) {
this.$notify({
title: '成功',
message: '删除成功',
type: 'success',
duration: 2000
})
this.getList()
}
})
},
handleDownload() {
this.downloadLoading = true
import('@/vendor/Export2Excel').then(excel => {
neutrino-proxy-admin/src/views/proxy/portMapping.vue
+14 -1
View File
@@ -49,6 +49,11 @@
<span>{{ scope.row.protocal }}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" :label="$t('table.domainName')" width="180">
<template slot-scope="scope">
<span>{{ scope.row.domain }}</span>
</template>
</el-table-column> -->
<el-table-column align="center" :label="$t('table.serverPort')" width="80">
<template slot-scope="scope">
<span>{{ scope.row.serverPort }}</span>
@@ -100,7 +105,7 @@
<el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table.edit') }}</el-button>
<el-button v-if="scope.row.enable == '1'" size="mini" type="danger" @click="handleModifyStatus(scope.row, 2)">{{$t('table.disable')}}</el-button>
<el-button v-if="scope.row.enable == '2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)">{{ $t('table.enable') }}</el-button>
<ButtonPopover @handleCommitClick="handleDelete(scope.row)" style="margin-left: 10px" />
<el-button size="mini" type="danger" @click="handleDelete(scope.row)">{{$t('table.delete')}}</el-button>
</template>
</el-table-column>
</el-table>
@@ -143,6 +148,11 @@
<el-form-item :label="$t('客户端端口')" prop="clientPort">
<el-input v-model="temp.clientPort" type="number" :step="1" controls-position="right" ></el-input>
</el-form-item>
<!-- <el-form-item :label="$t('域名')" prop="subdomain" v-if="(temp.protocal === 'HTTP' || temp.protocal === 'HTTP(S)') && domainName && domainName != ''">
<el-input v-model="temp.subdomain">
<template slot="append">.{{ domainName }}</template>
</el-input>
</el-form-item> -->
<el-form-item :label="$t('响应数量')" prop="proxyResponses" v-if="temp.protocal === 'UDP'">
<el-input v-model="temp.proxyResponses"></el-input>
</el-form-item>
@@ -449,6 +459,9 @@ export default {
},
handleOpenWebPage(row) {
let url = location.protocol + '//' + location.hostname + ':' + row.serverPort
if (row.domain) {
url = location.protocol + '//' + row.domain
}
open(url)
},
handleUpdate(row) {
neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java
-1
View File
@@ -43,7 +43,6 @@ public class CmdChannelHandler extends SimpleChannelInboundHandler<ProxyMessage>
if (realServerChannel != null) {
realServerChannel.config().setOption(ChannelOption.AUTO_READ, ctx.channel().isWritable());
}
super.channelWritabilityChanged(ctx);
}
neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/RealServerChannelHandler.java
+8 -1
View File
@@ -67,11 +67,18 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
}
}
/**
* 通道激活时触发，当客户端connect成功后，服务端就会接收到这个事件，从而可以把客户端的Channel记录下来，供后面复用
* @param ctx
* @throws Exception
*/
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
super.channelActive(ctx);
}
/**
* 客户端 失去连接
*/
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
Channel realServerChannel = ctx.channel();
neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageConnectHandler.java
+2 -2
View File
@@ -33,7 +33,8 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
final Channel cmdChannel = ctx.channel();
final String visitorId = proxyMessage.getInfo();
String[] serverInfo = new String(proxyMessage.getData()).split(":");
String ip = serverInfo[0];
// @todo 在这里 处理负载均恒
String ip = serverInfo[0];
int port = Integer.parseInt(serverInfo[1]);
// 连接真实的、被代理的服务
realServerBootstrap.connect(ip, port).addListener(new ChannelFutureListener() {
@@ -44,7 +45,6 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
// 连接后端服务器成功
if (future.isSuccess()) {
final Channel realServerChannel = future.channel();
realServerChannel.config().setOption(ChannelOption.AUTO_READ, false);
// 获取连接
neutrino-proxy-client/src/main/resources/app.yml
+1 -1
View File
@@ -44,7 +44,7 @@ neutrino:
# 是否启用SSL(注意：该配置必须和server-port对应上)
ssl-enable: ${SSL_ENABLE:true}
# 客户端连接唯一凭证
license-key: ${LICENSE_KEY:ac2987454da340d7a57217d69ed81565}
license-key: ${LICENSE_KEY:ce554b47de80495b9d1996cd62084973}
# 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成）
client-id: ${CLIENT_ID:}
# 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/LicenseController.java
+6 -6
View File
@@ -31,6 +31,8 @@ import org.dromara.neutrinoproxy.server.controller.res.proxy.*;
import org.dromara.neutrinoproxy.server.service.LicenseService;
import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
import org.noear.solon.annotation.*;
import org.noear.solon.validation.annotation.Valid;
import org.noear.solon.validation.annotation.Validated;
import java.util.List;
@@ -39,6 +41,8 @@ import java.util.List;
* @author: aoshiguchen
* @date: 2022/8/6
*/
@Valid
@Mapping("/license")
@Controller
public class LicenseController {
@@ -101,18 +105,14 @@ public class LicenseController {
@Post
@Mapping("/update/enable-status")
@Authorization(onlyAdmin = true)
public LicenseUpdateEnableStatusRes updateEnableStatus(LicenseUpdateEnableStatusReq req) {
ParamCheckUtil.checkNotNull(req, "req");
ParamCheckUtil.checkNotNull(req.getId(), "id");
ParamCheckUtil.checkNotNull(req.getEnable(), "enable");
public LicenseUpdateEnableStatusRes updateEnableStatus(@Validated LicenseUpdateEnableStatusReq req) {
return licenseService.updateEnableStatus(req);
}
@Post
@Mapping("/delete")
@Authorization(onlyAdmin = true)
public void delete(LicenseDeleteReq req) {
public void delete(@Validated LicenseDeleteReq req) {
ParamCheckUtil.checkNotNull(req, "req");
ParamCheckUtil.checkNotNull(req.getId(), "id");
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseDeleteReq.java
+4
View File
@@ -1,6 +1,8 @@
package org.dromara.neutrinoproxy.server.controller.req.proxy;
import lombok.Data;
import org.noear.solon.validation.annotation.Min;
import org.noear.solon.validation.annotation.NotNull;
/**
* license删除请求
@@ -9,5 +11,7 @@ import lombok.Data;
*/
@Data
public class LicenseDeleteReq {
@NotNull
@Min(value=2, message="服务端禁止删除")
private Integer id;
}
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java
+8 -5
View File
@@ -23,6 +23,7 @@ package org.dromara.neutrinoproxy.server.controller.req.proxy;
import lombok.Data;
import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
import org.noear.solon.validation.annotation.NotNull;
/**
* 更新启用状态请求
@@ -31,13 +32,15 @@ import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
*/
@Data
public class LicenseUpdateEnableStatusReq {
/**
* id
*/
private Integer id;
/**
* id
*/
@NotNull
private Integer id;
/**
* 启用状态
* {@link EnableStatusEnum}
*/
private Integer enable;
@NotNull
private Integer enable;
}
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/LicenseMapper.java
+6 -5
View File
@@ -65,16 +65,17 @@ public interface LicenseMapper extends BaseMapper<LicenseDO> {
default void updateOnlineStatus(Integer id, Integer isOnline, Date updateTime) {
this.update(null, new LambdaUpdateWrapper<LicenseDO>()
.eq(LicenseDO::getId, id)
.set(LicenseDO::getIsOnline, isOnline)
.set(LicenseDO::getUpdateTime, updateTime)
.eq(LicenseDO::getId, id)
.set(LicenseDO::getIsOnline, isOnline)
.set(LicenseDO::getUpdateTime, updateTime)
);
}
default void updateOnlineStatus(Integer isOnline, Date updateTime) {
this.update(null, new LambdaUpdateWrapper<LicenseDO>()
.set(LicenseDO::getIsOnline, isOnline)
.set(LicenseDO::getUpdateTime, updateTime)
.ne(LicenseDO::getId, 1)
.set(LicenseDO::getIsOnline, isOnline)
.set(LicenseDO::getUpdateTime, updateTime)
);
}
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/LicenseDO.java
+17
View File
@@ -87,6 +87,23 @@ public class LicenseDO {
*/
private Date updateTime;
public LicenseDO() {
}
public LicenseDO(Integer id, String name, String key, Integer userId, String upLimitRate, String downLimitRate, Integer isOnline, Integer enable, Date createTime, Date updateTime) {
this.id = id;
this.name = name;
this.key = key;
this.userId = userId;
this.upLimitRate = upLimitRate;
this.downLimitRate = downLimitRate;
this.isOnline = isOnline;
this.enable = enable;
this.createTime = createTime;
this.updateTime = updateTime;
}
public LicenseListRes toRes() {
LicenseListRes res = new LicenseListRes();
BeanUtil.copyProperties(this, res);
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java
+13 -13
View File
@@ -43,19 +43,19 @@ public class HttpProxy implements EventListener<AppLoadEndEvent> {
try {
ServerBootstrap bootstrap = new ServerBootstrap();
bootstrap.group(new NioEventLoopGroup(1), new NioEventLoopGroup())
.channel(NioServerSocketChannel.class).childHandler(new ChannelInitializer<SocketChannel>() {
@Override
public void initChannel(SocketChannel ch) throws Exception {
if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() &&
proxyConfig.getServer().getTcp().getTransferLogEnable()) {
ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class));
}
ch.pipeline().addFirst(new BytesMetricsHandler());
ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler());
ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
ch.pipeline().addLast(new HttpVisitorChannelHandler());
}
});
.channel(NioServerSocketChannel.class).childHandler(new ChannelInitializer<SocketChannel>() {
@Override
public void initChannel(SocketChannel ch) throws Exception {
if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() &&
proxyConfig.getServer().getTcp().getTransferLogEnable()) {
ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class));
}
ch.pipeline().addFirst(new BytesMetricsHandler())
.addLast(new HttpVisitorSecurityChannelHandler())
.addLast("flowLimiter",new VisitorFlowLimiterChannelHandler())
.addLast(new HttpVisitorChannelHandler());
}
});
bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpProxyPort()).sync();
log.info("Http proxy server start success！port:{}", proxyConfig.getServer().getTcp().getHttpProxyPort());
} catch (Exception e) {
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java
+10 -11
View File
@@ -1,19 +1,24 @@
package org.dromara.neutrinoproxy.server.proxy.enhance;
import io.netty.bootstrap.Bootstrap;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOption;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.channel.*;
import io.netty.channel.socket.SocketChannel;
import io.netty.handler.proxy.ProxyHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.dromara.neutrinoproxy.core.Constants;
import org.dromara.neutrinoproxy.core.ProxyMessage;
import org.dromara.neutrinoproxy.core.util.HttpUtil;
import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
import org.dromara.neutrinoproxy.server.proxy.domain.DomainMapping;
import org.dromara.neutrinoproxy.server.proxy.domain.ProxyAttachment;
import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping;
import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo;
import org.dromara.neutrinoproxy.server.service.FlowReportService;
import org.dromara.neutrinoproxy.server.util.ProxyUtil;
import org.h2.store.DataHandler;
import org.noear.solon.Solon;
import java.net.InetSocketAddress;
@@ -31,6 +36,7 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
byte[] bytes = new byte[byteBuf.readableBytes()];
byteBuf.readBytes(bytes);
byteBuf.resetReaderIndex();
ProxyAttachment proxyAttachment = new ProxyAttachment(ctx.channel(), bytes, (channel, buf) -> {
Channel proxyChannel = channel.attr(Constants.NEXT_CHANNEL).get();
if (null == proxyChannel) {
@@ -38,14 +44,11 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
ctx.channel().close();
return;
}
proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(ProxyUtil.getVisitorIdByChannel(channel), bytes));
// 增加流量计数
VisitorChannelAttachInfo visitorChannelAttachInfo = ProxyUtil.getAttachInfo(channel);
Solon.context().getBean(FlowReportService.class).addWriteByte(visitorChannelAttachInfo.getLicenseId(), bytes.length);
});
String visitorId = ProxyUtil.getVisitorIdByChannel(ctx.channel());
if (StringUtils.isNotBlank(visitorId)) {
proxyAttachment.execute();
@@ -54,7 +57,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
// 用户连接到代理服务器时，设置用户连接不可读，等待代理后端服务器连接成功后再改变为可读状态
ctx.channel().config().setOption(ChannelOption.AUTO_READ, false);
// 根据域名拿到绑定的映射对应的cmdChannel
Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(serverPort);
@@ -67,7 +69,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
ctx.channel().close();
return;
}
visitorId = ProxyUtil.newVisitorId();
ProxyUtil.addVisitorChannelToCmdChannel(NetworkProtocolEnum.HTTP, cmdChannel, visitorId, ctx.channel(), serverPort);
ProxyUtil.addProxyConnectAttachment(visitorId, proxyAttachment);
@@ -76,7 +77,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
// 通知代理客户端
Channel visitorChannel = ctx.channel();
InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
@@ -86,7 +86,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
// 该端口还没有代理客户端
ctx.channel().close();
} else {
// 用户连接断开，从控制连接中移除
String visitorId = ProxyUtil.getVisitorIdByChannel(visitorChannel);
ProxyUtil.removeVisitorChannelFromCmdChannel(cmdChannel, visitorId);
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java
+13 -13
View File
@@ -51,19 +51,19 @@ public class HttpsProxy implements EventListener<AppLoadEndEvent> {
try {
ServerBootstrap bootstrap = new ServerBootstrap();
bootstrap.group(new NioEventLoopGroup(1), new NioEventLoopGroup())
.channel(NioServerSocketChannel.class).childHandler(new ChannelInitializer<SocketChannel>() {
@Override
public void initChannel(SocketChannel ch) throws Exception {
if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() && proxyConfig.getServer().getTcp().getTransferLogEnable()) {
ch.pipeline().addFirst(new LoggingHandler(HttpsProxy.class));
}
ch.pipeline().addLast(createSslHandler());
ch.pipeline().addFirst(new BytesMetricsHandler());
ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler());
ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
ch.pipeline().addLast(new HttpVisitorChannelHandler());
}
});
.channel(NioServerSocketChannel.class).childHandler(new ChannelInitializer<SocketChannel>() {
@Override
public void initChannel(SocketChannel ch) throws Exception {
if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() && proxyConfig.getServer().getTcp().getTransferLogEnable()) {
ch.pipeline().addFirst(new LoggingHandler(HttpsProxy.class));
}
ch.pipeline().addLast(createSslHandler());
ch.pipeline().addFirst(new BytesMetricsHandler());
ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler());
ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
ch.pipeline().addLast(new HttpVisitorChannelHandler());
}
});
bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpsProxyPort()).sync();
log.info("Https proxy server started！port:{}", proxyConfig.getServer().getTcp().getHttpsProxyPort());
} catch (Exception e) {
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/HttpVisitorSecurityChannelHandler.java
+37 -2
View File
@@ -1,9 +1,11 @@
package org.dromara.neutrinoproxy.server.proxy.security;
import cn.hutool.core.util.StrUtil;
import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.*;
import io.netty.channel.socket.SocketChannel;
import io.netty.handler.proxy.ProxyHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.dromara.neutrinoproxy.core.Constants;
@@ -25,6 +27,38 @@ public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdap
private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
private Bootstrap bootstrap;
/**
* 内部转发处理器
*/
class ProxyInnerHandler extends ChannelInboundHandlerAdapter {
private Channel channel;
public ProxyInnerHandler(Channel channel) {
bootstrap = new Bootstrap();
this.channel = channel;
}
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
ByteBuf readBuffer = (ByteBuf) msg;
readBuffer.retain();
channel.writeAndFlush(readBuffer);
}
}
private Channel getClientChannel(SocketChannel ch) throws InterruptedException {
bootstrap.handler(new ChannelInitializer<SocketChannel>() {
@Override
protected void initChannel(SocketChannel socketChannel) throws Exception {
socketChannel.pipeline().addLast("clientHandler", new ProxyInnerHandler(ch));
}
});
// 转发地址
ChannelFuture sync = bootstrap.connect("127.0.0.1", 9527);
return sync.channel();
}
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
ByteBuf buf = (ByteBuf) msg;
@@ -61,6 +95,7 @@ public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdap
}
ctx.channel().attr(Constants.REAL_REMOTE_IP).set(ip);
ctx.channel().attr(Constants.SERVER_PORT).set(dm.getId());
ctx.channel().attr(Constants.LICENSE_ID).set(dm.getLicenseId());
}
// 继续传播
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java
+24 -13
View File
@@ -40,6 +40,7 @@ import org.noear.solon.annotation.Init;
import org.noear.solon.annotation.Inject;
import org.noear.solon.core.bean.LifecycleBean;
import org.noear.solon.core.runtime.NativeDetector;
import org.noear.solon.data.annotation.Tran;
import java.util.Arrays;
import java.util.Date;
@@ -107,17 +108,16 @@ public class LicenseService implements LifecycleBean {
private List<LicenseListRes> assembleConvertLicenses(List<LicenseDO> list) {
List<LicenseListRes> licenseList = list.stream().map(LicenseDO::toRes).collect(Collectors.toList());
if (!CollectionUtil.isEmpty(licenseList)) {
Set<Integer> userIds = licenseList.stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
List<UserDO> userList = userMapper.findByIds(userIds);
Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
for (LicenseListRes item : licenseList) {
UserDO userDO = userMap.get(item.getUserId());
if (null != userDO) {
item.setUserName(userDO.getName());
}
item.setKey(desensitization(item.getUserId(), item.getKey()));
// 插入用户名
Set<Integer> userIds = licenseList.stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
List<UserDO> userList = userMapper.findByIds(userIds);
Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
for (LicenseListRes item : licenseList) {
UserDO userDO = userMap.get(item.getUserId());
if (null != userDO) {
item.setUserName(userDO.getName());
}
item.setKey(desensitization(item.getUserId(), item.getKey()));
}
return licenseList;
}
@@ -203,10 +203,20 @@ public class LicenseService implements LifecycleBean {
* @param req
* @return
*/
@Tran
public LicenseUpdateEnableStatusRes updateEnableStatus(LicenseUpdateEnableStatusReq req) {
licenseMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
// 更新VisitorChannel
visitorChannelService.updateVisitorChannelByLicenseId(req.getId(), req.getEnable());
// 服务端免通道 直接转发，所以无需建立客户端通道。启用即在线，禁用即离线
if (req.getId() == 1) {
licenseMapper.update(null, new LambdaUpdateWrapper<LicenseDO>()
.eq(LicenseDO::getId, req.getId())
.set(LicenseDO::getEnable, req.getEnable())
.set(LicenseDO::getIsOnline, req.getEnable())
.set(LicenseDO::getUpdateTime, new Date()));
} else {
licenseMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
// 更新VisitorChannel
visitorChannelService.updateVisitorChannelByLicenseId(req.getId(), req.getEnable());
}
return new LicenseUpdateEnableStatusRes();
}
@@ -338,6 +348,7 @@ public class LicenseService implements LifecycleBean {
.eq(LicenseDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
.eq(LicenseDO::getUserId, SystemContextHolder.getUserId())
);
if (CollectionUtil.isEmpty(list)) return null;
List<LicenseListRes> licenseList = assembleConvertLicenses(list);
return licenseList;
}
neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/VisitorChannelService.java
+2 -2
View File
@@ -234,9 +234,9 @@ public class VisitorChannelService {
if (networkProtocolEnum == NetworkProtocolEnum.UDP) {
udpServerBootstrap.bind(proxyMapping.getServerPort()).get();
log.info("bind UDP user port： {}", proxyMapping.getServerPort());
} else if (proxyMapping.getServerPort() <= 65535){
} else if (proxyMapping.getServerPort() <= 65535){// 大于65535 的端口号是域名解析无需绑定服务端端口号
tcpServerBootstrap.bind(proxyMapping.getServerPort()).get();
log.info("bind TCP user port： {}", proxyMapping.getServerPort());
log.info("bind TCP ServerPort： {}", proxyMapping.getServerPort());
}
} catch (Exception ex) {
// BindException表示该端口已经绑定过
neutrino-proxy-server/src/main/resources/mapper/LicenseMapper.xml
+7 -5
View File
@@ -3,24 +3,26 @@
<mapper namespace="org.dromara.neutrinoproxy.server.dal.LicenseMapper">
<select id="findEnableProxyMappingListByLicenseId" resultType="org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping">
SELECT pm.server_port as serverPort,CONCAT(pm.client_ip, ':', pm.client_port) as lanInfo, pm.protocal as protocal
SELECT pm.license_id as licenseId, pm.server_port as serverPort,CONCAT(pm.client_ip, ':', pm.client_port) as lanInfo, pm.protocal as protocal
FROM port_mapping pm
LEFT JOIN port_pool pp on pm.server_port = pp.port
WHERE pm.enable = 1 AND pm.is_online = 1 AND pp.enable = 1
WHERE pm.enable = 1 AND pm.is_online = 1 AND pp.enable = 1 AND pm.license_id = #{licenseId}
UNION ALL
SELECT dm.id as serverPort,dm.target_path as lanInfo, 'HTTP' as protocal
SELECT dm.license_id as licenseId, dm.id as serverPort,dm.target_path as lanInfo, 'HTTP' as protocal
FROM domain_mapping dm
LEFT JOIN license l on dm.license_id = l.`id`
WHERE dm.enable = 1 AND l.is_online = 1
WHERE dm.enable = 1 AND l.is_online = 1 AND dm.license_id = #{licenseId}
</select>
<select id="findAllProxyMappingListByLicenseId" resultType="org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping">
SELECT pm.server_port as serverPort,CONCAT(pm.client_ip, ':', pm.client_port) as lanInfo, pm.protocal as protocal
SELECT pm.license_id as licenseId, pm.server_port as serverPort,CONCAT(pm.client_ip, ':', pm.client_port) as lanInfo, pm.protocal as protocal
FROM port_mapping pm
LEFT JOIN port_pool pp on pm.server_port = pp.port
WHERE pm.license_id = #{licenseId}
UNION ALL
SELECT dm.id as serverPort,dm.target_path as lanInfo, 'HTTP' as protocal
FROM domain_mapping dm
LEFT JOIN license l on dm.license_id = l.`id`
WHERE dm.license_id = #{licenseId}
</select>
</mapper>
neutrino-proxy-server/src/main/resources/sql/h2/license.data.sql
+1 -1
View File
@@ -1,3 +1,3 @@
#license
INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, now(), now());
(1, '服务端(不可编辑删除，可禁用)', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());
neutrino-proxy-server/src/main/resources/sql/mariadb/license.data.sql
+1 -1
View File
@@ -1,3 +1,3 @@
#license
INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, now(), now());
(1, '服务端(不可编辑删除，可禁用)', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());
neutrino-proxy-server/src/main/resources/sql/mysql/license.data.sql
+1 -1
View File
@@ -1,3 +1,3 @@
#license
INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, now(), now());
(1, '服务端(不可编辑删除，可禁用)', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());