tiennm99/zfoo
1
0 Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-10-13 20:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

pref[net]:解码修改

Browse Source
This commit is contained in:
37Sir committed 2021-06-08 10:58:23 +08:00
1 parent a4364828f5
commit 2222a56e8c
2 files changed
+52 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpPacketCodecHandler.java
+24 -24
View File
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Objects;
/**
* header(4byte) + protocolId(2byte) + packet
@@ -40,34 +41,31 @@ public class TcpPacketCodecHandler extends ByteToMessageCodec<EncodedPacketInfo>
private static final Logger logger = LoggerFactory.getLogger(TcpPacketCodecHandler.class);
private int length;
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) {
// 不够读一个int
if (in.readableBytes() <= ProtocolManager.PROTOCOL_HEAD_LENGTH) {
return;
}
in.markReaderIndex();
var length = in.readInt();
// 如果长度非法，则抛出异常断开连接
if (length < 0) {
throw new IllegalArgumentException(StringUtils
.format("[session:{}]的包头长度[length:{}]非法"
, SessionUtils.sessionInfo(ctx), length));
}
// ByteBuf里的数据太小
if (in.readableBytes() < length) {
in.resetReaderIndex();
return;
}
var tmpByteBuf = in.readRetainedSlice(length);
try {
// 不够读一个int
if (in.readableBytes() <= ProtocolManager.PROTOCOL_HEAD_LENGTH) {
return;
}
in.markReaderIndex();
length = in.readInt();
// 如果长度超过限制，则抛出异常断开连接
if (length < 0) {
throw new IllegalArgumentException(StringUtils
.format("[session:{}]的包头长度[length:{}]非法[maxLength:{}]"
, SessionUtils.sessionInfo(ctx), length));
}
// ByteBuf里的数据太小
if (in.readableBytes() < length) {
in.resetReaderIndex();
return;
}
var tmpByteBuf = in.readRetainedSlice(length);
DecodedPacketInfo packetInfo = NetContext.getPacketService().read(tmpByteBuf);
ReferenceCountUtil.release(tmpByteBuf);
out.add(packetInfo);
} catch (Exception e) {
logger.error("[session:{}]解码exception异常", SessionUtils.sessionInfo(ctx), e);
@@ -75,6 +73,8 @@ public class TcpPacketCodecHandler extends ByteToMessageCodec<EncodedPacketInfo>
} catch (Throwable t) {
logger.error("[session:{}]解码throwable错误", SessionUtils.sessionInfo(ctx), t);
throw t;
} finally {
ReferenceCountUtil.release(tmpByteBuf);
}
}
net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java
+28 -33
View File
@@ -28,10 +28,12 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageCodec;
import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
import io.netty.handler.codec.http.websocketx.WebSocketFrame;
import io.netty.util.ReferenceCountUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Objects;
/**
* header(4byte) + protocolId(2byte) + packet
@@ -44,42 +46,33 @@ public class WebSocketCodecHandler extends MessageToMessageCodec<WebSocketFrame,
private static final Logger logger = LoggerFactory.getLogger(TcpPacketCodecHandler.class);
// 数据包的最大长度限制，防止恶意的攻击
private static final int MAX_LENGTH = 100 * IOUtils.BYTES_PER_KB;
private int length;
private boolean remain = false;
@Override
protected void decode(ChannelHandlerContext channelHandlerContext, WebSocketFrame webSocketFrame, List<Object> list) {
ByteBuf in = webSocketFrame.content();
// 不够读一个int
if (in.readableBytes() <= ProtocolManager.PROTOCOL_HEAD_LENGTH) {
return;
}
in.markReaderIndex();
var length = in.readInt();
// 如果长度非法，则抛出异常断开连接
if (length < 0) {
throw new IllegalArgumentException(StringUtils
.format("[session:{}]的包头长度[length:{}]非法"
, SessionUtils.sessionInfo(channelHandlerContext), length));
}
// ByteBuf里的数据太小
if (in.readableBytes() < length) {
in.resetReaderIndex();
return;
}
var tmpByteBuf = in.readRetainedSlice(length);
try {
ByteBuf in = webSocketFrame.content();
if (!remain) {
// 不够读一个int
if (in.readableBytes() <= ProtocolManager.PROTOCOL_HEAD_LENGTH) {
return;
}
length = in.readInt();
remain = true;
}
// 如果长度超过限制，则抛出异常断开连接
if (length > MAX_LENGTH) {
throw new IllegalArgumentException(StringUtils
.format("[session:{}]的包头长度[length:{}]超过最大长度[maxLength:{}]限制"
, SessionUtils.sessionInfo(channelHandlerContext), length, MAX_LENGTH));
}
// ByteBuf里的数据太小
if (in.readableBytes() < length) {
return;
}
remain = false;
DecodedPacketInfo packetInfo = NetContext.getPacketService().read(in);
DecodedPacketInfo packetInfo = NetContext.getPacketService().read(tmpByteBuf);
list.add(packetInfo);
} catch (Exception e) {
logger.error("exception异常", e);
@@ -87,6 +80,8 @@ public class WebSocketCodecHandler extends MessageToMessageCodec<WebSocketFrame,
} catch (Throwable t) {
logger.error("throwable错误", t);
throw t;
} finally {
ReferenceCountUtil.release(tmpByteBuf);
}
}