You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/08/02 06:07:09 UTC
[inlong] branch master updated: [INLONG-5014][CodeQL] Fix the code scanning alerts exposed by CodeQL (#5225)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 861c17fd2 [INLONG-5014][CodeQL] Fix the code scanning alerts exposed by CodeQL (#5225)
861c17fd2 is described below
commit 861c17fd2fc59efec862c778d4716a817f30c7c0
Author: Xieqijun <44...@users.noreply.github.com>
AuthorDate: Tue Aug 2 14:07:04 2022 +0800
[INLONG-5014][CodeQL] Fix the code scanning alerts exposed by CodeQL (#5225)
Co-authored-by: Charles Zhang <do...@apache.org>
---
.../admin/ProxyServiceAdminEventHandler.java | 16 +++++-------
.../inlong/dataproxy/http/MessageFilter.java | 14 +++-------
.../commons/admin/AbstractAdminEventHandler.java | 3 +--
.../inlong/sdk/commons/admin/AdminHttpSource.java | 30 ++++++++++------------
.../admin/ConsumerServiceAdminEventHandler.java | 2 --
.../server/broker/web/AbstractWebHandler.java | 10 +++++---
.../server/master/web/MasterStatusCheckFilter.java | 6 +++--
7 files changed, 34 insertions(+), 47 deletions(-)
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/admin/ProxyServiceAdminEventHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/admin/ProxyServiceAdminEventHandler.java
index aca189423..7caa73d6d 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/admin/ProxyServiceAdminEventHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/admin/ProxyServiceAdminEventHandler.java
@@ -40,7 +40,7 @@ public class ProxyServiceAdminEventHandler extends AbstractAdminEventHandler {
/**
* configure
- *
+ *
* @param context
*/
@Override
@@ -49,7 +49,7 @@ public class ProxyServiceAdminEventHandler extends AbstractAdminEventHandler {
/**
* process
- *
+ *
* @param cmd
* @param event
* @param response
@@ -59,8 +59,8 @@ public class ProxyServiceAdminEventHandler extends AbstractAdminEventHandler {
String sourceName = event.getHeaders().get(ProxyServiceMBean.KEY_SOURCENAME);
LOG.info("start to process admin task:{},sourceName:{}", cmd, sourceName);
switch (cmd) {
- case ProxyServiceMBean.METHOD_STOPSERVICE :
- case ProxyServiceMBean.METHOD_RECOVERSERVICE :
+ case ProxyServiceMBean.METHOD_STOPSERVICE:
+ case ProxyServiceMBean.METHOD_RECOVERSERVICE:
if (sourceName == null) {
break;
}
@@ -70,7 +70,7 @@ public class ProxyServiceAdminEventHandler extends AbstractAdminEventHandler {
this.processOne(cmd, sourceName, response);
}
break;
- default :
+ default:
break;
}
LOG.info("end to process admin task:{},sourceName:{}", cmd, sourceName);
@@ -78,7 +78,7 @@ public class ProxyServiceAdminEventHandler extends AbstractAdminEventHandler {
/**
* processOne
- *
+ *
* @param cmd
* @param sourceName
* @param response
@@ -105,7 +105,6 @@ public class ProxyServiceAdminEventHandler extends AbstractAdminEventHandler {
this.outputResponse(response, result.toString());
} catch (Exception e) {
LOG.error(e.getMessage(), e);
- result.append(e.getMessage());
this.outputResponse(response, result.toString());
}
LOG.info("end to processOne admin task:{},sort task:{}", cmd, sourceName);
@@ -113,7 +112,7 @@ public class ProxyServiceAdminEventHandler extends AbstractAdminEventHandler {
/**
* processAll
- *
+ *
* @param cmd
* @param event
* @param response
@@ -142,7 +141,6 @@ public class ProxyServiceAdminEventHandler extends AbstractAdminEventHandler {
this.outputResponse(response, result.toString());
} catch (Exception e) {
LOG.error(e.getMessage(), e);
- result.append(e.getMessage());
this.outputResponse(response, result.toString());
}
LOG.info("end to processAll admin task:{}", cmd);
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
index b678534f1..e61e5cc57 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
@@ -90,8 +90,7 @@ public class MessageFilter implements Filter {
} else if (body.length() > maxMsgLength) {
LOG.warn("Received bad request from client. Body length is " + body.length());
code = StatusCode.EXCEED_LEN;
- message = "Bad request from client. " + "Body length is " + body.length()
- + ",exceeding the limit:" + maxMsgLength;
+ message = "Bad request from client. Body length is exceeding the limit:" + maxMsgLength;
} else {
chain.doFilter(request, response);
}
@@ -105,10 +104,9 @@ public class MessageFilter implements Filter {
}
}
- String callback = req.getParameter("callback");
resp.setCharacterEncoding(req.getCharacterEncoding());
resp.setStatus(HttpServletResponse.SC_OK);
- resp.getWriter().write(getResultContent(code, message, callback));
+ resp.getWriter().write(getResultContent(code, message));
resp.flushBuffer();
}
@@ -116,19 +114,13 @@ public class MessageFilter implements Filter {
public void destroy() {
}
- private String getResultContent(int code, String message, String callback) {
+ private String getResultContent(int code, String message) {
StringBuilder builder = new StringBuilder();
- if (StringUtils.isNotEmpty(callback)) {
- builder.append(callback).append("(");
- }
builder.append("{\"code\":\"");
builder.append(code);
builder.append("\",\"msg\":\"");
builder.append(message);
builder.append("\"}");
- if (StringUtils.isNotEmpty(callback)) {
- builder.append(")");
- }
return builder.toString();
}
diff --git a/inlong-sdk/sdk-common/src/main/java/org/apache/inlong/sdk/commons/admin/AbstractAdminEventHandler.java b/inlong-sdk/sdk-common/src/main/java/org/apache/inlong/sdk/commons/admin/AbstractAdminEventHandler.java
index 405f31348..08c5f6942 100644
--- a/inlong-sdk/sdk-common/src/main/java/org/apache/inlong/sdk/commons/admin/AbstractAdminEventHandler.java
+++ b/inlong-sdk/sdk-common/src/main/java/org/apache/inlong/sdk/commons/admin/AbstractAdminEventHandler.java
@@ -27,7 +27,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- *
* AbstractAdminEventHandler
*/
public abstract class AbstractAdminEventHandler implements AdminEventHandler {
@@ -36,7 +35,7 @@ public abstract class AbstractAdminEventHandler implements AdminEventHandler {
/**
* outputResponse
- *
+ *
* @param response
* @param outputString
*/
diff --git a/inlong-sdk/sdk-common/src/main/java/org/apache/inlong/sdk/commons/admin/AdminHttpSource.java b/inlong-sdk/sdk-common/src/main/java/org/apache/inlong/sdk/commons/admin/AdminHttpSource.java
index 984536fda..256f2037f 100644
--- a/inlong-sdk/sdk-common/src/main/java/org/apache/inlong/sdk/commons/admin/AdminHttpSource.java
+++ b/inlong-sdk/sdk-common/src/main/java/org/apache/inlong/sdk/commons/admin/AdminHttpSource.java
@@ -83,7 +83,7 @@ public class AdminHttpSource extends SslContextAwareAbstractSource implements
/**
* configure
- *
+ *
* @param context
*/
@Override
@@ -221,9 +221,9 @@ public class AdminHttpSource extends SslContextAwareAbstractSource implements
/**
* doPost
- *
- * @param request
- * @param response
+ *
+ * @param request
+ * @param response
* @throws IOException
*/
@Override
@@ -236,15 +236,13 @@ public class AdminHttpSource extends SslContextAwareAbstractSource implements
LOG.warn("Received bad request from client. ", ex);
sourceCounter.incrementEventReadFail();
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
- "Bad request from client. "
- + ex.getMessage());
+ "Bad request from client. ");
return;
} catch (Exception ex) {
LOG.warn("Deserializer threw unexpected exception. ", ex);
sourceCounter.incrementEventReadFail();
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Deserializer threw unexpected exception. "
- + ex.getMessage());
+ "Deserializer threw unexpected exception. ");
return;
}
sourceCounter.incrementAppendBatchReceivedCount();
@@ -259,15 +257,13 @@ public class AdminHttpSource extends SslContextAwareAbstractSource implements
+ "capacity or make sure the sinks perform faster.", ex);
sourceCounter.incrementChannelWriteFail();
response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
- "Error appending event to channel. Channel might be full."
- + ex.getMessage());
+ "Error appending event to channel. Channel might be full.");
return;
} catch (Exception ex) {
LOG.warn("Unexpected error appending event to channel. ", ex);
sourceCounter.incrementGenericProcessingFail();
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Unexpected error while appending event to channel. "
- + ex.getMessage());
+ "Unexpected error while appending event to channel. ");
return;
}
response.setCharacterEncoding(request.getCharacterEncoding());
@@ -281,9 +277,9 @@ public class AdminHttpSource extends SslContextAwareAbstractSource implements
/**
* doGet
- *
- * @param request
- * @param response
+ *
+ * @param request
+ * @param response
* @throws IOException
*/
@Override
@@ -295,7 +291,7 @@ public class AdminHttpSource extends SslContextAwareAbstractSource implements
/**
* configureSsl
- *
+ *
* @param context
*/
@Override
@@ -309,7 +305,7 @@ public class AdminHttpSource extends SslContextAwareAbstractSource implements
/**
* handleDeprecatedParameter
- *
+ *
* @param context
* @param newParam
* @param oldParam
diff --git a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/admin/ConsumerServiceAdminEventHandler.java b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/admin/ConsumerServiceAdminEventHandler.java
index 5820cc759..4c6d81ca8 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/admin/ConsumerServiceAdminEventHandler.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/admin/ConsumerServiceAdminEventHandler.java
@@ -107,7 +107,6 @@ public class ConsumerServiceAdminEventHandler extends AbstractAdminEventHandler
this.outputResponse(response, result.toString());
} catch (Exception e) {
LOG.error(e.getMessage(), e);
- result.append(e.getMessage());
this.outputResponse(response, result.toString());
}
LOG.info("end to processOne admin task:{},sort task:{}", cmd, taskName);
@@ -144,7 +143,6 @@ public class ConsumerServiceAdminEventHandler extends AbstractAdminEventHandler
this.outputResponse(response, result.toString());
} catch (Exception e) {
LOG.error(e.getMessage(), e);
- result.append(e.getMessage());
this.outputResponse(response, result.toString());
}
LOG.info("end to processAll admin task:{}", cmd);
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/AbstractWebHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/AbstractWebHandler.java
index d9a8d7311..eddcddf89 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/AbstractWebHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/AbstractWebHandler.java
@@ -20,10 +20,12 @@ package org.apache.inlong.tubemq.server.broker.web;
import static org.apache.inlong.tubemq.server.common.webbase.WebMethodMapper.getRegisteredWebMethod;
import static org.apache.inlong.tubemq.server.common.webbase.WebMethodMapper.getWebApiRegInfo;
import static org.apache.inlong.tubemq.server.common.webbase.WebMethodMapper.registerWebMethod;
+
import java.io.IOException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.inlong.tubemq.server.broker.TubeBroker;
import org.apache.inlong.tubemq.server.common.webbase.WebCallStatsHolder;
import org.apache.inlong.tubemq.server.common.webbase.WebMethodMapper.WebApiRegInfo;
@@ -38,7 +40,7 @@ public abstract class AbstractWebHandler extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req,
- HttpServletResponse resp) throws IOException {
+ HttpServletResponse resp) throws IOException {
doPost(req, resp);
}
@@ -48,7 +50,7 @@ public abstract class AbstractWebHandler extends HttpServlet {
@Override
protected void doPost(HttpServletRequest req,
- HttpServletResponse resp) throws IOException {
+ HttpServletResponse resp) throws IOException {
String method = null;
StringBuilder sBuffer = new StringBuilder(1024);
long startTime = System.currentTimeMillis();
@@ -83,8 +85,8 @@ public abstract class AbstractWebHandler extends HttpServlet {
public abstract void registerWebApiMethod();
protected void innRegisterWebMethod(String webMethodName,
- String clsMethodName,
- boolean needAuthToken) {
+ String clsMethodName,
+ boolean needAuthToken) {
registerWebMethod(webMethodName, clsMethodName,
false, needAuthToken, this);
}
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/MasterStatusCheckFilter.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/MasterStatusCheckFilter.java
index a8b3c58d2..1a8ede854 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/MasterStatusCheckFilter.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/MasterStatusCheckFilter.java
@@ -26,6 +26,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.MetaDataService;
@@ -39,6 +40,7 @@ public class MasterStatusCheckFilter implements Filter {
this.master = master;
this.defMetaDataService =
this.master.getMetaDataService();
+
}
@Override
@@ -47,8 +49,8 @@ public class MasterStatusCheckFilter implements Filter {
@Override
public void doFilter(ServletRequest request,
- ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
+ ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
HttpServletRequest req = (HttpServletRequest) request;
HttpServletResponse resp = (HttpServletResponse) response;
if (!defMetaDataService.isSelfMaster()) {