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/07/11 13:35:21 UTC
[inlong] branch master updated: [INLONG-4995][SDK] Refactor code to avoid CodeQL Scan warning (#4996)
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 1e5806882 [INLONG-4995][SDK] Refactor code to avoid CodeQL Scan warning (#4996)
1e5806882 is described below
commit 1e580688222e49c31be363eef34b6ce226ba5fa4
Author: woofyzhao <49...@qq.com>
AuthorDate: Mon Jul 11 21:35:15 2022 +0800
[INLONG-4995][SDK] Refactor code to avoid CodeQL Scan warning (#4996)
---
.../sdk/dataproxy/config/ProxyConfigManager.java | 21 +----------
.../apache/inlong/sdk/dataproxy/network/Utils.java | 43 +++-------------------
2 files changed, 8 insertions(+), 56 deletions(-)
diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
index 3be4de161..8dc833345 100644
--- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
+++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
@@ -23,6 +23,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
+import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
@@ -59,7 +60,6 @@ import java.io.UnsupportedEncodingException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.KeyManagementException;
-import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.ArrayList;
@@ -492,24 +492,7 @@ public class ProxyConfigManager extends Thread {
hostInfoMd5.append(";");
}
- MessageDigest md = null;
- try {
- md = MessageDigest.getInstance("MD5");
- } catch (NoSuchAlgorithmException e) {
- logger.error("{}, {}", e.toString(), e.getStackTrace());
- }
- try {
- md.update(hostInfoMd5.toString().getBytes("utf8"), 0, hostInfoMd5.toString().length());
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- byte[] mdbytes = md.digest();
- // convert the byte to hex format method 1
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < mdbytes.length; i++) {
- sb.append(Integer.toString((mdbytes[i] & 0xff) + 0x100, 16).substring(1));
- }
- return sb.toString();
+ return DigestUtils.md5Hex(hostInfoMd5.toString());
}
private EncryptConfigEntry requestPubKey(String pubKeyUrl, String userName, boolean needGet) {
diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/Utils.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/Utils.java
index 5803e7bfb..3773b3680 100644
--- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/Utils.java
+++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/Utils.java
@@ -18,22 +18,21 @@
package org.apache.inlong.sdk.dataproxy.network;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.HmacUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.UnsupportedEncodingException;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.digest.HmacUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class Utils {
+
private static final Logger logger = LoggerFactory.getLogger(Utils.class);
private static String userIp;
@@ -71,36 +70,6 @@ public class Utils {
return true;
}
- public static String getMD5String(String source) {
- final char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
- String retString = null;
-
- if (source == null) {
- return retString;
- }
-
- try {
- StringBuilder sb = new StringBuilder();
- MessageDigest md = MessageDigest.getInstance("MD5");
- try {
- md.update(source.getBytes("utf8"), 0, source.length());
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- byte[] retBytes = md.digest();
- for (byte b : retBytes) {
- sb.append(hexDigits[(b >> 4) & 0x0f]);
- sb.append(hexDigits[b & 0x0f]);
- }
-
- retString = sb.toString();
- } catch (NoSuchAlgorithmException e) {
- logger.error("" + e);
- }
-
- return retString;
- }
-
public static boolean isNotBlank(String str) {
return !isBlank(str);
}