test/j-im
1
0
Fork 0
mirror of https://gitee.com/xchao/j-im.git synced 2024-12-04 21:07:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化Http协议解析+增加Imconfig中可设置默认读取缓冲区大小+fix上传文件异常

Browse Source
This commit is contained in:
wangchao 2018-04-25 13:31:27 +08:00
parent 6144d14bca
commit 00024e9b19
8 changed files with 107 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jim-common/src/main/java/org/jim/common/ImConfig.java
View File

@ -43,6 +43,10 @@ public class ImConfig {
* 是否开启持久化; * 是否开启持久化;
*/ */
public static String isStore; public static String isStore;
/**
* 默认的接收数据的buffer size
*/
private long readBufferSize = 1024 * 1024;
public ImConfig(String bindIp,Integer bindPort){ public ImConfig(String bindIp,Integer bindPort){
@ -85,4 +89,11 @@ public class ImConfig {
public static void setMessageHelper(IMesssageHelper helper) { public static void setMessageHelper(IMesssageHelper helper) {
messageHelper = helper; messageHelper = helper;
} }
public long getReadBufferSize() {
return readBufferSize;
}
public void setReadBufferSize(long readBufferSize) {
this.readBufferSize = readBufferSize;
}
} }

2
jim-common/src/main/java/org/jim/common/http/HttpRequest.java
View File

@ -38,7 +38,7 @@ public class HttpRequest extends HttpPacket {
/** /**
* 请求参数 * 请求参数
*/ */
private Map<String, Object[]> params = null; private Map<String, Object[]> params = new HashMap<>();;
private List<Cookie> cookies = null; private List<Cookie> cookies = null;
private Map<String, Cookie> cookieMap = null; private Map<String, Cookie> cookieMap = null;
private int contentLength; private int contentLength;

124
jim-common/src/main/java/org/jim/common/http/HttpRequestDecoder.java
View File

@ -3,21 +3,21 @@ package org.jim.common.http;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jim.common.http.HttpConst.RequestBodyFormat;
import org.jim.common.utils.HttpParseUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.tio.core.ChannelContext; import org.tio.core.ChannelContext;
import org.tio.core.exception.AioDecodeException; import org.tio.core.exception.AioDecodeException;
import org.tio.core.exception.LengthOverflowException; import org.tio.core.exception.LengthOverflowException;
import org.tio.core.utils.ByteBufferUtils; import org.tio.core.utils.ByteBufferUtils;
import org.jim.common.http.HttpConst.RequestBodyFormat;
import org.jim.common.utils.HttpParseUtils;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
/** /**
* *
* @author WChao * @author WChao
@ -31,17 +31,18 @@ public class HttpRequestDecoder {
private static Logger log = LoggerFactory.getLogger(HttpRequestDecoder.class); private static Logger log = LoggerFactory.getLogger(HttpRequestDecoder.class);
/** /**
* 头部最多有多少字节 * 头部，最多有多少字节
*/ */
public static final int MAX_HEADER_LENGTH = 20480; public static final int MAX_LENGTH_OF_HEADER = 20480;
/** /**
* 头部，每行最大的字节数 * 头部，每行最大的字节数
*/ */
public static final int MAX_LENGTH_OF_LINE = 1024; public static final int MAX_LENGTH_OF_HEADERLINE = 2048;
public static HttpRequest decode(ByteBuffer buffer, ChannelContext channelContext) throws AioDecodeException { public static HttpRequest decode(ByteBuffer buffer, ChannelContext channelContext,boolean isBody) throws AioDecodeException {
int initPosition = buffer.position(); int initPosition = buffer.position();
int readableLength = buffer.limit() - initPosition;
// int count = 0; // int count = 0;
Step step = Step.firstline; Step step = Step.firstline;
// StringBuilder currLine = new StringBuilder(); // StringBuilder currLine = new StringBuilder();
@ -54,14 +55,14 @@ public class HttpRequestDecoder {
while (buffer.hasRemaining()) { while (buffer.hasRemaining()) {
String line; String line;
try { try {
line = ByteBufferUtils.readLine(buffer, null, MAX_LENGTH_OF_LINE); line = ByteBufferUtils.readLine(buffer, null, MAX_LENGTH_OF_HEADERLINE);
} catch (LengthOverflowException e) { } catch (LengthOverflowException e) {
throw new AioDecodeException(e); throw new AioDecodeException(e);
} }
int newPosition = buffer.position(); int newPosition = buffer.position();
if (newPosition - initPosition > MAX_HEADER_LENGTH) { if (newPosition - initPosition > MAX_LENGTH_OF_HEADER) {
throw new AioDecodeException("max http header length " + MAX_HEADER_LENGTH); throw new AioDecodeException("max http header length " + MAX_LENGTH_OF_HEADER);
} }
if (line == null) { if (line == null) {
@ -69,7 +70,7 @@ public class HttpRequestDecoder {
} }
headerSb.append(line).append("\r\n"); headerSb.append(line).append("\r\n");
if ("".equals(line)) {//头部解析完成了 if ("".equals(line) && isBody) {//头部解析完成了
String contentLengthStr = headers.get(HttpConst.RequestHeaderKey.Content_Length); String contentLengthStr = headers.get(HttpConst.RequestHeaderKey.Content_Length);
if (StringUtils.isBlank(contentLengthStr)) { if (StringUtils.isBlank(contentLengthStr)) {
contentLength = 0; contentLength = 0;
@ -77,11 +78,14 @@ public class HttpRequestDecoder {
contentLength = Integer.parseInt(contentLengthStr); contentLength = Integer.parseInt(contentLengthStr);
} }
int readableLength = buffer.limit() - buffer.position(); // int readableLength = buffer.limit() - buffer.position();
if (readableLength >= contentLength) { int headerLength = (buffer.position() - initPosition);
int allNeedLength = headerLength + contentLength; //这个packet所需要的字节长度(含头部和体部)
if (readableLength >= allNeedLength) {
step = Step.body; step = Step.body;
break; break;
} else { } else {
channelContext.setPacketNeededLength(allNeedLength);
return null; return null;
} }
} else { } else {
@ -89,6 +93,8 @@ public class HttpRequestDecoder {
firstLine = parseRequestLine(line, channelContext); firstLine = parseRequestLine(line, channelContext);
step = Step.header; step = Step.header;
} else if (step == Step.header) { } else if (step == Step.header) {
if("".equals(line) && !isBody)//不解析包体的话,结束(换句话说就是只解析请求行与请求头)
break;
KeyValue keyValue = parseHeaderLine(line); KeyValue keyValue = parseHeaderLine(line);
headers.put(keyValue.getKey(), keyValue.getValue()); headers.put(keyValue.getKey(), keyValue.getValue());
} }
@ -96,7 +102,7 @@ public class HttpRequestDecoder {
} }
} }
if (step != Step.body) { if (step != Step.body && isBody) {
return null; return null;
} }
@ -112,11 +118,12 @@ public class HttpRequestDecoder {
httpRequest.setHeaders(headers); httpRequest.setHeaders(headers);
httpRequest.setContentLength(contentLength); httpRequest.setContentLength(contentLength);
parseQueryString(httpRequest, firstLine, channelContext);
if (contentLength == 0) { if (contentLength == 0) {
if (StringUtils.isNotBlank(firstLine.getQuery())) { // if (StringUtils.isNotBlank(firstLine.getQuery())) {
Map<String, Object[]> params = decodeParams(firstLine.getQuery(), httpRequest.getCharset(), channelContext); // decodeParams(httpRequest.getParams(), firstLine.getQuery(), httpRequest.getCharset(), channelContext);
httpRequest.setParams(params); // }
}
} else { } else {
bodyBytes = new byte[contentLength]; bodyBytes = new byte[contentLength];
buffer.get(bodyBytes); buffer.get(bodyBytes);
@ -148,9 +155,9 @@ public class HttpRequestDecoder {
} }
public static Map<String, Object[]> decodeParams(String paramsStr, String charset, ChannelContext channelContext) { public static void decodeParams(Map<String, Object[]> params, String paramsStr, String charset, ChannelContext channelContext) {
if (StrUtil.isBlank(paramsStr)) { if (StrUtil.isBlank(paramsStr)) {
return Collections.emptyMap(); return;
} }
// // 去掉Path部分 // // 去掉Path部分
@ -158,7 +165,7 @@ public class HttpRequestDecoder {
// if (pathEndPos > 0) { // if (pathEndPos > 0) {
// paramsStr = StrUtil.subSuf(paramsStr, pathEndPos + 1); // paramsStr = StrUtil.subSuf(paramsStr, pathEndPos + 1);
// } // }
Map<String, Object[]> ret = new HashMap<>(); // Map<String, Object[]> ret = new HashMap<>();
String[] keyvalues = StringUtils.split(paramsStr, "&"); String[] keyvalues = StringUtils.split(paramsStr, "&");
for (String keyvalue : keyvalues) { for (String keyvalue : keyvalues) {
String[] keyvalueArr = StringUtils.split(keyvalue, "="); String[] keyvalueArr = StringUtils.split(keyvalue, "=");
@ -174,24 +181,24 @@ public class HttpRequestDecoder {
log.error(channelContext.toString(), e); log.error(channelContext.toString(), e);
} }
Object[] existValue = ret.get(key); Object[] existValue = params.get(key);
if (existValue != null) { if (existValue != null) {
String[] newExistValue = new String[existValue.length + 1]; String[] newExistValue = new String[existValue.length + 1];
System.arraycopy(existValue, 0, newExistValue, 0, existValue.length); System.arraycopy(existValue, 0, newExistValue, 0, existValue.length);
newExistValue[newExistValue.length - 1] = value; newExistValue[newExistValue.length - 1] = value;
ret.put(key, newExistValue); params.put(key, newExistValue);
} else { } else {
String[] newExistValue = new String[] { value }; String[] newExistValue = new String[] { value };
ret.put(key, newExistValue); params.put(key, newExistValue);
} }
} }
return ret; return;
} }
/** /**
* @param args * @param args
* *
* @author wchao * @author WChao
* 2017年2月22日 下午4:06:42 * 2017年2月22日 下午4:06:42
* *
*/ */
@ -206,7 +213,7 @@ public class HttpRequestDecoder {
* @param bodyBytes * @param bodyBytes
* @param channelContext * @param channelContext
* @throws AioDecodeException * @throws AioDecodeException
* @author wchao * @author WChao
*/ */
private static void parseBody(HttpRequest httpRequest, RequestLine firstLine, byte[] bodyBytes, ChannelContext channelContext) throws AioDecodeException { private static void parseBody(HttpRequest httpRequest, RequestLine firstLine, byte[] bodyBytes, ChannelContext channelContext) throws AioDecodeException {
parseBodyFormat(httpRequest, httpRequest.getHeaders()); parseBodyFormat(httpRequest, httpRequest.getHeaders());
@ -218,20 +225,20 @@ public class HttpRequestDecoder {
if (log.isInfoEnabled()) { if (log.isInfoEnabled()) {
String bodyString = null; String bodyString = null;
if (bodyBytes != null && bodyBytes.length > 0) { if (bodyBytes != null && bodyBytes.length > 0) {
if (log.isDebugEnabled()) {
try { try {
bodyString = new String(bodyBytes, httpRequest.getCharset()); bodyString = new String(bodyBytes, httpRequest.getCharset());
log.info("{} multipart body string\r\n{}", channelContext, bodyString); log.debug("{} multipart body string\r\n{}", channelContext, bodyString);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
log.error(channelContext.toString(), e); log.error(channelContext.toString(), e);
} }
} }
}
} }
//【multipart/form-data; boundary=----WebKitFormBoundaryuwYcfA2AIgxqIxA0】 //【multipart/form-data; boundary=----WebKitFormBoundaryuwYcfA2AIgxqIxA0】
String initboundary = HttpParseUtils.getPerprotyEqualValue(httpRequest.getHeaders(), HttpConst.RequestHeaderKey.Content_Type, "boundary"); String initboundary = HttpParseUtils.getPerprotyEqualValue(httpRequest.getHeaders(), HttpConst.RequestHeaderKey.Content_Type, "boundary");
log.info("{}, initboundary:{}", channelContext, initboundary); log.debug("{}, initboundary:{}", channelContext, initboundary);
HttpMultiBodyDecoder.decode(httpRequest, firstLine, bodyBytes, initboundary, channelContext); HttpMultiBodyDecoder.decode(httpRequest, firstLine, bodyBytes, initboundary, channelContext);
} else { } else {
String bodyString = null; String bodyString = null;
@ -239,7 +246,9 @@ public class HttpRequestDecoder {
try { try {
bodyString = new String(bodyBytes, httpRequest.getCharset()); bodyString = new String(bodyBytes, httpRequest.getCharset());
httpRequest.setBodyString(bodyString); httpRequest.setBodyString(bodyString);
if (log.isInfoEnabled()) {
log.info("{} body string\r\n{}", channelContext, bodyString); log.info("{} body string\r\n{}", channelContext, bodyString);
}
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
log.error(channelContext.toString(), e); log.error(channelContext.toString(), e);
} }
@ -276,7 +285,7 @@ public class HttpRequestDecoder {
* Content-Type : application/x-www-form-urlencoded; charset=UTF-8 * Content-Type : application/x-www-form-urlencoded; charset=UTF-8
* @param httpRequest * @param httpRequest
* @param headers * @param headers
* @author wchao * @author WChao
*/ */
public static void parseBodyFormat(HttpRequest httpRequest, Map<String, String> headers) { public static void parseBodyFormat(HttpRequest httpRequest, Map<String, String> headers) {
String Content_Type = StringUtils.lowerCase(headers.get(HttpConst.RequestHeaderKey.Content_Type)); String Content_Type = StringUtils.lowerCase(headers.get(HttpConst.RequestHeaderKey.Content_Type));
@ -290,9 +299,9 @@ public class HttpRequestDecoder {
} }
httpRequest.setBodyFormat(bodyFormat); httpRequest.setBodyFormat(bodyFormat);
if (StringUtils.isNoneBlank(Content_Type)) { if (StringUtils.isNotBlank(Content_Type)) {
String charset = HttpParseUtils.getPerprotyEqualValue(headers, HttpConst.RequestHeaderKey.Content_Type, "charset"); String charset = HttpParseUtils.getPerprotyEqualValue(headers, HttpConst.RequestHeaderKey.Content_Type, "charset");
if (StringUtils.isNoneBlank(charset)) { if (StringUtils.isNotBlank(charset)) {
httpRequest.setCharset(charset); httpRequest.setCharset(charset);
} }
} }
@ -303,7 +312,7 @@ public class HttpRequestDecoder {
* @param line * @param line
* @return * @return
* *
* @author wchao * @author WChao
* 2017年2月23日 下午1:37:58 * 2017年2月23日 下午1:37:58
* *
*/ */
@ -330,7 +339,7 @@ public class HttpRequestDecoder {
* @param channelContext * @param channelContext
* @return * @return
* *
* @author wchao * @author WChao
* 2017年2月23日 下午1:37:51 * 2017年2月23日 下午1:37:51
* *
*/ */
@ -360,6 +369,7 @@ public class HttpRequestDecoder {
RequestLine requestLine = new RequestLine(); RequestLine requestLine = new RequestLine();
requestLine.setMethod(method); requestLine.setMethod(method);
requestLine.setPath(path); requestLine.setPath(path);
requestLine.setInitPath(path);
requestLine.setPathAndQuery(pathAndQuerystr); requestLine.setPathAndQuery(pathAndQuerystr);
requestLine.setQuery(queryStr); requestLine.setQuery(queryStr);
requestLine.setVersion(version); requestLine.setVersion(version);
@ -367,7 +377,7 @@ public class HttpRequestDecoder {
requestLine.setLine(line); requestLine.setLine(line);
return requestLine; return requestLine;
} catch (Exception e) { } catch (Throwable e) {
log.error(channelContext.toString(), e); log.error(channelContext.toString(), e);
throw new AioDecodeException(e); throw new AioDecodeException(e);
} }
@ -376,32 +386,42 @@ public class HttpRequestDecoder {
/** /**
* 解析URLENCODED格式的消息体 * 解析URLENCODED格式的消息体
* 形如： 【Content-Type : application/x-www-form-urlencoded; charset=UTF-8】 * 形如： 【Content-Type : application/x-www-form-urlencoded; charset=UTF-8】
* @author wchao * @author WChao
*/ */
private static void parseUrlencoded(HttpRequest httpRequest, RequestLine firstLine, byte[] bodyBytes, String bodyString, ChannelContext channelContext) { private static void parseUrlencoded(HttpRequest httpRequest, RequestLine firstLine, byte[] bodyBytes, String bodyString, ChannelContext channelContext) {
String paramStr = ""; // String paramStr = "";
if (StringUtils.isNotBlank(firstLine.getQuery())) { // if (StringUtils.isNotBlank(firstLine.getQuery())) {
paramStr += firstLine.getQuery(); // paramStr += firstLine.getQuery();
// }
// if (bodyString != null) {
// if (paramStr != null) {
// paramStr += "&";
// }
// paramStr += bodyString;
// }
if (StringUtils.isNotBlank(bodyString)) {
decodeParams(httpRequest.getParams(), bodyString, httpRequest.getCharset(), channelContext);
} }
if (bodyString != null) {
if (paramStr != null) {
paramStr += "&";
}
paramStr += bodyString;
} }
if (paramStr != null) { /**
Map<String, Object[]> params = decodeParams(paramStr, httpRequest.getCharset(), channelContext); * 解析查询
httpRequest.setParams(params); * @param httpRequest
// log.error("paramStr:{}", paramStr); * @param firstLine
// log.error("param:{}", Json.toJson(params)); * @param channelContext
*/
private static void parseQueryString(HttpRequest httpRequest, RequestLine firstLine, ChannelContext channelContext) {
String paramStr = firstLine.getQuery();
if (StringUtils.isNotBlank(paramStr)) {
decodeParams(httpRequest.getParams(), paramStr, httpRequest.getCharset(), channelContext);
} }
} }
/** /**
* *
* *
* @author wchao * @author WChao
* 2017年2月22日 下午4:06:42 * 2017年2月22日 下午4:06:42
* *
*/ */

10
jim-common/src/main/java/org/jim/common/http/RequestLine.java
View File

@ -7,6 +7,7 @@ package org.jim.common.http;
public class RequestLine { public class RequestLine {
private Method method; private Method method;
private String path; //譬如http://www.163.com/user/get?name=tan&id=789，那些此值就是/user/get private String path; //譬如http://www.163.com/user/get?name=tan&id=789，那些此值就是/user/get
private String initPath; //同path，只是path可能会被业务端修改，而这个是记录访问者访问的最原始path的
private String query; //譬如http://www.163.com/user/get?name=tan&id=789，那些此值就是name=tan&id=789 private String query; //譬如http://www.163.com/user/get?name=tan&id=789，那些此值就是name=tan&id=789
private String pathAndQuery; private String pathAndQuery;
private String protocol; private String protocol;
@ -104,4 +105,13 @@ public class RequestLine {
public void setProtocol(String protocol) { public void setProtocol(String protocol) {
this.protocol = protocol; this.protocol = protocol;
} }
public String getInitPath() {
return initPath;
}
public void setInitPath(String initPath) {
this.initPath = initPath;
}
} }

1
jim-server/src/main/java/org/jim/server/ImServerStarter.java
View File

@ -38,6 +38,7 @@ public class ImServerStarter {
} }
public void init(){ public void init(){
System.setProperty("tio.default.read.buffer.size", String.valueOf(imConfig.getReadBufferSize()));
imAioHandler = new ImServerAioHandler() ; imAioHandler = new ImServerAioHandler() ;
if(imAioListener == null){ if(imAioListener == null){
imAioListener = new ImServerAioListener(); imAioListener = new ImServerAioListener();

4
jim-server/src/main/java/org/jim/server/http/HttpServerHandler.java
View File

@ -83,7 +83,7 @@ public class HttpServerHandler extends AbServerHandler{
@Override @Override
public boolean isProtocol(ByteBuffer buffer,ChannelContext channelContext)throws Throwable{ public boolean isProtocol(ByteBuffer buffer,ChannelContext channelContext)throws Throwable{
if(buffer != null){ if(buffer != null){
HttpRequest request = HttpRequestDecoder.decode(buffer, channelContext); HttpRequest request = HttpRequestDecoder.decode(buffer, channelContext,false);
if(request.getHeaders().get(HttpConst.RequestHeaderKey.Sec_WebSocket_Key) == null) if(request.getHeaders().get(HttpConst.RequestHeaderKey.Sec_WebSocket_Key) == null)
{ {
channelContext.setAttribute(new HttpSession().setServerHandler(this)); channelContext.setAttribute(new HttpSession().setServerHandler(this));
@ -109,7 +109,7 @@ public class HttpServerHandler extends AbServerHandler{
@Override @Override
public Packet decode(ByteBuffer buffer, ChannelContext channelContext)throws AioDecodeException { public Packet decode(ByteBuffer buffer, ChannelContext channelContext)throws AioDecodeException {
HttpRequest request = HttpRequestDecoder.decode(buffer, channelContext); HttpRequest request = HttpRequestDecoder.decode(buffer, channelContext,true);
channelContext.setAttribute(Const.HTTP_REQUEST,request); channelContext.setAttribute(Const.HTTP_REQUEST,request);
return request; return request;
} }

2
jim-server/src/main/java/org/jim/server/http/api/TestController.java
View File

@ -126,7 +126,7 @@ public class TestController {
public HttpResponse upload(UploadFile uploadFile, String before, String end, HttpRequest request) throws Exception { public HttpResponse upload(UploadFile uploadFile, String before, String end, HttpRequest request) throws Exception {
HttpResponse ret; HttpResponse ret;
if (uploadFile != null) { if (uploadFile != null) {
File file = new File("c:/" + uploadFile.getName()); File file = new File("D:/" + uploadFile.getName());
FileUtils.writeByteArrayToFile(file, uploadFile.getData()); FileUtils.writeByteArrayToFile(file, uploadFile.getData());
System.out.println("【" + before + "】"); System.out.println("【" + before + "】");

4
jim-server/src/main/java/org/jim/server/ws/WsServerHandler.java
View File

@ -68,7 +68,7 @@ public class WsServerHandler extends AbServerHandler{
@Override @Override
public boolean isProtocol(ByteBuffer buffer,ChannelContext channelContext)throws Throwable{ public boolean isProtocol(ByteBuffer buffer,ChannelContext channelContext)throws Throwable{
if(buffer != null){//第一次连接; if(buffer != null){//第一次连接;
HttpRequest request = HttpRequestDecoder.decode(buffer, channelContext); HttpRequest request = HttpRequestDecoder.decode(buffer, channelContext,false);
if(request.getHeaders().get(HttpConst.RequestHeaderKey.Sec_WebSocket_Key) != null) if(request.getHeaders().get(HttpConst.RequestHeaderKey.Sec_WebSocket_Key) != null)
{ {
channelContext.setAttribute(new WsSessionContext().setServerHandler(this)); channelContext.setAttribute(new WsSessionContext().setServerHandler(this));
@ -113,7 +113,7 @@ public class WsServerHandler extends AbServerHandler{
public ImPacket decode(ByteBuffer buffer, ChannelContext channelContext) throws AioDecodeException { public ImPacket decode(ByteBuffer buffer, ChannelContext channelContext) throws AioDecodeException {
WsSessionContext wsSessionContext = (WsSessionContext)channelContext.getAttribute(); WsSessionContext wsSessionContext = (WsSessionContext)channelContext.getAttribute();
if(!wsSessionContext.isHandshaked()){//握手 if(!wsSessionContext.isHandshaked()){//握手
HttpRequest httpRequest = HttpRequestDecoder.decode(buffer,channelContext); HttpRequest httpRequest = HttpRequestDecoder.decode(buffer,channelContext,true);
if(httpRequest == null) if(httpRequest == null)
return null; return null;
//升级到WebSocket协议处理 //升级到WebSocket协议处理