Skip to content

Commit 316de9a

Browse files
authored
log(http): revert workaround for CodeQL java/error-message-exposure (#6449)
Revert change to HTTP error message handling — workaround broke clients depending on original error output.
1 parent 732e7bc commit 316de9a

File tree

4 files changed

+29
-6
lines changed

4 files changed

+29
-6
lines changed

framework/src/main/java/org/tron/core/services/http/GetBrokerageServlet.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2828
response.getWriter().println("{\"brokerage\": " + value + "}");
2929
} catch (DecoderException | IllegalArgumentException e) {
3030
try {
31-
response.getWriter().println("{\"Error\": " + "\"INVALID address\"}");
31+
response.getWriter()
32+
.println("{\"Error\": " + "\"INVALID address, " + e.getMessage() + "\"}");
3233
} catch (IOException ioe) {
3334
logger.debug("IOException: {}", ioe.getMessage());
3435
}

framework/src/main/java/org/tron/core/services/http/GetRewardServlet.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2727
response.getWriter().println("{\"reward\": " + value + "}");
2828
} catch (DecoderException | IllegalArgumentException e) {
2929
try {
30-
response.getWriter().println("{\"Error\": " + "\"INVALID address\"}");
30+
response.getWriter()
31+
.println("{\"Error\": " + "\"INVALID address, " + e.getMessage() + "\"}");
3132
} catch (IOException ioe) {
3233
logger.debug("IOException: {}", ioe.getMessage());
3334
}

framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionByIdSolidityServlet.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
3030
String input = request.getParameter("value");
3131
fillResponse(ByteString.copyFrom(ByteArray.fromHexString(input)), visible, response);
3232
} catch (Exception e) {
33-
Util.processError(e, response);
33+
logger.debug("Exception: {}", e.getMessage());
34+
try {
35+
response.getWriter().println(e.getMessage());
36+
} catch (IOException ioe) {
37+
logger.debug("IOException: {}", ioe.getMessage());
38+
}
3439
}
3540
}
3641

@@ -41,7 +46,12 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
4146
JsonFormat.merge(params.getParams(), build, params.isVisible());
4247
fillResponse(build.build().getValue(), params.isVisible(), response);
4348
} catch (Exception e) {
44-
Util.processError(e, response);
49+
logger.debug("Exception: {}", e.getMessage());
50+
try {
51+
response.getWriter().println(e.getMessage());
52+
} catch (IOException ioe) {
53+
logger.debug("IOException: {}", ioe.getMessage());
54+
}
4555
}
4656
}
4757

framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionInfoByIdSolidityServlet.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.tron.core.services.http.solidity;
22

33
import com.google.protobuf.ByteString;
4+
import java.io.IOException;
45
import javax.servlet.http.HttpServletRequest;
56
import javax.servlet.http.HttpServletResponse;
67
import lombok.extern.slf4j.Slf4j;
@@ -36,7 +37,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
3637
response.getWriter().println(JsonFormat.printToString(transInfo, visible));
3738
}
3839
} catch (Exception e) {
39-
Util.processError(e, response);
40+
logger.debug("Exception: {}", e.getMessage());
41+
try {
42+
response.getWriter().println(e.getMessage());
43+
} catch (IOException ioe) {
44+
logger.debug("IOException: {}", ioe.getMessage());
45+
}
4046
}
4147
}
4248

@@ -54,7 +60,12 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
5460
response.getWriter().println(JsonFormat.printToString(transInfo, params.isVisible()));
5561
}
5662
} catch (Exception e) {
57-
Util.processError(e, response);
63+
logger.debug("Exception: {}", e.getMessage());
64+
try {
65+
response.getWriter().println(e.getMessage());
66+
} catch (IOException ioe) {
67+
logger.debug("IOException: {}", ioe.getMessage());
68+
}
5869
}
5970
}
6071

0 commit comments

Comments
 (0)