diff --git a/framework/src/main/java/org/tron/core/services/filter/HttpApiAccessFilter.java b/framework/src/main/java/org/tron/core/services/filter/HttpApiAccessFilter.java index 0405165ff99..59b9b15582b 100644 --- a/framework/src/main/java/org/tron/core/services/filter/HttpApiAccessFilter.java +++ b/framework/src/main/java/org/tron/core/services/filter/HttpApiAccessFilter.java @@ -26,7 +26,8 @@ public void init(FilterConfig filterConfig) { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) { try { if (request instanceof HttpServletRequest) { - String endpoint = ((HttpServletRequest) request).getRequestURI(); + String contextPath = ((HttpServletRequest) request).getContextPath(); + String endpoint = contextPath + ((HttpServletRequest) request).getServletPath(); HttpServletResponse resp = (HttpServletResponse) response; if (isDisabled(endpoint)) { diff --git a/framework/src/main/java/org/tron/core/services/filter/HttpInterceptor.java b/framework/src/main/java/org/tron/core/services/filter/HttpInterceptor.java index 8b43cfef642..2ff8a5ad321 100644 --- a/framework/src/main/java/org/tron/core/services/filter/HttpInterceptor.java +++ b/framework/src/main/java/org/tron/core/services/filter/HttpInterceptor.java @@ -34,7 +34,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha chain.doFilter(request, response); return; } - endpoint = ((HttpServletRequest) request).getRequestURI(); + String contextPath = ((HttpServletRequest) request).getContextPath(); + endpoint = contextPath + ((HttpServletRequest) request).getServletPath(); CharResponseWrapper responseWrapper = new CharResponseWrapper( (HttpServletResponse) response); chain.doFilter(request, responseWrapper); diff --git a/framework/src/main/java/org/tron/core/services/filter/LiteFnQueryHttpFilter.java b/framework/src/main/java/org/tron/core/services/filter/LiteFnQueryHttpFilter.java index a8ab947066c..07025996677 100644 --- a/framework/src/main/java/org/tron/core/services/filter/LiteFnQueryHttpFilter.java +++ b/framework/src/main/java/org/tron/core/services/filter/LiteFnQueryHttpFilter.java @@ -110,7 +110,8 @@ public void init(FilterConfig filterConfig) throws ServletException { @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - String requestPath = ((HttpServletRequest) servletRequest).getRequestURI(); + String contextPath = ((HttpServletRequest) servletRequest).getContextPath(); + String requestPath = contextPath + ((HttpServletRequest) servletRequest).getServletPath(); if (chainBaseManager.isLiteNode() && !CommonParameter.getInstance().openHistoryQueryWhenLiteFN && filterPaths.contains(requestPath)) { diff --git a/framework/src/main/java/org/tron/core/services/http/RateLimiterServlet.java b/framework/src/main/java/org/tron/core/services/http/RateLimiterServlet.java index fa59a72303d..7a66aed34f6 100644 --- a/framework/src/main/java/org/tron/core/services/http/RateLimiterServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/RateLimiterServlet.java @@ -99,8 +99,9 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) if (rateLimiter != null) { acquireResource = rateLimiter.acquire(runtimeData); } - String url = Strings.isNullOrEmpty(req.getRequestURI()) - ? MetricLabels.UNDEFINED : req.getRequestURI(); + String contextPath = req.getContextPath(); + String url = Strings.isNullOrEmpty(req.getServletPath()) + ? MetricLabels.UNDEFINED : contextPath + req.getServletPath(); try { resp.setContentType("application/json; charset=utf-8"); diff --git a/framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/PBFT/HttpApiOnPBFTService.java b/framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/PBFT/HttpApiOnPBFTService.java index 828d36e664f..a77b45353c9 100644 --- a/framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/PBFT/HttpApiOnPBFTService.java +++ b/framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/PBFT/HttpApiOnPBFTService.java @@ -172,7 +172,7 @@ public class HttpApiOnPBFTService extends HttpService { public HttpApiOnPBFTService() { port = Args.getInstance().getPBFTHttpPort(); enable = isFullNode() && Args.getInstance().isPBFTHttpEnable(); - contextPath = "/walletpbft/"; + contextPath = "/walletpbft"; } @Override