Skip to content

fix: http协议客户端对请求头的处理和服务端解析不一致 #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sppan24 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: http协议客户端对请求头的处理和服务端解析不一致 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 48 additions & 6 deletions ...rpc-proto-http/src/main/java/com/tencent/trpc/proto/http/client/Http2ConsumerInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,30 @@

import static com.tencent.trpc.core.common.Constants.DEFAULT_CLIENT_REQUEST_TIMEOUT_MS;
import static com.tencent.trpc.proto.http.common.HttpConstants.CONNECTION_REQUEST_TIMEOUT;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_CALLEE;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_CALLER;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_REQUEST_ID;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_TIMEOUT;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_TRANS_INFO;

import autovalue.shaded.com.google.common.common.base.Objects;
import com.fasterxml.jackson.core.Base64Variants;
import com.tencent.trpc.core.common.config.BackendConfig;
import com.tencent.trpc.core.common.config.ConsumerConfig;
import com.tencent.trpc.core.common.config.ProtocolConfig;
import com.tencent.trpc.core.exception.TRpcException;
import com.tencent.trpc.core.logger.Logger;
import com.tencent.trpc.core.logger.LoggerFactory;
import com.tencent.trpc.core.rpc.CallInfo;
import com.tencent.trpc.core.rpc.Request;
import com.tencent.trpc.core.rpc.Response;
import com.tencent.trpc.core.utils.JsonUtils;
import com.tencent.trpc.core.utils.RpcUtils;
import com.tencent.trpc.proto.http.common.HttpConstants;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -199,12 +209,7 @@ private SimpleHttpRequest buildRequest(Request request, int requestTimeout) thro
SimpleHttpRequest simpleHttpRequest = SimpleHttpRequests.post(getUri(request));
simpleHttpRequest.setConfig(requestConfig);
simpleHttpRequest.setHeader(HttpHeaders.CONTENT_TYPE, HttpConstants.CONTENT_TYPE_JSON);
// encode request
String jsonString = encodeToJson(request);
if (jsonString != null) {
simpleHttpRequest.setBody(jsonString, ContentType.APPLICATION_JSON);
}
// Set custom business headers, consistent with the TRPC protocol, only process String and byte[]
// set custom business headers, consistent with the TRPC protocol, only process String and byte[]
request.getAttachments().forEach((k, v) -> {
if (Objects.equal(k, HttpHeaders.TRANSFER_ENCODING) || Objects.equal(k, HttpHeaders.CONTENT_LENGTH)) {
return;
Expand All @@ -215,6 +220,43 @@ private SimpleHttpRequest buildRequest(Request request, int requestTimeout) thro
simpleHttpRequest.setHeader(k, new String((byte[]) v));
}
});
// set caller and callee information
CallInfo callInfo = request.getMeta().getCallInfo();
simpleHttpRequest.setHeader(HTTP_HEADER_TRPC_CALLER, callInfo.getCaller());
simpleHttpRequest.setHeader(HTTP_HEADER_TRPC_CALLEE, callInfo.getCallee());

// set request id
simpleHttpRequest.setHeader(HTTP_HEADER_TRPC_REQUEST_ID, String.valueOf(request.getRequestId()));
// set timeout
simpleHttpRequest.setHeader(HTTP_HEADER_TRPC_TIMEOUT, String.valueOf(requestTimeout));
// set message type
int messageType = request.getMeta().getMessageType();
if (messageType != 0) {
simpleHttpRequest.setHeader(HTTP_HEADER_TRPC_MESSAGE_TYPE, String.valueOf(messageType));
}
// set trans info: encode attachments as JSON with base64-encoded values,
// consistent with the server-side decoding logic in AbstractHttpExecutor.setAttachments
Map<String, Object> attachments = request.getAttachments();
if (attachments != null && !attachments.isEmpty()) {
Map<String, String> transInfoMap = new LinkedHashMap<>();
attachments.forEach((k, v) -> {
if (v instanceof byte[]) {
transInfoMap.put(k, Base64Variants.getDefaultVariant().encode((byte[]) v));
} else if (v instanceof String) {
transInfoMap.put(k, Base64Variants.getDefaultVariant()
.encode(((String) v).getBytes(StandardCharsets.UTF_8)));
}
});
if (!transInfoMap.isEmpty()) {
simpleHttpRequest.setHeader(HTTP_HEADER_TRPC_TRANS_INFO, JsonUtils.toJson(transInfoMap));
}
}

// encode request body
String jsonString = encodeToJson(request);
if (jsonString != null) {
simpleHttpRequest.setBody(jsonString, ContentType.APPLICATION_JSON);
}
return simpleHttpRequest;
}

Expand Down
35 changes: 35 additions & 0 deletions ...trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/client/HttpConsumerInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,27 @@
import static com.tencent.trpc.proto.http.common.HttpConstants.CONNECTION_REQUEST_TIMEOUT;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_CALLEE;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_CALLER;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_MESSAGE_TYPE;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_REQUEST_ID;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_TIMEOUT;
import static com.tencent.trpc.proto.http.common.HttpConstants.HTTP_HEADER_TRPC_TRANS_INFO;

import com.fasterxml.jackson.core.Base64Variant;
import com.fasterxml.jackson.core.Base64Variants;
import com.tencent.trpc.core.common.config.BackendConfig;
import com.tencent.trpc.core.common.config.ConsumerConfig;
import com.tencent.trpc.core.common.config.ProtocolConfig;
import com.tencent.trpc.core.exception.TRpcException;
import com.tencent.trpc.core.rpc.CallInfo;
import com.tencent.trpc.core.rpc.Request;
import com.tencent.trpc.core.rpc.Response;
import com.tencent.trpc.core.utils.JsonUtils;
import com.tencent.trpc.core.utils.RpcUtils;
import com.tencent.trpc.proto.http.common.HttpConstants;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
import org.apache.commons.io.IOUtils;
Expand Down Expand Up @@ -162,6 +170,33 @@ private HttpPost buildRequest(Request request) throws Exception {
httpPost.setHeader(HTTP_HEADER_TRPC_CALLER, callInfo.getCaller());
httpPost.setHeader(HTTP_HEADER_TRPC_CALLEE, callInfo.getCallee());

// set request id
httpPost.setHeader(HTTP_HEADER_TRPC_REQUEST_ID, String.valueOf(request.getRequestId()));
// set timeout
httpPost.setHeader(HTTP_HEADER_TRPC_TIMEOUT, String.valueOf(socketTimeout));
// set message type
int messageType = request.getMeta().getMessageType();
if (messageType != 0) {
httpPost.setHeader(HTTP_HEADER_TRPC_MESSAGE_TYPE, String.valueOf(messageType));
}
// set trans info: encode attachments as JSON with base64-encoded values,
// consistent with the server-side decoding logic in AbstractHttpExecutor.setAttachments
Map<String, Object> attachments = request.getAttachments();
if (attachments != null && !attachments.isEmpty()) {
Map<String, String> transInfoMap = new LinkedHashMap<>();
attachments.forEach((k, v) -> {
Base64Variant variant = Base64Variants.getDefaultVariant();
if (v instanceof byte[]) {
transInfoMap.put(k, variant.encode((byte[]) v));
} else if (v instanceof String) {
transInfoMap.put(k, variant.encode(((String) v).getBytes(StandardCharsets.UTF_8)));
}
});
if (!transInfoMap.isEmpty()) {
httpPost.setHeader(HTTP_HEADER_TRPC_TRANS_INFO, JsonUtils.toJson(transInfoMap));
}
}

// encode request parameters
String jsonString = encodeToJson(request);
if (jsonString != null) {
Expand Down
Loading