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 94a99ac999 [INLONG-10266][Manager] Fix the problem of password is
overwritten when adding field information (#10267)
94a99ac999 is described below
commit 94a99ac9991be19760b0aeef0904857d43acf376
Author: fuweng11 <[email protected]>
AuthorDate: Sat May 25 12:36:01 2024 +0800
[INLONG-10266][Manager] Fix the problem of password is overwritten when
adding field information (#10267)
---
.../apache/inlong/manager/pojo/sink/ck/ClickHouseSinkDTO.java | 9 ++++-----
.../apache/inlong/manager/pojo/sink/doris/DorisSinkDTO.java | 10 +++++-----
.../org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java | 10 +++++-----
.../inlong/manager/pojo/sink/postgresql/PostgreSQLSinkDTO.java | 9 ++++-----
.../inlong/manager/pojo/sink/starrocks/StarRocksSinkDTO.java | 10 +++++-----
5 files changed, 23 insertions(+), 25 deletions(-)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/ck/ClickHouseSinkDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/ck/ClickHouseSinkDTO.java
index a8bb34a33f..e30186c1f9 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/ck/ClickHouseSinkDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/ck/ClickHouseSinkDTO.java
@@ -114,16 +114,15 @@ public class ClickHouseSinkDTO {
*/
public static ClickHouseSinkDTO getFromRequest(ClickHouseSinkRequest
request, String extParams) throws Exception {
Integer encryptVersion = AESUtils.getCurrentVersion(null);
- String passwd = null;
- if (StringUtils.isNotEmpty(request.getPassword())) {
- passwd =
AESUtils.encryptToString(request.getPassword().getBytes(StandardCharsets.UTF_8),
- encryptVersion);
- }
ClickHouseSinkDTO dto = StringUtils.isNotBlank(extParams)
? ClickHouseSinkDTO.getFromJson(extParams)
: new ClickHouseSinkDTO();
CommonBeanUtils.copyProperties(request, dto, true);
+ String passwd = dto.getPassword();
+ if (StringUtils.isNotEmpty(passwd)) {
+ passwd =
AESUtils.encryptToString(passwd.getBytes(StandardCharsets.UTF_8),
encryptVersion);
+ }
dto.setPassword(passwd);
dto.setEncryptVersion(encryptVersion);
return dto;
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/doris/DorisSinkDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/doris/DorisSinkDTO.java
index ecbd38c042..262c3596ae 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/doris/DorisSinkDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/doris/DorisSinkDTO.java
@@ -86,14 +86,14 @@ public class DorisSinkDTO {
*/
public static DorisSinkDTO getFromRequest(DorisSinkRequest request, String
extParams) throws Exception {
Integer encryptVersion = AESUtils.getCurrentVersion(null);
- String passwd = null;
- if (StringUtils.isNotEmpty(request.getPassword())) {
- passwd =
AESUtils.encryptToString(request.getPassword().getBytes(StandardCharsets.UTF_8),
- encryptVersion);
- }
DorisSinkDTO dto = StringUtils.isNotBlank(extParams) ?
DorisSinkDTO.getFromJson(extParams) : new DorisSinkDTO();
CommonBeanUtils.copyProperties(request, dto, true);
+ String passwd = dto.getPassword();
+ if (StringUtils.isNotEmpty(passwd)) {
+ passwd =
AESUtils.encryptToString(passwd.getBytes(StandardCharsets.UTF_8),
encryptVersion);
+ }
+
dto.setPassword(passwd);
dto.setEncryptVersion(encryptVersion);
return dto;
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java
index 2dfe6f0b11..946b4c0933 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/hive/HiveSinkDTO.java
@@ -99,14 +99,14 @@ public class HiveSinkDTO {
*/
public static HiveSinkDTO getFromRequest(HiveSinkRequest request, String
extParams) throws Exception {
Integer encryptVersion = AESUtils.getCurrentVersion(null);
- String passwd = null;
- if (StringUtils.isNotEmpty(request.getPassword())) {
- passwd =
AESUtils.encryptToString(request.getPassword().getBytes(StandardCharsets.UTF_8),
- encryptVersion);
- }
HiveSinkDTO dto = StringUtils.isNotBlank(extParams) ?
HiveSinkDTO.getFromJson(extParams) : new HiveSinkDTO();
CommonBeanUtils.copyProperties(request, dto, true);
+ String passwd = dto.getPassword();
+ if (StringUtils.isNotEmpty(passwd)) {
+ passwd =
AESUtils.encryptToString(passwd.getBytes(StandardCharsets.UTF_8),
encryptVersion);
+ }
+
dto.setPassword(passwd);
dto.setEncryptVersion(encryptVersion);
return dto;
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/postgresql/PostgreSQLSinkDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/postgresql/PostgreSQLSinkDTO.java
index 10ec7bbc18..18d02d75a7 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/postgresql/PostgreSQLSinkDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/postgresql/PostgreSQLSinkDTO.java
@@ -80,16 +80,15 @@ public class PostgreSQLSinkDTO {
*/
public static PostgreSQLSinkDTO getFromRequest(PostgreSQLSinkRequest
request, String extParams) throws Exception {
Integer encryptVersion = AESUtils.getCurrentVersion(null);
- String passwd = null;
- if (StringUtils.isNotEmpty(request.getPassword())) {
- passwd =
AESUtils.encryptToString(request.getPassword().getBytes(StandardCharsets.UTF_8),
- encryptVersion);
- }
PostgreSQLSinkDTO dto = StringUtils.isNotBlank(extParams)
? PostgreSQLSinkDTO.getFromJson(extParams)
: new PostgreSQLSinkDTO();
CommonBeanUtils.copyProperties(request, dto, true);
+ String passwd = dto.getPassword();
+ if (StringUtils.isNotEmpty(passwd)) {
+ passwd =
AESUtils.encryptToString(passwd.getBytes(StandardCharsets.UTF_8),
encryptVersion);
+ }
dto.setPassword(passwd);
dto.setEncryptVersion(encryptVersion);
return dto;
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/starrocks/StarRocksSinkDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/starrocks/StarRocksSinkDTO.java
index c4ce365036..8f10c0b6a7 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/starrocks/StarRocksSinkDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/starrocks/StarRocksSinkDTO.java
@@ -99,16 +99,16 @@ public class StarRocksSinkDTO {
*/
public static StarRocksSinkDTO getFromRequest(StarRocksSinkRequest
request, String extParams) throws Exception {
Integer encryptVersion = AESUtils.getCurrentVersion(null);
- String passwd = null;
- if (StringUtils.isNotEmpty(request.getPassword())) {
- passwd =
AESUtils.encryptToString(request.getPassword().getBytes(StandardCharsets.UTF_8),
- encryptVersion);
- }
StarRocksSinkDTO dto = StringUtils.isNotBlank(extParams)
? StarRocksSinkDTO.getFromJson(extParams)
: new StarRocksSinkDTO();
CommonBeanUtils.copyProperties(request, dto, true);
+ String passwd = dto.getPassword();
+ if (StringUtils.isNotEmpty(passwd)) {
+ passwd =
AESUtils.encryptToString(passwd.getBytes(StandardCharsets.UTF_8),
encryptVersion);
+ }
+
dto.setEncryptVersion(encryptVersion);
dto.setPassword(passwd);
return dto;
