Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2336 from himanshug/fix_2331 

limit size of X-Druid-Response-Context header to 7K
This commit is contained in:
Himanshu 2016-02-02 12:06:59 -06:00
parent 377e3583f8 a7bde8f4da
commit dc89cdd0f9
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/main/java/io/druid/server/QueryResource.java
View File

@ -72,6 +72,8 @@ public class QueryResource
@Deprecated // use SmileMediaTypes.APPLICATION_JACKSON_SMILE @Deprecated // use SmileMediaTypes.APPLICATION_JACKSON_SMILE
private static final String APPLICATION_SMILE = "application/smile"; private static final String APPLICATION_SMILE = "application/smile";
private static final int RESPONSE_CTX_HEADER_LEN_LIMIT = 7*1024;
private final ServerConfig config; private final ServerConfig config;
private final ObjectMapper jsonMapper; private final ObjectMapper jsonMapper;
private final ObjectMapper smileMapper; private final ObjectMapper smileMapper;
@ -177,7 +179,7 @@ public class QueryResource
try { try {
final Query theQuery = query; final Query theQuery = query;
return Response Response.ResponseBuilder builder = Response
.ok( .ok(
new StreamingOutput() new StreamingOutput()
{ {
@ -220,8 +222,19 @@ public class QueryResource
}, },
contentType contentType
) )
.header("X-Druid-Query-Id", queryId) .header("X-Druid-Query-Id", queryId);
.header("X-Druid-Response-Context", jsonMapper.writeValueAsString(responseContext))
//Limit the response-context header, see https://github.com/druid-io/druid/issues/2331
//Note that Response.ResponseBuilder.header(String key,Object value).build() calls value.toString()
//and encodes the string using ASCII, so 1 char is = 1 byte
String responseCtxString = jsonMapper.writeValueAsString(responseContext);
if (responseCtxString.length() > RESPONSE_CTX_HEADER_LEN_LIMIT) {
log.warn("Response Context truncated for id [%s] . Full context is [%s].", queryId, responseCtxString);
responseCtxString = responseCtxString.substring(0, RESPONSE_CTX_HEADER_LEN_LIMIT);
}
return builder
.header("X-Druid-Response-Context", responseCtxString)
.build(); .build();
} }
catch (Exception e) { catch (Exception e) {